minor Python 3 updates

dlo · dlo · commit 79c05fb67e2a · 2017-12-22T15:20:00.000-06:00
diff --git a/django_pyodbc/management/commands/ss_loaddata.py b/django_pyodbc/management/commands/ss_loaddata.py
@@ -44,6 +44,9 @@
 ss_loaddata management command, we need to keep close track of changes in
 django/core/management/commands/loaddata.py.
 """
+
+from __future__ import print_function
+
 import sys
 import os
 import gzip
@@ -151,7 +154,7 @@ def read(self):
 
             if formats:
                 if verbosity > 1:
-                    print "Loading '%s' fixtures..." % fixture_name
+                    print("Loading '%s' fixtures..." % fixture_name)
             else:
                 self.enable_forward_ref_checks(cursor)
                 sys.stderr.write(
@@ -168,7 +171,7 @@ def read(self):
 
             for fixture_dir in fixture_dirs:
                 if verbosity > 1:
-                    print "Checking %s for fixtures..." % humanize(fixture_dir)
+                    print("Checking %s for fixtures..." % humanize(fixture_dir))
 
                 label_found = False
                 for format in formats:
@@ -180,26 +183,26 @@ def read(self):
                             file_name = '.'.join([fixture_name, format])
 
                         if verbosity > 1:
-                            print "Trying %s for %s fixture '%s'..." % \
-                                (humanize(fixture_dir), file_name, fixture_name)
+                            print("Trying %s for %s fixture '%s'..." % \
+                                (humanize(fixture_dir), file_name, fixture_name))
                         full_path = os.path.join(fixture_dir, file_name)
                         open_method = compression_types[compression_format]
                         try:
                             fixture = open_method(full_path, 'r')
                             if label_found:
                                 fixture.close()
                                 self.enable_forward_ref_checks(cursor)
-                                print self.style.ERROR("Multiple fixtures named '%s' in %s. Aborting." %
-                                    (fixture_name, humanize(fixture_dir)))
+                                print(self.style.ERROR("Multiple fixtures named '%s' in %s. Aborting." %
+                                    (fixture_name, humanize(fixture_dir))))
                                 transaction.rollback()
                                 transaction.leave_transaction_management()
                                 return
                             else:
                                 fixture_count += 1
                                 objects_in_fixture = 0
                                 if verbosity > 0:
-                                    print "Installing %s fixture '%s' from %s." % \
-                                        (format, fixture_name, humanize(fixture_dir))
+                                    print("Installing %s fixture '%s' from %s." % \
+                                        (format, fixture_name, humanize(fixture_dir)))
                                 try:
                                     objects = serializers.deserialize(format, fixture)
                                     for obj in objects:
@@ -239,10 +242,10 @@ def read(self):
                                     transaction.leave_transaction_management()
                                     return
 
-                        except Exception, e:
+                        except Exception as e:
                             if verbosity > 1:
-                                print "No %s fixture '%s' in %s." % \
-                                    (format, fixture_name, humanize(fixture_dir))
+                                print("No %s fixture '%s' in %s." % \
+                                    (format, fixture_name, humanize(fixture_dir)))
 
         self.enable_forward_ref_checks(cursor)
 
@@ -252,7 +255,7 @@ def read(self):
             sequence_sql = connection.ops.sequence_reset_sql(self.style, models)
             if sequence_sql:
                 if verbosity > 1:
-                    print "Resetting sequences"
+                    print("Resetting sequences")
                 for line in sequence_sql:
                     cursor.execute(line)
 
@@ -262,10 +265,10 @@ def read(self):
 
         if object_count == 0:
             if verbosity > 1:
-                print "No fixtures found."
+                print("No fixtures found.")
         else:
             if verbosity > 0:
-                print "Installed %d object(s) from %d fixture(s)" % (object_count, fixture_count)
+                print("Installed %d object(s) from %d fixture(s)" % (object_count, fixture_count))
 
         # Close the DB connection. This is required as a workaround for an
         # edge case in MySQL: if the same connection is used to
