Commit 988833de by cahrens

pylint/pep8

parent 95ad1826
......@@ -14,14 +14,14 @@ def test_get_default_time_display():
get_default_time_display(test_time))
def test_get_default_time_display_notz():
def test_get_dflt_time_disp_notz():
test_time = datetime(1992, 3, 12, 15, 3, 30)
assert_equals(
"Mar 12, 1992 at 15:03 UTC",
get_default_time_display(test_time))
def test_get_time_display_return_empty():
def test_get_time_disp_ret_empty():
assert_equals("", get_time_display(None))
test_time = datetime(1992, 3, 12, 15, 3, 30, tzinfo=UTC)
assert_equals("", get_time_display(test_time, ""))
......
......@@ -4,7 +4,7 @@ Convenience methods for working with datetime objects
from datetime import timedelta
def get_default_time_display(dt):
def get_default_time_display(dtime):
"""
Converts a datetime to a string representation. This is the default
representation used in Studio and LMS.
......@@ -12,20 +12,20 @@ def get_default_time_display(dt):
If None is passed in for dt, an empty string will be returned.
"""
if dt is None:
if dtime is None:
return u""
if dt.tzinfo is not None:
if dtime.tzinfo is not None:
try:
timezone = u" " + dt.tzinfo.tzname(dt)
timezone = u" " + dtime.tzinfo.tzname(dtime)
except NotImplementedError:
timezone = dt.strftime('%z')
timezone = dtime.strftime('%z')
else:
timezone = u" UTC"
return unicode(dt.strftime(u"%b %d, %Y at %H:%M{tz}")).format(
return unicode(dtime.strftime(u"%b %d, %Y at %H:%M{tz}")).format(
tz=timezone).strip()
def get_time_display(dt, format_string=None):
def get_time_display(dtime, format_string=None):
"""
Converts a datetime to a string representation.
......@@ -36,12 +36,12 @@ def get_time_display(dt, format_string=None):
format_string should be a unicode string that is a valid argument for datetime's strftime method.
"""
if dt is None or format_string is None:
return get_default_time_display(dt)
if dtime is None or format_string is None:
return get_default_time_display(dtime)
try:
return unicode(dt.strftime(format_string))
return unicode(dtime.strftime(format_string))
except ValueError:
return get_default_time_display(dt)
return get_default_time_display(dtime)
def almost_same_datetime(dt1, dt2, allowed_delta=timedelta(minutes=1)):
......
......@@ -317,4 +317,3 @@ class ViewsTestCase(TestCase):
text = set_due_date_format(u"%%%")
self.assertNotIn("%%%", text)
self.assertIn(time_with_utc, text)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment