From 78b5c65844a53a72bda6efad5aac33dbf90a929c Mon Sep 17 00:00:00 2001
From: Karen Tracey <kmtracey@gmail.com>
Date: Tue, 31 Mar 2009 13:04:28 +0000
Subject: [PATCH] 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
---
 django/test/testcases.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/django/test/testcases.py b/django/test/testcases.py
index 5faef11ba2e..550baf91373 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():