Merge lp:~acsone-openerp/openerp-connector/7.0-bug-1304319 into lp:~openerp-connector-core-editors/openerp-connector/7.0

[Laurent Mignon (Acsone)]

fixes lp:1304319

[Laetitia Gangloff (Acsone) (laetitia-gangloff)]

For me, it seems ok.

review: Approve (code)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Excellent. Thanks

review: Approve (code review)

[Sébastien BEAU - http://www.akretion.com (sebastien.beau)]

Great work

review: Approve (not test, code review)

=== modified file 'connector/session.py'
--- connector/session.py	2013-09-13 13:22:49 +0000
+++ connector/session.py	2014-04-08 10:38:23 +0000
@@ -138,7 +138,7 @@
         :param values: values to apply on the context
         :type values: dict
         """
-        original_context = self._context
+        original_context = self.context
         self._context = original_context.copy()
         self._context.update(values)
         yield

=== modified file 'connector/tests/test_session.py'
--- connector/tests/test_session.py	2013-05-02 14:01:27 +0000
+++ connector/tests/test_session.py	2014-04-08 10:38:23 +0000
@@ -85,3 +85,19 @@
         res_users = self.registry('res.users')
 
         self.assertEqual(self.session.pool.get('res.users'), res_users)
+
+    def test_change_context(self):
+        """
+        Change the context and check if it is reverted correctly at the end
+        """
+        test_key = 'test_key'
+        self.assertNotIn(test_key, self.session.context)
+        with self.session.change_context({test_key: 'value'}):
+            self.assertIn(test_key, self.session.context)
+        self.assertNotIn(test_key, self.session.context)
+
+        #change the context on a session not initialized with a context
+        session = ConnectorSession(self.cr, self.uid)
+        with session.change_context({test_key: 'value'}):
+            self.assertIn(test_key, session.context)
+        self.assertNotIn(test_key, session.context)