Update exception handling to be compatible with py3

smartmin/csv_imports/tasks.py

@@ -1,5 +1,6 @@
 from __future__ import unicode_literals
 
+import six
 from celery.task import task
 from django.db import transaction
 from django.utils import timezone
@@ -37,11 +38,11 @@ def csv_import(task_id):  # pragma: no cover
 
     except Exception as e:
         import traceback
-        traceback.print_exc(e)
+        traceback.print_exc()
 
         task_obj.task_status = ImportTask.FAILURE
 
-        task_obj.log("\nError: %s\n" % e)
+        task_obj.log("\nError: %s\n" % six.text_type(e))
         task_obj.log(log.getvalue())
         task_obj.save()
 

smartmin/models.py

@@ -355,12 +355,12 @@ def unicode_csv_reader(utf8_data, dialect=csv.excel, **kwargs):
                     num_errors += 1
 
             except SmartImportRowError as e:
-                error_messages.append(dict(line=line_number, error=str(e)))
+                error_messages.append(dict(line=line_number, error=six.text_type(e)))
 
             except Exception as e:
                 if log:
                     traceback.print_exc(100, log)
-                raise Exception("Line %d: %s\n\n%s" % (line_number, str(e), field_values))
+                raise Exception("Line %d: %s\n\n%s" % (line_number, six.text_type(e), field_values))
 
         if import_results is not None:
             import_results['records'] = len(records)

smartmin/views.py

@@ -1095,7 +1095,7 @@ def form_valid(self, form):
                 return response
 
         except IntegrityError as e:
-            message = str(e).capitalize()
+            message = six.text_type(e).capitalize()
             errors = self.form._errors.setdefault(forms.forms.NON_FIELD_ERRORS, forms.utils.ErrorList())
             errors.append(message)
             return self.render_to_response(self.get_context_data(form=form))