# HG changeset patch # User Julien Cristau # Date 1429717527 -7200 # Node ID 28db21e0c8e5e36f9710b80e88d12986287007a2 # Parent 57c5ec22922d2880e5265e8bdb1360468da3c2b7 [dbapi] retire repo.[gs]et_shared_data which were used by the dbapi Related to #3933480 diff -r 57c5ec22922d -r 28db21e0c8e5 server/repository.py --- a/server/repository.py Tue Mar 17 16:00:30 2015 +0100 +++ b/server/repository.py Wed Apr 22 17:45:27 2015 +0200 @@ -670,30 +670,6 @@ """ return self._get_session(sessionid, setcnxset=False).timestamp - @deprecated('[3.19] use session or transaction data') - def get_shared_data(self, sessionid, key, default=None, pop=False, txdata=False): - """return value associated to key in the session's data dictionary or - session's transaction's data if `txdata` is true. - - If pop is True, value will be removed from the dictionary. - - If key isn't defined in the dictionary, value specified by the - `default` argument will be returned. - """ - session = self._get_session(sessionid, setcnxset=False) - return session.get_shared_data(key, default, pop, txdata) - - @deprecated('[3.19] use session or transaction data') - def set_shared_data(self, sessionid, key, value, txdata=False): - """set value associated to `key` in shared data - - if `txdata` is true, the value will be added to the repository session's - transaction's data which are cleared on commit/rollback of the current - transaction. - """ - session = self._get_session(sessionid, setcnxset=False) - session.set_shared_data(key, value, txdata) - def close(self, sessionid, txid=None, checkshuttingdown=True): """close the session with the given id""" session = self._get_session(sessionid, txid=txid, diff -r 57c5ec22922d -r 28db21e0c8e5 server/test/unittest_repository.py --- a/server/test/unittest_repository.py Tue Mar 17 16:00:30 2015 +0100 +++ b/server/test/unittest_repository.py Wed Apr 22 17:45:27 2015 +0200 @@ -148,26 +148,6 @@ self.assert_(cnxid) repo.close(cnxid) - def test_shared_data(self): - repo = self.repo - cnxid = repo.connect(self.admlogin, password=self.admpassword) - repo.set_shared_data(cnxid, 'data', 4) - cnxid2 = repo.connect(self.admlogin, password=self.admpassword) - self.assertEqual(repo.get_shared_data(cnxid, 'data'), 4) - self.assertEqual(repo.get_shared_data(cnxid2, 'data'), None) - repo.set_shared_data(cnxid2, 'data', 5) - self.assertEqual(repo.get_shared_data(cnxid, 'data'), 4) - self.assertEqual(repo.get_shared_data(cnxid2, 'data'), 5) - repo.get_shared_data(cnxid2, 'data', pop=True) - self.assertEqual(repo.get_shared_data(cnxid, 'data'), 4) - self.assertEqual(repo.get_shared_data(cnxid2, 'data'), None) - repo.close(cnxid) - repo.close(cnxid2) - self.assertRaises(BadConnectionId, repo.get_shared_data, cnxid, 'data') - self.assertRaises(BadConnectionId, repo.get_shared_data, cnxid2, 'data') - self.assertRaises(BadConnectionId, repo.set_shared_data, cnxid, 'data', 1) - self.assertRaises(BadConnectionId, repo.set_shared_data, cnxid2, 'data', 1) - def test_check_session(self): repo = self.repo cnxid = repo.connect(self.admlogin, password=self.admpassword) @@ -236,19 +216,6 @@ # .properties() return a result set self.assertEqual(self.repo.properties().rql, 'Any K,V WHERE P is CWProperty,P pkey K, P value V, NOT P for_user U') - def test_shared_data_api(self): - repo = self.repo - cnxid = repo.connect(self.admlogin, password=self.admpassword) - self.assertEqual(repo.get_shared_data(cnxid, 'data'), None) - repo.set_shared_data(cnxid, 'data', 4) - self.assertEqual(repo.get_shared_data(cnxid, 'data'), 4) - repo.get_shared_data(cnxid, 'data', pop=True) - repo.get_shared_data(cnxid, 'whatever', pop=True) - self.assertEqual(repo.get_shared_data(cnxid, 'data'), None) - repo.close(cnxid) - self.assertRaises(BadConnectionId, repo.set_shared_data, cnxid, 'data', 0) - self.assertRaises(BadConnectionId, repo.get_shared_data, cnxid, 'data') - def test_schema_is_relation(self): with self.admin_access.repo_cnx() as cnx: no_is_rset = cnx.execute('Any X WHERE NOT X is ET')