[server/session] session.id → session.sessionid
authorJulien Cristau <julien.cristau@logilab.fr>
Thu, 30 Jan 2014 16:33:32 +0100
changeset 9493 852f5ac90cd9
parent 9491 e82370a30018
child 9494 197b7a4ef544
[server/session] session.id → session.sessionid The former causes deprecation warnings.
server/session.py
--- a/server/session.py	Mon Feb 03 19:00:52 2014 +0100
+++ b/server/session.py	Thu Jan 30 16:33:32 2014 +0100
@@ -450,9 +450,9 @@
         #: connection unique id
         self._open = None
         if cnxid is None:
-            cnxid = '%s-%s' % (session.id, uuid4().hex)
+            cnxid = '%s-%s' % (session.sessionid, uuid4().hex)
         self.connectionid = cnxid
-        self.sessionid = session.id
+        self.sessionid = session.sessionid
         #: self._session_handled
         #: are the life cycle of this Connection automatically controlled by the
         #: Session This is the old backward compatibility mode
@@ -1365,7 +1365,7 @@
 
     def __unicode__(self):
         return '<session %s (%s 0x%x)>' % (
-            unicode(self.user.login), self.id, id(self))
+            unicode(self.user.login), self.sessionid, id(self))
     @property
     def timestamp(self):
         return float(self._timestamp)