Ticket #18017: loaddata_refactored.diff

django/core/management/commands/loaddata.py

@@ -33 +33 @@
             default=DEFAULT_DB_ALIAS, help='Nominates a specific database to load '
                 'fixtures into. Defaults to the "default" database.'),
     )
+    
+    def _rollback_transaction(self, using):
+        transaction.rollback(using=using)
+        transaction.leave_transaction_management(using=using)
 
     def handle(self, *fixture_labels, **options):
         using = options.get('database')
@@ -134 +138 @@
                             self.style.ERROR("Problem installing fixture '%s': %s is not a known serialization format.\n" %
                                 (fixture_name, format)))
                         if commit:
-                            transaction.rollback(using=using)
-                            transaction.leave_transaction_management(using=using)
+                            self._rollback_transaction(using)
                         return
 
                     if os.path.isabs(fixture_name):
@@ -174 +177 @@
                                         self.stderr.write(self.style.ERROR("Multiple fixtures named '%s' in %s. Aborting.\n" %
                                             (fixture_name, humanize(fixture_dir))))
                                         if commit:
-                                            transaction.rollback(using=using)
-                                            transaction.leave_transaction_management(using=using)
+                                            self._rollback_transaction(using)
                                         return
 
                                     fixture_count += 1
@@ -216 +218 @@
                                         self.style.ERROR("No fixture data found for '%s'. (File format may be invalid.)\n" %
                                             (fixture_name)))
                                     if commit:
-                                        transaction.rollback(using=using)
-                                        transaction.leave_transaction_management(using=using)
+                                        self._rollback_transaction(using)
                                     return
 
             # Since we disabled constraint checks, we must manually check for
@@ -229 +230 @@
             raise
         except Exception:
             if commit:
-                transaction.rollback(using=using)
-                transaction.leave_transaction_management(using=using)
+                self._rollback_transaction(using)
             if show_traceback:
                 traceback.print_exc()
             else: