9 |
9 |
10 import sys |
10 import sys |
11 import threading |
11 import threading |
12 from time import time |
12 from time import time |
13 |
13 |
14 from logilab.common.deprecation import obsolete |
14 from logilab.common.deprecation import deprecated |
15 from rql.nodes import VariableRef, Function, ETYPE_PYOBJ_MAP, etype_from_pyobj |
15 from rql.nodes import VariableRef, Function, ETYPE_PYOBJ_MAP, etype_from_pyobj |
16 from yams import BASE_TYPES |
16 from yams import BASE_TYPES |
17 |
17 |
18 from cubicweb import RequestSessionMixIn, Binary, UnknownEid |
18 from cubicweb import RequestSessionMixIn, Binary, UnknownEid |
19 from cubicweb.dbapi import ConnectionProperties |
19 from cubicweb.dbapi import ConnectionProperties |
452 self.critical('wrong eid %s in repository, should check database' % value) |
452 self.critical('wrong eid %s in repository, should check database' % value) |
453 row_descr[index] = row[index] = None |
453 row_descr[index] = row[index] = None |
454 description.append(tuple(row_descr)) |
454 description.append(tuple(row_descr)) |
455 return description |
455 return description |
456 |
456 |
457 @obsolete('use direct access to session.transaction_data') |
457 @deprecated('use direct access to session.transaction_data') |
458 def query_data(self, key, default=None, setdefault=False, pop=False): |
458 def query_data(self, key, default=None, setdefault=False, pop=False): |
459 if setdefault: |
459 if setdefault: |
460 assert not pop |
460 assert not pop |
461 return self.transaction_data.setdefault(key, default) |
461 return self.transaction_data.setdefault(key, default) |
462 if pop: |
462 if pop: |
463 return self.transaction_data.pop(key, default) |
463 return self.transaction_data.pop(key, default) |
464 else: |
464 else: |
465 return self.transaction_data.get(key, default) |
465 return self.transaction_data.get(key, default) |
466 |
466 |
467 @obsolete('use entity_from_eid(eid, etype=None)') |
467 @deprecated('use entity_from_eid(eid, etype=None)') |
468 def entity(self, eid): |
468 def entity(self, eid): |
469 """return a result set for the given eid""" |
469 """return a result set for the given eid""" |
470 return self.eid_rset(eid).get_entity(0, 0) |
470 return self.eid_rset(eid).get_entity(0, 0) |
471 |
471 |
472 |
472 |