cubicweb: comparison server/session.py

equal deleted inserted replaced

-:67f242261dd3
+:701b19785f1d
 self.running_dbapi_query = True
 # internal (root) session
 self.is_internal_session = session.is_internal_session
 #: dict containing arbitrary data cleared at the end of the transaction
-self.data = {}
+self.transaction_data = {}
 #: ordered list of operations to be processed on commit/rollback
 self.pending_operations = []
 #: (None, 'precommit', 'postcommit', 'uncommitable')
 self.commit_state = None
 self.undo_actions = config['undo-enabled']
 # RQLRewriter are not thread safe
 self._rewriter = rewriter
-@property
-def transaction_data(self):
-return self.data
 def clear(self):
 """reset internal data"""
-self.data = {}
+self.transaction_data = {}
 #: ordered list of operations to be processed on commit/rollback
 self.pending_operations = []
 #: (None, 'precommit', 'postcommit', 'uncommitable')
 self.commit_state = None
 self.pruned_hooks_cache = {}
 self.repo._free_cnxset(cnxset)
 # Entity cache management #################################################
 #
-# The connection entity cache as held in cnx.data it is removed at end the
+# The connection entity cache as held in cnx.transaction_data it is removed at end the
 # end of the connection (commit and rollback)
 #
 # XXX connection level caching may be a pb with multiple repository
 # instances, but 1. this is probably not the only one :$ and 2. it may be
 # an acceptable risk. Anyway we could activate it or not according to a
 # configuration option
 def set_entity_cache(self, entity):
 """Add `entity` to the connection entity cache"""
-ecache = self.data.setdefault('ecache', {})
+ecache = self.transaction_data.setdefault('ecache', {})
 ecache.setdefault(entity.eid, entity)
 def entity_cache(self, eid):
 """get cache entity for `eid`"""
-return self.data['ecache'][eid]
+return self.transaction_data['ecache'][eid]
 def cached_entities(self):
 """return the whole entity cache"""
-return self.data.get('ecache', {}).values()
+return self.transaction_data.get('ecache', {}).values()
 def drop_entity_cache(self, eid=None):
 """drop entity from the cache
 If eid is None, the whole cache is dropped"""
 if eid is None:
-self.data.pop('ecache', None)
+self.transaction_data.pop('ecache', None)
 else:
-del self.data['ecache'][eid]
+del self.transaction_data['ecache'][eid]
 # Tracking of entity added of removed in the transaction ##################
 #
 # Those are function to  allows cheap call from client in other process.
 def deleted_in_transaction(self, eid):
 """return True if the entity of the given eid is being deleted in the
 current transaction
 """
-return eid in self.data.get('pendingeids', ())
+return eid in self.transaction_data.get('pendingeids', ())
 def added_in_transaction(self, eid):
 """return True if the entity of the given eid is being created in the
 current transaction
 """
-return eid in self.data.get('neweids', ())
+return eid in self.transaction_data.get('neweids', ())
 # Operation management ####################################################
 def add_operation(self, operation, index=None):
 """add an operation to be executed at the end of the transaction"""
 def ertype_supports_undo(self, ertype):
 return self.undo_actions and ertype not in NO_UNDO_TYPES
 def transaction_uuid(self, set=True):
-uuid = self.data.get('tx_uuid')
+uuid = self.transaction_data.get('tx_uuid')
 if set and uuid is None:
 raise KeyError
 return uuid
 def transaction_inc_action_counter(self):
-num = self.data.setdefault('tx_action_count', 0) + 1
+num = self.transaction_data.setdefault('tx_action_count', 0) + 1
-self.data['tx_action_count'] = num
+self.transaction_data['tx_action_count'] = num
 return num
 # db-api like interface ###################################################
 def source_defs(self):
 return self.repo.source_defs()
 # shared data handling ###################################################
 def get_shared_data(self, key, default=None, pop=False, txdata=False):
 """return value associated to `key` in session data"""
 if txdata:
-data = self._cnx.data
+data = self._cnx.transaction_data
 else:
 data = self.data
 if pop:
 return data.pop(key, default)
 else:
 return data.get(key, default)
 def set_shared_data(self, key, value, txdata=False):
 """set value associated to `key` in session data"""
 if txdata:
-self._cnx.data[key] = value
+self._cnx.transaction_data[key] = value
 else:
 self.data[key] = value
 # server-side service call #################################################
 def closed(self):
 return not hasattr(self, '_cnxs')
 # transaction data/operations management ##################################
-transaction_data = cnx_attr('data')
+transaction_data = cnx_attr('transaction_data')
 pending_operations = cnx_attr('pending_operations')
 pruned_hooks_cache = cnx_attr('pruned_hooks_cache')
 add_operation      = cnx_meth('add_operation')
 # undo support ############################################################
 def transaction_uuid(self, set=True):
 try:
 return self._cnx.transaction_uuid(set=set)
 except KeyError:
-self._cnx.data['tx_uuid'] = uuid = uuid4().hex
+self._cnx.transaction_data['tx_uuid'] = uuid = uuid4().hex
 self.repo.system_source.start_undoable_transaction(self, uuid)
 return uuid
 # querier helpers #########################################################

changeset 9024	701b19785f1d
parent 9023	67f242261dd3
child 9025	768eb9a6a2db