Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #5486 -- Worked around the lack of os.getpid() in Jython, whils…

…t still using it for CPython. Patch from Leo Soto.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@6270 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit cd8959c82ace7105d47a082cc7c4a07f61f94f60 1 parent 1baae32
@malcolmt malcolmt authored
Showing with 11 additions and 2 deletions.
  1. +6 −1 django/contrib/sessions/models.py
  2. +5 −1 django/core/mail.py
View
7 django/contrib/sessions/models.py
@@ -15,8 +15,13 @@ 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 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()
try:
self.get(session_key=session_key)
except self.model.DoesNotExist:
View
6 django/core/mail.py
@@ -50,7 +50,11 @@ def make_msgid(idstring=None):
"""
timeval = time.time()
utcdate = time.strftime('%Y%m%d%H%M%S', time.gmtime(timeval))
- pid = os.getpid()
+ try:
+ pid = os.getpid()
+ except AttributeError:
+ # Not getpid() in Jython, for example.
+ pid = 1
randint = random.randrange(100000)
if idstring is None:
idstring = ''
Please sign in to comment.
Something went wrong with that request. Please try again.