Rename contrib session classes

BasicWolf · Jun 25, 2013 · e3369f3 · e3369f3
1 parent 191a13d
commit e3369f3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/kaylee/session.py b/kaylee/session.py
@@ -113,7 +113,7 @@ def restore(self, node, result):
 KL_LOADER_DEFAULT_SESSION_DATA_MANAGER = PhonySessionDataManager
 
 
-class NodeSessionDataManager(SessionDataManager):
+class ServerSessionDataManager(SessionDataManager):
     """A session data manager, which keeps the data in
     :attr:`Node.session_data`."""
     def store(self, node, task):
@@ -132,7 +132,7 @@ def restore(self, node, result):
         result.update(session_data)
 
 
-class JSONSessionDataManager(SessionDataManager):
+class ClientSessionDataManager(SessionDataManager):
     """Stores encrypted session variables in task and restores them
     from the results. For example, the following task data::
 

diff --git a/kaylee/testsuite/session_tests.py b/kaylee/testsuite/session_tests.py
@@ -2,8 +2,8 @@
 from kaylee.testsuite import KayleeTest, load_tests
 from kaylee.node import Node, NodeID
 from kaylee import KayleeError
-from kaylee.session import (_encrypt, _decrypt, JSONSessionDataManager,
-                            NodeSessionDataManager, PhonySessionDataManager,
+from kaylee.session import (_encrypt, _decrypt, ClientSessionDataManager,
+                            ServerSessionDataManager, PhonySessionDataManager,
                             SESSION_DATA_ATTRIBUTE, 
                             SessionDataManager,)
 from kaylee.errors import SessionKeyNameError
@@ -49,7 +49,7 @@ def test_node_session_data_manager(self):
             '#s2' : [1, 2, 3],
         }
 
-        nsdm = NodeSessionDataManager()
+        nsdm = ServerSessionDataManager()
         self.assertIsNone(node.session_data)
         nsdm.store(node, task)
         self.assertIsNotNone(node.session_data)
@@ -89,7 +89,7 @@ def test_json_session_data_manager(self):
             '#s2' : [1, 2, 3],
         }
 
-        jsdm = JSONSessionDataManager(secret_key='abc')
+        jsdm = ClientSessionDataManager(secret_key='abc')
         jsdm.store(node, task)
         self.assertIn(SESSION_DATA_ATTRIBUTE, task)
         self.assertEqual(task['id'], 'i1')