From 80a188c479302ffb66a3fe0bb0dd96132cff722a Mon Sep 17 00:00:00 2001
From: kwall <kurt.wall@excella.com>
Date: Mon, 29 Jun 2015 15:35:14 -0400
Subject: [PATCH] Add timezone to dateformat function

---
 requirements.txt   | 1 +
 sheer/templates.py | 8 ++++++--
 sheer/wsgi.py      | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index b1c5585..0a677b9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,6 +14,7 @@ mock==1.0.1
 nose==1.3.0
 pep8==1.4.6
 python-dateutil==2.1
+pytz==2015.4
 requests==1.2.3
 six==1.9.0
 urllib3==1.7.1
diff --git a/sheer/templates.py b/sheer/templates.py
index bce9603..c290f4c 100644
--- a/sheer/templates.py
+++ b/sheer/templates.py
@@ -1,11 +1,15 @@
 import datetime
 import flask
 from dateutil import parser
+from pytz import timezone
 
 
-def date_formatter(value, format="%Y-%m-%d"):
+def date_formatter(value, format="%Y-%m-%d", tz='America/New_York'):
     if type(value) not in [datetime.datetime, datetime.date]:
-        dt = parser.parse(value, default=datetime.date.today().replace(day=1))
+        date = parser.parse(value, default=datetime.datetime.today().replace(day=1))
+        naive = date.replace(tzinfo=None)
+        dt = timezone(tz).localize(naive)
+        print dt.tzinfo
     else:
         dt = value
 
diff --git a/sheer/wsgi.py b/sheer/wsgi.py
index 04145b6..5229b23 100644
--- a/sheer/wsgi.py
+++ b/sheer/wsgi.py
@@ -148,8 +148,8 @@ def domain_name(url):
         return urlparse(url).netloc.replace('www.', '')
 
     @app.template_filter(name='date')
-    def date_filter(value, format="%Y-%m-%d"):
-        return date_formatter(value, format)
+    def date_filter(value, format="%Y-%m-%d", tz="America/New_York"):
+        return date_formatter(value, format, tz)
 
     @app.template_filter(name='markdown')
     def markdown_filter(raw_text):