Ticket #5486: jython_no_pid.patch

django/core/mail.py

@@ -50 +50 @@
     """
     timeval = time.time()
     utcdate = time.strftime('%Y%m%d%H%M%S', time.gmtime(timeval))
-    pid = os.getpid()
+    try:
+        pid = os.getpid()
+    except AttributeError:
+        # At least on Jython there is no getpid()
+        pid = 1
     randint = random.randrange(100000)
     if idstring is None:
         idstring = ''

django/contrib/sessions/models.py

@@ -15 +15 @@
         "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:
+            # At least on Jython there is no getpid()
+            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: