Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #5548 -- Reintroduced Jython workaround for os.getpid(), which …

…was lost in [6270]. Thanks, leosoto

git-svn-id: http://code.djangoproject.com/svn/django/trunk@6386 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 3db846cdb5ac8606ed66a8dce55f0644f6c1cce3 1 parent 24588af
@adrianholovaty adrianholovaty authored
Showing with 7 additions and 2 deletions.
  1. +7 −2 django/contrib/sessions/backends/base.py
View
9 django/contrib/sessions/backends/base.py
@@ -82,9 +82,14 @@ def _get_new_session_key(self):
"Returns session key that isn't being used."
# The random module is seeded when this Apache child is created.
# Use settings.SECRET_KEY as added salt.
+ try:
+ pid = os.getpid()
+ except AttributeError:
+ # No getpid() in Jython, for example
+ pid = 1
while 1:
- session_key = md5.new("%s%s%s%s" % (random.randint(0, sys.maxint - 1),
- os.getpid(), time.time(), settings.SECRET_KEY)).hexdigest()
+ session_key = md5.new("%s%s%s%s" % (random.randint(0, sys.maxint - 1),
+ pid, time.time(), settings.SECRET_KEY)).hexdigest()
if not self.exists(session_key):
break
return session_key
Please sign in to comment.
Something went wrong with that request. Please try again.