[datagrepper] Backport upstream patch to fix datetime.fromtimestamp

[Pierre-YvesChibon]

commit 9f4fbd981559390cf3cb11b8463dcc04495975c1
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Thu Jun 6 18:42:27 2013 +0200

    Backport upstream patch to fix datetime.fromtimestamp

 0001-datetime.fromtimestamp-requires-a-float.patch |   44 ++++++++++++++++++++
 datagrepper.spec                                   |   10 ++++-
 2 files changed, 53 insertions(+), 1 deletions(-)
---
diff --git a/0001-datetime.fromtimestamp-requires-a-float.patch b/0001-datetime.fromtimestamp-requires-a-float.patch
new file mode 100644
index 0000000..2abdc02
--- /dev/null
+++ b/0001-datetime.fromtimestamp-requires-a-float.patch
@@ -0,0 +1,44 @@
+From 2f8c98b1dd642b22eecc4d7f02b2716206e58258 Mon Sep 17 00:00:00 2001
+From: Pierre-Yves Chibon <pingou at pingoured.fr>
+Date: Thu, 6 Jun 2013 18:29:46 +0200
+Subject: [PATCH] datetime.fromtimestamp requires a float()
+
+Fix pep8 warning at the same time
+---
+ datagrepper/util.py |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/datagrepper/util.py b/datagrepper/util.py
+index 13c76f1..c4e2f15 100644
+--- a/datagrepper/util.py
++++ b/datagrepper/util.py
+@@ -44,7 +44,7 @@ def timedelta_to_seconds(td):
+     else:
+         return (
+             (td.microseconds + (td.seconds + td.days * 24 * 3600) * 1e6) /
+-                1e6)
++            1e6)
+ 
+ 
+ def assemble_timerange(start, end, delta):
+@@ -62,7 +62,7 @@ def assemble_timerange(start, end, delta):
+             else:
+                 end = float(start) + float(delta)
+ 
+-        end = datetime.fromtimestamp(end)
++        end = datetime.fromtimestamp(float(end))
+ 
+         if start is None:
+             delta = timedelta(seconds=float(delta))
+@@ -76,7 +76,7 @@ def assemble_timerange(start, end, delta):
+         if end is None:
+             end = float(now)
+ 
+-        end = datetime.fromtimestamp(end)
++        end = datetime.fromtimestamp(float(end))
+ 
+         if start is None:
+             delta = timedelta(seconds=600.0)
+-- 
+1.7.1
+
diff --git a/datagrepper.spec b/datagrepper.spec
index 3b22699..f88e4d0 100644
--- a/datagrepper.spec
+++ b/datagrepper.spec
@@ -5,7 +5,7 @@
 
 Name:           datagrepper
 Version:        0.1.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A webapp to query fedmsg history
 
 License:        GPLv2+
@@ -50,6 +50,8 @@ Requires:  fedmsg
 # Needed!
 Requires:  python-psycopg2
 
+PATCH0:    0001-datetime.fromtimestamp-requires-a-float.patch
+
 %description
 A webapp to retrieve historical information about messages on the fedmsg
 bus.  It is a JSON api for the datanommer message store.
@@ -57,6 +59,9 @@ bus.  It is a JSON api for the datanommer message store.
 %prep
 %setup -q
 
+%patch0 -p1 -b .
+
+
 %if %{?rhel}%{!?rhel:0} >= 6
 # Make sure that epel/rhel picks up the correct version of webob
 awk 'NR==1{print "import __main__; __main__.__requires__ = __requires__ = [\"sqlalchemy>=0.7\"]; import pkg_resources"}1' setup.py > setup.py.tmp
@@ -88,6 +93,9 @@ install -m 644 apache/%{modname}.cfg %{buildroot}%{_sysconfdir}/%{modname}/%{mod
 %{python_sitelib}/%{eggname}-%{version}-py%{python_version}.egg-info/
 
 %changelog
+* Thu Jun 06 2013 Pierre-Yves Chibon <pingou at pingoured.fr> - 0.1.4-3
+- Backport patch from commit 2f8c98b in upstream repo
+
 * Fri May 17 2013 Ralph Bean <rbean at redhat.com> - 0.1.4-2
 - Apply temporary sed statement to fix datagrepper.wsgi.