Ticket #2304: fixed_transaction_settings_variable_name.diff

db/transaction.py

@@ -61 +61 @@
         state[thread_ident][using].append(state[thread_ident][using][-1])
     else:
         state.setdefault(thread_ident, {})
-        state[thread_ident][using] = [settings.TRANSACTIONS_MANAGED]
+        if hasattr(settings, 'TRANSACTIONS_MANAGED'):
+            state[thread_ident][using] = [settings.TRANSACTIONS_MANAGED]
+            warnings.warn(
+                '`settings.TRANSACTIONS_MANAGED` is deprecated. '
+                'Please update your code to use DISABLE_TRANSACTION_MANAGEMENT.',
+                PendingDeprecationWarning
+            )
+        else:
+            state[thread_ident][using] = [settings.DISABLE_TRANSACTION_MANAGEMENT]
+
     if thread_ident not in dirty or using not in dirty[thread_ident]:
         dirty.setdefault(thread_ident, {})
         dirty[thread_ident][using] = False
@@ -142 +151 @@
     if thread_ident in state and using in state[thread_ident]:
         if state[thread_ident][using]:
             return state[thread_ident][using][-1]
-    return settings.TRANSACTIONS_MANAGED
+    if hasattr(settings, 'TRANSACTIONS_MANAGED'):
+        warnings.warn(
+            '`settings.TRANSACTIONS_MANAGED` is deprecated. '
+            'Please update your code to use DISABLE_TRANSACTION_MANAGEMENT.',
+            PendingDeprecationWarning
+        )
+        return settings.TRANSACTIONS_MANAGED
+    else:
+        return settings.DISABLE_TRANSACTION_MANAGEMENT
 
 def managed(flag=True, using=None):
     """

conf/global_settings.py

@@ -378 +378 @@
 
 # Do you want to manage transactions manually?
 # Hint: you really don't!
-TRANSACTIONS_MANAGED = False
+DISABLE_TRANSACTION_MANAGEMENT = False
 
 # The User-Agent string to use when checking for URL validity through the
 # isExistingURL validator.