d0e1110fda
[Patch 2/3] update to version 1.11.13-4 remove unnecessary patches Story: 2004522 Task: 28402 Depends-On: https://review.openstack.org/#/c/627590/ Change-Id: Icec77377cb40c253ad4f94a62595b35cae6b46e4 Signed-off-by: SidneyAn <ran1.an@intel.com>
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
From 1ab6e8cd0031813aa2b70847d6b54f294d8f90f5 Mon Sep 17 00:00:00 2001
|
|
From: Giao Le <giao.le@windriver.com>
|
|
Date: Mon, 11 Jul 2016 16:20:13 -0400
|
|
Subject: [PATCH 1/1] session-filebase-backend-fix
|
|
|
|
---
|
|
Django-1.11.13 | 1 +
|
|
django/contrib/sessions/backends/file.py | 3 +++
|
|
2 files changed, 4 insertions(+)
|
|
create mode 100644 Django-1.11.13
|
|
|
|
diff --git a/Django-1.11.13 b/Django-1.11.13
|
|
new file mode 100644
|
|
index 0000000..b7c239f
|
|
--- /dev/null
|
|
+++ b/Django-1.11.13
|
|
@@ -0,0 +1 @@
|
|
+Django-1.11.13
|
|
|
|
diff --git a/django/contrib/sessions/backends/file.py b/django/contrib/sessions/backends/file.py
|
|
index 41469c4..2b10b3e 100644
|
|
--- a/django/contrib/sessions/backends/file.py
|
|
+++ b/django/contrib/sessions/backends/file.py
|
|
@@ -78,6 +78,9 @@ class SessionStore(SessionBase):
|
|
expiry = session_data.get('_session_expiry')
|
|
if not expiry:
|
|
expiry = self._last_modification() + datetime.timedelta(seconds=settings.SESSION_COOKIE_AGE)
|
|
+ elif not isinstance(expiry, datetime.datetime):
|
|
+ expiry = self._last_modification() + datetime.timedelta(seconds=expiry)
|
|
+
|
|
return expiry
|
|
|
|
def load(self):
|
|
--
|
|
1.8.3.1
|
|
|