diff --git a/VERSION b/VERSION index 974d0764b..5b36a53b9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -b'a1f4a2272' (2019-11-28 11:39:09) \ No newline at end of file +nursix-dev-3362-g482287b (2019-11-29 14:16:30) diff --git a/modules/s3/codecs/card.py b/modules/s3/codecs/card.py index e38f6423a..66e0372b8 100644 --- a/modules/s3/codecs/card.py +++ b/modules/s3/codecs/card.py @@ -47,7 +47,7 @@ from gluon import current, HTTP -from s3compat import StringIO +from s3compat import BytesIO from ..s3codec import S3Codec from ..s3resource import S3Resource from ..s3utils import s3_str @@ -178,7 +178,7 @@ def encode(self, resource, **attr): ) # Build the doc - output_stream = StringIO() + output_stream = BytesIO() doc.build(flowables, output_stream, #canvasmaker=canvas.Canvas, # is default @@ -715,7 +715,7 @@ def draw_image(self, Helper function to draw an image - requires PIL (required for ReportLab image handling anyway) - @param img: the image (filename or StringIO buffer) + @param img: the image (filename or BytesIO buffer) @param x: drawing position @param y: drawing position @param width: the target width of the image (in points) diff --git a/views/generic.xls b/views/generic.xls index df184a62a..a434f4a21 100755 --- a/views/generic.xls +++ b/views/generic.xls @@ -9,7 +9,7 @@ try: worksheet = workbook.add_worksheet(pagename) for (r,row) in enumerate(content): for (c,element) in enumerate(row): - print '%s%s' % (chr(ord('A')+c),(r+1)), element + print("%s%s %s" % (chr(ord('A')+c),(r+1), element)) worksheet.write('%s%s' % (chr(ord('A')+c),(r+1)), str(element)) pass pass diff --git a/views/pagenav.html b/views/pagenav.html index 6122b2858..a7e4e4af3 100644 --- a/views/pagenav.html +++ b/views/pagenav.html @@ -1,9 +1,9 @@ {{if "page" in request.vars:}} {{try:}} - {{if totalpages <> 1:}}{{=pagenav(page=page, totalpages=totalpages)}}
+ {{if totalpages != 1:}}{{=pagenav(page=page, totalpages=totalpages)}}
{{pass}} {{except:}} {{try:}}{{=pagenav(page=page)}}
{{except:}}{{pass}} {{pass}} -{{pass}} \ No newline at end of file +{{pass}} diff --git a/views/searchbox.html b/views/searchbox.html index 0f10e0a8b..db3ed7189 100755 --- a/views/searchbox.html +++ b/views/searchbox.html @@ -1,6 +1,6 @@ {{if "page" in request.vars:}} {{try:}} - {{if totalpages <> 1:}} + {{if totalpages != 1:}} {{=search_btn}}

 

{{pass}} @@ -11,4 +11,4 @@ {{except:}} {{pass}} {{pass}} -{{pass}} \ No newline at end of file +{{pass}}