mirror of
https://github.com/djohnlewis/stackdump
synced 2024-12-04 23:17:37 +00:00
Dates are now formatted using a custom template filter, format_datetime.
This commit is contained in:
parent
045b50fe6c
commit
90e46dfacf
1
python/packages/iso8601/__init__.py
Normal file
1
python/packages/iso8601/__init__.py
Normal file
@ -0,0 +1 @@
|
||||
from iso8601 import *
|
102
python/packages/iso8601/iso8601.py
Normal file
102
python/packages/iso8601/iso8601.py
Normal file
@ -0,0 +1,102 @@
|
||||
"""ISO 8601 date time string parsing
|
||||
|
||||
Basic usage:
|
||||
>>> import iso8601
|
||||
>>> iso8601.parse_date("2007-01-25T12:00:00Z")
|
||||
datetime.datetime(2007, 1, 25, 12, 0, tzinfo=<iso8601.iso8601.Utc ...>)
|
||||
>>>
|
||||
|
||||
"""
|
||||
|
||||
from datetime import datetime, timedelta, tzinfo
|
||||
import re
|
||||
|
||||
__all__ = ["parse_date", "ParseError"]
|
||||
|
||||
# Adapted from http://delete.me.uk/2005/03/iso8601.html
|
||||
ISO8601_REGEX = re.compile(r"(?P<year>[0-9]{4})(-(?P<month>[0-9]{1,2})(-(?P<day>[0-9]{1,2})"
|
||||
r"((?P<separator>.)(?P<hour>[0-9]{2}):(?P<minute>[0-9]{2})(:(?P<second>[0-9]{2})(\.(?P<fraction>[0-9]+))?)?"
|
||||
r"(?P<timezone>Z|(([-+])([0-9]{2}):([0-9]{2})))?)?)?)?"
|
||||
)
|
||||
TIMEZONE_REGEX = re.compile("(?P<prefix>[+-])(?P<hours>[0-9]{2}).(?P<minutes>[0-9]{2})")
|
||||
|
||||
class ParseError(Exception):
|
||||
"""Raised when there is a problem parsing a date string"""
|
||||
|
||||
# Yoinked from python docs
|
||||
ZERO = timedelta(0)
|
||||
class Utc(tzinfo):
|
||||
"""UTC
|
||||
|
||||
"""
|
||||
def utcoffset(self, dt):
|
||||
return ZERO
|
||||
|
||||
def tzname(self, dt):
|
||||
return "UTC"
|
||||
|
||||
def dst(self, dt):
|
||||
return ZERO
|
||||
UTC = Utc()
|
||||
|
||||
class FixedOffset(tzinfo):
|
||||
"""Fixed offset in hours and minutes from UTC
|
||||
|
||||
"""
|
||||
def __init__(self, offset_hours, offset_minutes, name):
|
||||
self.__offset = timedelta(hours=offset_hours, minutes=offset_minutes)
|
||||
self.__name = name
|
||||
|
||||
def utcoffset(self, dt):
|
||||
return self.__offset
|
||||
|
||||
def tzname(self, dt):
|
||||
return self.__name
|
||||
|
||||
def dst(self, dt):
|
||||
return ZERO
|
||||
|
||||
def __repr__(self):
|
||||
return "<FixedOffset %r>" % self.__name
|
||||
|
||||
def parse_timezone(tzstring, default_timezone=UTC):
|
||||
"""Parses ISO 8601 time zone specs into tzinfo offsets
|
||||
|
||||
"""
|
||||
if tzstring == "Z":
|
||||
return default_timezone
|
||||
# This isn't strictly correct, but it's common to encounter dates without
|
||||
# timezones so I'll assume the default (which defaults to UTC).
|
||||
# Addresses issue 4.
|
||||
if tzstring is None:
|
||||
return default_timezone
|
||||
m = TIMEZONE_REGEX.match(tzstring)
|
||||
prefix, hours, minutes = m.groups()
|
||||
hours, minutes = int(hours), int(minutes)
|
||||
if prefix == "-":
|
||||
hours = -hours
|
||||
minutes = -minutes
|
||||
return FixedOffset(hours, minutes, tzstring)
|
||||
|
||||
def parse_date(datestring, default_timezone=UTC):
|
||||
"""Parses ISO 8601 dates into datetime objects
|
||||
|
||||
The timezone is parsed from the date string. However it is quite common to
|
||||
have dates without a timezone (not strictly correct). In this case the
|
||||
default timezone specified in default_timezone is used. This is UTC by
|
||||
default.
|
||||
"""
|
||||
if not isinstance(datestring, basestring):
|
||||
raise ParseError("Expecting a string %r" % datestring)
|
||||
m = ISO8601_REGEX.match(datestring)
|
||||
if not m:
|
||||
raise ParseError("Unable to parse date string %r" % datestring)
|
||||
groups = m.groupdict()
|
||||
tz = parse_timezone(groups["timezone"], default_timezone=default_timezone)
|
||||
if groups["fraction"] is None:
|
||||
groups["fraction"] = 0
|
||||
else:
|
||||
groups["fraction"] = int(float("0.%s" % groups["fraction"]) * 1e6)
|
||||
return datetime(int(groups["year"]), int(groups["month"]), int(groups["day"]),
|
||||
int(groups["hour"]), int(groups["minute"]), int(groups["second"]),
|
||||
int(groups["fraction"]), tz)
|
111
python/packages/iso8601/test_iso8601.py
Normal file
111
python/packages/iso8601/test_iso8601.py
Normal file
@ -0,0 +1,111 @@
|
||||
import iso8601
|
||||
|
||||
def test_iso8601_regex():
|
||||
assert iso8601.ISO8601_REGEX.match("2006-10-11T00:14:33Z")
|
||||
|
||||
def test_timezone_regex():
|
||||
assert iso8601.TIMEZONE_REGEX.match("+01:00")
|
||||
assert iso8601.TIMEZONE_REGEX.match("+00:00")
|
||||
assert iso8601.TIMEZONE_REGEX.match("+01:20")
|
||||
assert iso8601.TIMEZONE_REGEX.match("-01:00")
|
||||
|
||||
def test_parse_date():
|
||||
d = iso8601.parse_date("2006-10-20T15:34:56Z")
|
||||
assert d.year == 2006
|
||||
assert d.month == 10
|
||||
assert d.day == 20
|
||||
assert d.hour == 15
|
||||
assert d.minute == 34
|
||||
assert d.second == 56
|
||||
assert d.tzinfo == iso8601.UTC
|
||||
|
||||
def test_parse_date_fraction():
|
||||
d = iso8601.parse_date("2006-10-20T15:34:56.123Z")
|
||||
assert d.year == 2006
|
||||
assert d.month == 10
|
||||
assert d.day == 20
|
||||
assert d.hour == 15
|
||||
assert d.minute == 34
|
||||
assert d.second == 56
|
||||
assert d.microsecond == 123000
|
||||
assert d.tzinfo == iso8601.UTC
|
||||
|
||||
def test_parse_date_fraction_2():
|
||||
"""From bug 6
|
||||
|
||||
"""
|
||||
d = iso8601.parse_date("2007-5-7T11:43:55.328Z'")
|
||||
assert d.year == 2007
|
||||
assert d.month == 5
|
||||
assert d.day == 7
|
||||
assert d.hour == 11
|
||||
assert d.minute == 43
|
||||
assert d.second == 55
|
||||
assert d.microsecond == 328000
|
||||
assert d.tzinfo == iso8601.UTC
|
||||
|
||||
def test_parse_date_tz():
|
||||
d = iso8601.parse_date("2006-10-20T15:34:56.123+02:30")
|
||||
assert d.year == 2006
|
||||
assert d.month == 10
|
||||
assert d.day == 20
|
||||
assert d.hour == 15
|
||||
assert d.minute == 34
|
||||
assert d.second == 56
|
||||
assert d.microsecond == 123000
|
||||
assert d.tzinfo.tzname(None) == "+02:30"
|
||||
offset = d.tzinfo.utcoffset(None)
|
||||
assert offset.days == 0
|
||||
assert offset.seconds == 60 * 60 * 2.5
|
||||
|
||||
def test_parse_invalid_date():
|
||||
try:
|
||||
iso8601.parse_date(None)
|
||||
except iso8601.ParseError:
|
||||
pass
|
||||
else:
|
||||
assert 1 == 2
|
||||
|
||||
def test_parse_invalid_date2():
|
||||
try:
|
||||
iso8601.parse_date("23")
|
||||
except iso8601.ParseError:
|
||||
pass
|
||||
else:
|
||||
assert 1 == 2
|
||||
|
||||
def test_parse_no_timezone():
|
||||
"""issue 4 - Handle datetime string without timezone
|
||||
|
||||
This tests what happens when you parse a date with no timezone. While not
|
||||
strictly correct this is quite common. I'll assume UTC for the time zone
|
||||
in this case.
|
||||
"""
|
||||
d = iso8601.parse_date("2007-01-01T08:00:00")
|
||||
assert d.year == 2007
|
||||
assert d.month == 1
|
||||
assert d.day == 1
|
||||
assert d.hour == 8
|
||||
assert d.minute == 0
|
||||
assert d.second == 0
|
||||
assert d.microsecond == 0
|
||||
assert d.tzinfo == iso8601.UTC
|
||||
|
||||
def test_parse_no_timezone_different_default():
|
||||
tz = iso8601.FixedOffset(2, 0, "test offset")
|
||||
d = iso8601.parse_date("2007-01-01T08:00:00", default_timezone=tz)
|
||||
assert d.tzinfo == tz
|
||||
|
||||
def test_space_separator():
|
||||
"""Handle a separator other than T
|
||||
|
||||
"""
|
||||
d = iso8601.parse_date("2007-06-23 06:40:34.00Z")
|
||||
assert d.year == 2007
|
||||
assert d.month == 6
|
||||
assert d.day == 23
|
||||
assert d.hour == 6
|
||||
assert d.minute == 40
|
||||
assert d.second == 34
|
||||
assert d.microsecond == 0
|
||||
assert d.tzinfo == iso8601.UTC
|
@ -15,6 +15,7 @@ from bottle import route, run, static_file, debug, abort, request, redirect
|
||||
from jinja2 import Environment, PackageLoader
|
||||
from sqlobject import sqlhub, connectionForURI, AND, OR, SQLObjectNotFound
|
||||
from pysolr import Solr
|
||||
import iso8601
|
||||
|
||||
from stackdump.models import Site, Badge, Comment, User
|
||||
|
||||
@ -27,6 +28,25 @@ MEDIA_ROOT = os.path.abspath(BOTTLE_ROOT + '/../../media')
|
||||
thread_locals = threading.local()
|
||||
|
||||
|
||||
# CUSTOM TEMPLATE TAGS AND FILTERS
|
||||
|
||||
def format_datetime(value):
|
||||
'''\
|
||||
Formats a datetime to something nice. If a string is given, an attempt will
|
||||
be made at parsing it.
|
||||
'''
|
||||
if isinstance(value, basestring):
|
||||
try:
|
||||
value = iso8601.parse_date(value)
|
||||
except iso8601.ParseError, e:
|
||||
# couldn't parse it, so just return what we were given
|
||||
return value
|
||||
|
||||
return value.strftime('%d %b %Y %I:%M %p')
|
||||
|
||||
# END CUSTOM TEMPLATE TAGS AND FILTERS
|
||||
|
||||
|
||||
# RESOURCE DECORATORS
|
||||
|
||||
def uses_templates(fn):
|
||||
@ -47,6 +67,7 @@ def uses_templates(fn):
|
||||
# template.
|
||||
extensions=['jinja2.ext.autoescape']
|
||||
)
|
||||
thread_locals.template_env.filters['format_datetime'] = format_datetime
|
||||
|
||||
if not fn:
|
||||
init_templates()
|
||||
|
@ -38,7 +38,7 @@
|
||||
<p>{{ r.question.body|striptags|truncate(256) }}</p>
|
||||
<p class="post-details">
|
||||
Asked by <strong>{{ r.question.ownerUserId }}</strong> on
|
||||
<strong>{{ r.question.creationDate }}</strong>.
|
||||
<strong>{{ r.question.creationDate|format_datetime }}</strong>.
|
||||
</p>
|
||||
<div class="post-tags">
|
||||
{% for t in r.question.tags %}
|
||||
|
Loading…
Reference in New Issue
Block a user