Django

Code

Changeset 6386

Show
Ignore:
Timestamp:
09/19/07 21:19:48 (1 year ago)
Author:
adrian
Message:

Fixed #5548 -- Reintroduced Jython workaround for os.getpid(), which was lost in [6270]. Thanks, leosoto

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/contrib/sessions/backends/base.py

    r6365 r6386  
    8383        # The random module is seeded when this Apache child is created. 
    8484        # Use settings.SECRET_KEY as added salt. 
     85        try: 
     86            pid = os.getpid() 
     87        except AttributeError: 
     88            # No getpid() in Jython, for example 
     89            pid = 1 
    8590        while 1: 
    86             session_key = md5.new("%s%s%s%s" % (random.randint(0, sys.maxint - 1),  
    87                                   os.getpid(), time.time(), settings.SECRET_KEY)).hexdigest() 
     91            session_key = md5.new("%s%s%s%s" % (random.randint(0, sys.maxint - 1), 
     92                                  pid, time.time(), settings.SECRET_KEY)).hexdigest() 
    8893            if not self.exists(session_key): 
    8994                break