summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Tracey <kmtracey@gmail.com>2009-03-31 13:04:28 +0000
committerKaren Tracey <kmtracey@gmail.com>2009-03-31 13:04:28 +0000
commit78b5c65844a53a72bda6efad5aac33dbf90a929c (patch)
treea3fbd186db5b3c3875b9ceba70bcedf523350b15
parenta018eb45aca3c8f9f157625e68938d5ab7a68a32 (diff)
Fixed #10676 -- Make transaction nop routine used during testing accept any args/kwargs it might be called with. Thanks seanl.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10248 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/test/testcases.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/test/testcases.py b/django/test/testcases.py
index 5faef11ba2..550baf9137 100644
--- a/django/test/testcases.py
+++ b/django/test/testcases.py
@@ -34,7 +34,7 @@ real_leave_transaction_management = transaction.leave_transaction_management
real_savepoint_commit = transaction.savepoint_commit
real_savepoint_rollback = transaction.savepoint_rollback
-def nop(x=None):
+def nop(*args, **kwargs):
return
def disable_transaction_methods():