diff -r c0d4244e5abc -r f5027f8d2478 server/repository.py --- a/server/repository.py Wed Mar 20 17:58:14 2013 +0100 +++ b/server/repository.py Tue Mar 12 12:50:05 2013 +0100 @@ -50,7 +50,7 @@ UnknownEid, AuthenticationError, ExecutionError, ETypeNotSupportedBySources, MultiSourcesError, BadConnectionId, Unauthorized, ValidationError, - RepositoryError, UniqueTogetherError, typed_eid, onevent) + RepositoryError, UniqueTogetherError, onevent) from cubicweb import cwvreg, schema, server from cubicweb.server import ShuttingDown, utils, hook, pool, querier, sources from cubicweb.server.session import Session, InternalSession, InternalManager @@ -1018,7 +1018,7 @@ uri)` for the entity of the given `eid` """ try: - eid = typed_eid(eid) + eid = int(eid) except ValueError: raise UnknownEid(eid) try: @@ -1046,7 +1046,7 @@ rqlcache = self.querier._rql_cache for eid in eids: try: - etype, uri, extid, auri = etcache.pop(typed_eid(eid)) # may be a string in some cases + etype, uri, extid, auri = etcache.pop(int(eid)) # may be a string in some cases rqlcache.pop( ('%s X WHERE X eid %s' % (etype, eid),), None) extidcache.pop((extid, uri), None) except KeyError: @@ -1075,7 +1075,7 @@ key, args[key])) cachekey.append(etype) # ensure eid is correctly typed in args - args[key] = typed_eid(args[key]) + args[key] = int(args[key]) return tuple(cachekey) def eid2extid(self, source, eid, session=None):