*** ../Quixote-0.7a3/session.py	2003-12-03 15:30:30.000000000 -0800
--- session.py	2004-02-28 19:54:50.000000000 -0800
***************
*** 229,235 ****
          Return a new session object, ie. an instance of the session_class
          class passed to the constructor (defaults to Session).
          """
!         return self.session_class(request, id)
  
      def _get_session_id (self, request, config):
          """_get_session_id(request : HTTPRequest) -> string
--- 229,235 ----
          Return a new session object, ie. an instance of the session_class
          class passed to the constructor (defaults to Session).
          """
!         return self.session_class(id, request.get_environ('REMOTE_ADDR'))
  
      def _get_session_id (self, request, config):
          """_get_session_id(request : HTTPRequest) -> string
***************
*** 444,454 ****
  
      MAX_FORM_TOKENS = 16 # maximum number of outstanding form tokens
  
!     def __init__ (self, request, id):
          self.id = id
          self.user = None
!         self.__remote_address = request.get_environ("REMOTE_ADDR")
!         self.__creation_time = self.__access_time = time()
          self._form_tokens = [] # queue
  
      def __repr__ (self):
--- 444,458 ----
  
      MAX_FORM_TOKENS = 16 # maximum number of outstanding form tokens
  
!     def __init__ (self, id, remote_address, creation_time = None):
          self.id = id
          self.user = None
!         self.__remote_address = remote_address
!         if creation_time:
!             self.__creation_time = self.__access_time = creation_time
!         else:
!             self.__creation_time = self.__access_time = time()
!             
          self._form_tokens = [] # queue
  
      def __repr__ (self):