summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2008-05-29 11:50:50 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2008-05-29 11:50:50 +0000
commit8a0b8d93b2aa88c0d5bd70a2637ebb05c04fcca8 (patch)
tree4590acef6e464c761fd591091ebb99bd6ad15d6c
parent55d5f7ecf4a5deff75d9dd6f565583e4cb16fcd2 (diff)
Fixed #7286 -- Added functools wrapping to the transaction decorators. Thanks, SmileyChris.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7558 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/db/transaction.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/django/db/transaction.py b/django/db/transaction.py
index bb90713525..c0c3779f6a 100644
--- a/django/db/transaction.py
+++ b/django/db/transaction.py
@@ -16,6 +16,10 @@ try:
import thread
except ImportError:
import dummy_thread as thread
+try:
+ from functools import wraps
+except ImportError:
+ from django.utils.functional import wraps # Python 2.3, 2.4 fallback.
from django.db import connection
from django.conf import settings
@@ -177,7 +181,7 @@ def autocommit(func):
return func(*args, **kw)
finally:
leave_transaction_management()
- return _autocommit
+ return wraps(func)(_autocommit)
def commit_on_success(func):
"""
@@ -202,7 +206,7 @@ def commit_on_success(func):
return res
finally:
leave_transaction_management()
- return _commit_on_success
+ return wraps(func)(_commit_on_success)
def commit_manually(func):
"""
@@ -219,4 +223,4 @@ def commit_manually(func):
finally:
leave_transaction_management()
- return _commit_manually
+ return wraps(func)(_commit_manually)