From 0ff122cf9fd0a76871093b595910fb7c0d3bfe85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Wed, 13 Mar 2013 10:05:58 -0300
Subject: Pass mtime to pluggableconfig's load

Also add a request_helpers file to util where all the helper methods for
handling requests should go
---
 src/leap/util/request_helpers.py | 55 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 src/leap/util/request_helpers.py

(limited to 'src/leap/util/request_helpers.py')

diff --git a/src/leap/util/request_helpers.py b/src/leap/util/request_helpers.py
new file mode 100644
index 00000000..c5d0f3f5
--- /dev/null
+++ b/src/leap/util/request_helpers.py
@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+# request_helpers.py
+# Copyright (C) 2013 LEAP
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+Request helpers for backward compatible "parsing" of requests
+"""
+
+import json
+
+from dateutil import parser as dateparser
+
+
+def get_content(request):
+    """
+    Returns the content by trying to get it from the json
+    property/function or from content, in that order.
+    Also returns the mtime for that content if available
+
+    @param request: request as it is given by requests
+    @type request: Response
+
+    @rtype: tuple (contents, mtime)
+    """
+
+    contents = ""
+    mtime = None
+
+    if request.json:
+        if callable(request.json):
+            contents = json.dumps(request.json())
+        else:
+            contents = json.dumps(request.json)
+    else:
+        contents = request.content
+
+    mtime = None
+    last_modified = request.headers.get('last-modified', None)
+    if last_modified:
+        mtime = int(dateparser.parse(last_modified).strftime("%s"))
+
+    return contents, mtime
-- 
cgit v1.2.3


From 9bd35a826b398bd3bdd98824f17a14538d14abb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Thu, 21 Mar 2013 13:40:37 -0300
Subject: Calculate mtime in a more multiplatform way

---
 src/leap/util/request_helpers.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/leap/util/request_helpers.py')

diff --git a/src/leap/util/request_helpers.py b/src/leap/util/request_helpers.py
index c5d0f3f5..019ff353 100644
--- a/src/leap/util/request_helpers.py
+++ b/src/leap/util/request_helpers.py
@@ -19,6 +19,8 @@
 Request helpers for backward compatible "parsing" of requests
 """
 
+import time
+
 import json
 
 from dateutil import parser as dateparser
@@ -50,6 +52,7 @@ def get_content(request):
     mtime = None
     last_modified = request.headers.get('last-modified', None)
     if last_modified:
-        mtime = int(dateparser.parse(last_modified).strftime("%s"))
+        dt = dateparser.parse(unicode(last_modified))
+        mtime = int(time.mktime(dt.timetuple()) + dt.microsecond / 1000000.0)
 
     return contents, mtime
-- 
cgit v1.2.3


From 2dae2703fb8c2ae7e721ce83020c0dd10ff9ca33 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Fri, 3 May 2013 02:59:22 +0900
Subject: updated documentation

* documentation reviewed after rewrite, ready for 0.2.1
* updated docstrings format to fit sphinx autodoc
---
 src/leap/util/request_helpers.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/leap/util/request_helpers.py')

diff --git a/src/leap/util/request_helpers.py b/src/leap/util/request_helpers.py
index 019ff353..e06dabb8 100644
--- a/src/leap/util/request_helpers.py
+++ b/src/leap/util/request_helpers.py
@@ -32,10 +32,10 @@ def get_content(request):
     property/function or from content, in that order.
     Also returns the mtime for that content if available
 
-    @param request: request as it is given by requests
-    @type request: Response
+    :param request: request as it is given by requests
+    :type request: Response
 
-    @rtype: tuple (contents, mtime)
+    :rtype: tuple (contents, mtime)
     """
 
     contents = ""
-- 
cgit v1.2.3