From 933f29f4cf244ac90c3e9c3d831ec2184453d8e0 Mon Sep 17 00:00:00 2001
From: ?ngel ?lvarez Serra <angel@nan-tic.com>
Date: Thu, 9 Jan 2014 15:44:18 +0100
Subject: [PATCH] update codereview 1961002

---
 issue1961002_40001.diff => issue1961002_60001.diff | 12 ++++++------
 series                                             |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename issue1961002_40001.diff => issue1961002_60001.diff (96%)

diff --git a/issue1961002_40001.diff b/issue1961002_60001.diff
similarity index 96%
rename from issue1961002_40001.diff
rename to issue1961002_60001.diff
index 8b4e931..dc4360f 100644
--- a/issue1961002_40001.diff
+++ b/issue1961002_60001.diff
@@ -1,4 +1,4 @@
-Index: trytond/trytond/tests/test_transaction.py
+Index: trytond/tests/test_transaction.py
 ===================================================================
 
 --- a/trytond/trytond/tests/test_transaction.py
@@ -6,7 +6,7 @@ Index: trytond/trytond/tests/test_transaction.py
 @@ -56,6 +56,41 @@
              Exception, manipulate_cursor, DB_NAME, USER, context=CONTEXT)
          self.assertTrue(empty_transaction(DB_NAME, USER, context=CONTEXT))
-
+ 
 +    def test0030set_user(self):
 +        '''
 +        Test set_user
@@ -42,18 +42,18 @@ Index: trytond/trytond/tests/test_transaction.py
 +            with Transaction().set_user(2):
 +                self.assertEqual(transaction.user, 2)
 +
-
+ 
  def suite():
      return unittest.TestLoader().loadTestsFromTestCase(TransactionTestCase)
 
-Index: trytond/trytond/transaction.py
+Index: trytond/transaction.py
 ===================================================================
 
 --- a/trytond/trytond/transaction.py
 +++ b/trytond/trytond/transaction.py
 @@ -118,10 +118,16 @@
          return manager
-
+ 
      def set_user(self, user, set_context=False):
 +        if user != 0 and set_context:
 +            raise ValueError('set_context only allowed for root')
@@ -69,5 +69,5 @@ Index: trytond/trytond/transaction.py
 +            self.context.pop('user', None)
          self.user = user
          return manager
-
+ 
 
diff --git a/series b/series
index 657ef05..14bdd32 100644
--- a/series
+++ b/series
@@ -1,7 +1,7 @@
 issue971002_217001.diff
-issue2341002_1_10001.diff
+#issue2341002_1_10001.diff
 issue2311002_40001.diff
 issue2321002_1.diff
-issue1961002_40001.diff
 issue10739.diff
 issue10467.diff
+issue1961002_60001.diff