SessionTool: fix DistributedSession conformance to dict interface

.pop .popitem and .setdefault where returning None

product/ERP5Type/Tool/SessionTool.py

@@ -135,16 +135,19 @@ class DistributedSession(Session):
     self._updateStorage()
 
   def setdefault(self, key, failobj=None):
-    Session.setdefault(self, key, failobj)
+    r = Session.setdefault(self, key, failobj)
     self._updateStorage()
+    return r
 
   def pop(self, key, *args):
-    Session.pop(self, key, *args)
+    r = Session.pop(self, key, *args)
     self._updateStorage()
+    return r
 
   def popitem(self):
-    Session.popitem(self)
+    r = Session.popitem(self)
     self._updateStorage()
+    return r
 
 
 class SessionTool(BaseTool):

product/ERP5Type/tests/testSessionTool.py

@@ -183,6 +183,7 @@ class TestSessionTool(ERP5TypeTestCase):
                                    sequence_list=None, **kw):
     session = self.portal.portal_sessions[self.session_id]
     session.clear()
+    # get / set
     session['foo'] = 'Bar'
     self.assertTrue('foo' in session)
     self.assertEqual('Bar', session['foo'])
@@ -191,6 +192,26 @@ class TestSessionTool(ERP5TypeTestCase):
     self.assertEqual('Default', session.get('bar', 'Default'))
     self.assertRaises(KeyError, session.__getitem__, 'bar')
 
+    # pop
+    session['pop'] = 'Bar'
+    self.assertEqual('Bar', session.pop('pop'))
+    self.assertRaises(KeyError, session.__getitem__, 'pop')
+    self.assertEqual('Default', session.pop('pop', 'Default'))
+
+    # setdefault
+    self.assertEqual('Default', session.setdefault('setdefault', 'Default'))
+    self.assertEqual('Default', session.setdefault('setdefault', 'Default was set'))
+
+    # clear / items
+    session.clear()
+    self.assertEqual([], list(session.items()))
+
+    # popitem
+    session['popitem'] = 'Bar'
+    self.assertEqual(('popitem', 'Bar'), session.popitem())
+    self.assertRaises(KeyError, session.popitem)
+
+
   def stepTestSessionGetattr(self, sequence=None, \
                              sequence_list=None, **kw):
     session = self.portal.portal_sessions[self.session_id]