Misc. cleanup for Python 3

tailbone/views/batch/core.py

@@ -1148,7 +1148,7 @@ class FileBatchMasterView(BatchMasterView):
             raise httpexceptions.HTTPNotFound()
         path = batch.filepath(self.rattail_config)
         response = FileResponse(path, request=self.request)
-        response.headers[b'Content-Length'] = str(os.path.getsize(path))
+        response.headers[b'Content-Length'] = six.binary_type(os.path.getsize(path))
         filename = os.path.basename(batch.filename).encode('ascii', 'replace')
         response.headers[b'Content-Disposition'] = b'attachment; filename="{}"'.format(filename)
         return response

tailbone/views/bouncer.py

@@ -29,6 +29,8 @@ from __future__ import unicode_literals, absolute_import
 import os
 import datetime
 
+import six
+
 from rattail.db import model
 from rattail.bouncer import get_handler
 from rattail.bouncer.config import get_profile_keys
@@ -175,7 +177,7 @@ class EmailBouncesView(MasterView):
         handler = self.get_handler(bounce)
         path = handler.msgpath(bounce)
         response = FileResponse(path, request=self.request)
-        response.headers[b'Content-Length'] = str(os.path.getsize(path))
+        response.headers[b'Content-Length'] = six.binary_type(os.path.getsize(path))
         response.headers[b'Content-Disposition'] = b'attachment; filename="bounce.eml"'
         return response
 

tailbone/views/core.py

@@ -2,7 +2,7 @@
 ################################################################################
 #
 #  Rattail -- Retail Software Framework
-#  Copyright © 2010-2017 Lance Edgar
+#  Copyright © 2010-2018 Lance Edgar
 #
 #  This file is part of Rattail.
 #
@@ -28,6 +28,8 @@ from __future__ import unicode_literals, absolute_import
 
 import os
 
+import six
+
 from rattail.db import model
 from rattail.util import progress_loop
 
@@ -107,7 +109,7 @@ class View(object):
         if not os.path.exists(path):
             return self.notfound()
         response = FileResponse(path, request=self.request)
-        response.headers[b'Content-Length'] = str(os.path.getsize(path))
+        response.headers[b'Content-Length'] = six.binary_type(os.path.getsize(path))
         filename = os.path.basename(path).encode('ascii', 'replace')
         response.headers[b'Content-Disposition'] = b'attachment; filename="{}"'.format(filename)
         return response

tailbone/views/email.py

@@ -248,7 +248,7 @@ class EmailPreview(View):
     def email_template(self):
         recipient = self.request.POST.get('recipient')
         if recipient:
-            keys = filter(lambda k: k.startswith('send_'), self.request.POST.iterkeys())
+            keys = filter(lambda k: k.startswith('send_'), self.request.POST.keys())
             key = keys[0][5:] if keys else None
             if key:
                 email = mail.get_email(self.rattail_config, key)

tailbone/views/exports.py

@@ -144,7 +144,7 @@ class ExportMasterView(MasterView):
         export = self.get_instance()
         path = self.get_file_path(export)
         response = FileResponse(path, request=self.request)
-        response.headers[b'Content-Length'] = str(os.path.getsize(path))
+        response.headers[b'Content-Length'] = six.binary_type(os.path.getsize(path))
         response.headers[b'Content-Disposition'] = b'attachment; filename="{}"'.format(export.filename)
         return response
 

tailbone/views/handheld.py

@@ -199,7 +199,7 @@ class HandheldBatchView(FileBatchMasterView):
         return text
 
     def get_exec_options_kwargs(self, **kwargs):
-        kwargs['ACTION_OPTIONS'] = list(ACTION_OPTIONS.iteritems())
+        kwargs['ACTION_OPTIONS'] = list(ACTION_OPTIONS.items())
         return kwargs
 
     def get_execute_success_url(self, batch, result, **kwargs):

tailbone/views/master.py

@@ -1200,7 +1200,7 @@ class MasterView(View):
         """
         try:
             index = int(self.request.GET['index'])
-        except KeyError, ValueError:
+        except (KeyError, ValueError):
             return self.redirect(self.get_index_url())
         if index < 1:
             return self.redirect(self.get_index_url())

tailbone/views/products.py

@@ -551,7 +551,7 @@ class ProductsView(MasterView):
             if product and (not product.deleted or self.request.has_perm('products.view_deleted')):
                 data = {
                     'uuid': product.uuid,
-                    'upc': unicode(product.upc),
+                    'upc': six.text_type(product.upc),
                     'upc_pretty': product.upc.pretty(),
                     'full_description': product.full_description,
                     'image_url': pod.get_image_url(self.rattail_config, product.upc),
@@ -770,8 +770,8 @@ def print_labels(request):
 
     try:
         printer.print_labels([(product, quantity, {})])
-    except Exception, error:
-        return {'error': str(error)}
+    except Exception as error:
+        return {'error': six.text_type(error)}
     return {}
 
 

tailbone/views/purchases/core.py

@@ -26,6 +26,8 @@ Views for "true" purchase orders
 
 from __future__ import unicode_literals, absolute_import
 
+import six
+
 from rattail.db import model
 
 from webhelpers2.html import HTML, tags
@@ -133,7 +135,7 @@ class PurchaseView(MasterView):
             if purchase.date_ordered:
                 return "{} (ordered {})".format(purchase.vendor, purchase.date_ordered.strftime('%Y-%m-%d'))
             return "{} (ordered)".format(purchase.vendor)
-        return unicode(purchase)
+        return six.text_type(purchase)
 
     def configure_grid(self, g):
         super(PurchaseView, self).configure_grid(g)

tailbone/views/reports.py

@@ -2,7 +2,7 @@
 ################################################################################
 #
 #  Rattail -- Retail Software Framework
-#  Copyright © 2010-2017 Lance Edgar
+#  Copyright © 2010-2018 Lance Edgar
 #
 #  This file is part of Rattail.
 #
@@ -28,6 +28,8 @@ from __future__ import unicode_literals, absolute_import
 
 import re
 
+import six
+
 import rattail
 from rattail.db import model
 from rattail.files import resource_path
@@ -50,13 +52,13 @@ def get_upc(product):
     UPC formatter.  Strips PLUs to bare number, and adds "minus check digit"
     for non-PLU UPCs.
     """
-    upc = unicode(product.upc)
+    upc = six.text_type(product.upc)
     m = plu_upc_pattern.match(upc)
     if m:
-        return unicode(int(m.group(1)))
+        return six.text_type(int(m.group(1)))
     m = weighted_upc_pattern.match(upc)
     if m:
-        return unicode(int(m.group(1)))
+        return six.text_type(int(m.group(1)))
     return '{0}-{1}'.format(upc[:-1], upc[-1])
 
 

tailbone/views/shifts/schedule.py

@@ -79,7 +79,7 @@ class ScheduleView(TimeSheetView):
 
             # apply delete operations
             deleted = []
-            for uuid, value in data['delete'].iteritems():
+            for uuid, value in data['delete'].items():
                 if value == 'delete':
                     shift = Session.query(model.ScheduledShift).get(uuid)
                     if shift:
@@ -90,7 +90,7 @@ class ScheduleView(TimeSheetView):
             created = {}
             updated = {}
             time_format = '%a %d %b %Y %I:%M %p'
-            for uuid, employee_uuid in data['start_time'].iteritems():
+            for uuid, employee_uuid in data['start_time'].items():
                 if uuid in deleted:
                     continue
                 if uuid.startswith('new-'):

tailbone/views/shifts/timesheet.py

@@ -81,7 +81,7 @@ class TimeSheetView(BaseTimeSheetView):
             created = {}
             updated = {}
             time_format = '%a %d %b %Y %I:%M %p'
-            for uuid, time in data['start_time'].iteritems():
+            for uuid, time in data['start_time'].items():
                 if uuid in deleted:
                     continue
                 if uuid.startswith('new-'):

tailbone/views/vendors/catalogs.py

@@ -106,7 +106,7 @@ class VendorCatalogsView(FileBatchMasterView):
         g.sorters['vendor'] = g.make_sorter(model.Vendor.name)
 
     def get_instance_title(self, batch):
-        return unicode(batch.vendor)
+        return six.text_type(batch.vendor)
 
     def configure_form(self, f):
         super(VendorCatalogsView, self).configure_form(f)

tailbone/views/vendors/invoices.py

@@ -26,6 +26,8 @@ Views for maintaining vendor invoices
 
 from __future__ import unicode_literals, absolute_import
 
+import six
+
 from rattail.db import model, api
 from rattail.vendors.invoices import iter_invoice_parsers, require_invoice_parser
 
@@ -83,7 +85,7 @@ class VendorInvoicesView(FileBatchMasterView):
     ]
 
     def get_instance_title(self, batch):
-        return unicode(batch.vendor)
+        return six.text_type(batch.vendor)
 
     def configure_grid(self, g):
         super(VendorInvoicesView, self).configure_grid(g)