From 988833ded92d92b56753f18b42379b9dc261c851 Mon Sep 17 00:00:00 2001
From: cahrens <christina@edx.org>
Date: Thu, 12 Sep 2013 13:27:26 -0400
Subject: [PATCH] pylint/pep8

---
 .../xmodule/xmodule/tests/test_date_utils.py  |  4 ++--
 common/lib/xmodule/xmodule/util/date_utils.py | 22 +++++++++----------
 lms/djangoapps/courseware/tests/test_views.py |  1 -
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/common/lib/xmodule/xmodule/tests/test_date_utils.py b/common/lib/xmodule/xmodule/tests/test_date_utils.py
index d7efba6010..c5f71dfb56 100644
--- a/common/lib/xmodule/xmodule/tests/test_date_utils.py
+++ b/common/lib/xmodule/xmodule/tests/test_date_utils.py
@@ -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, ""))
diff --git a/common/lib/xmodule/xmodule/util/date_utils.py b/common/lib/xmodule/xmodule/util/date_utils.py
index 43012e17ab..aec4f20788 100644
--- a/common/lib/xmodule/xmodule/util/date_utils.py
+++ b/common/lib/xmodule/xmodule/util/date_utils.py
@@ -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)):
diff --git a/lms/djangoapps/courseware/tests/test_views.py b/lms/djangoapps/courseware/tests/test_views.py
index 72a63196de..1c87abd3bc 100644
--- a/lms/djangoapps/courseware/tests/test_views.py
+++ b/lms/djangoapps/courseware/tests/test_views.py
@@ -317,4 +317,3 @@ class ViewsTestCase(TestCase):
         text = set_due_date_format(u"%%%")
         self.assertNotIn("%%%", text)
         self.assertIn(time_with_utc, text)
-