Finish up datetime picker work

* Document new datetime picker in release notes.
* Update the tests to new format
* Fix some PEP8 issues

docs/source/releases/v0.8.rst

@@ -237,7 +237,12 @@ Minor changes
   when displaying tabular data, allowing sorting, etc. It also makes it easier
   to adapt e.g. the product list view in the dashboard to additional fields.
 
+* ``jquery-ui-datepicker`` has been replaced in the dashboard by
+  bootstrap-datetimepicker_. We still ship with ``jquery-ui-datepicker`` and
+  ``JQuery UI`` as it's in use in the frontend.
+
 .. _django-tables2: http://django-tables2.readthedocs.org/en/latest/
+.. _bootstrap-datetimepicker: http://jdewit.github.io/bootstrap-timepicker/
 
 .. _incompatible_changes_in_0.8:
 

oscar/forms/widgets.py

@@ -1,16 +1,13 @@
 import re
-from django.utils import six
-from django.utils.six.moves import filter
-from django.utils.six.moves import map
-
-import django
 from django import forms
 from django.core.files.uploadedfile import InMemoryUploadedFile
 from django.forms.util import flatatt
 from django.forms.widgets import FileInput
 from django.template import Context
 from django.template.loader import render_to_string
-from django.utils import formats
+from django.utils import formats, six
+from django.utils.six.moves import filter
+from django.utils.six.moves import map
 from django.utils.encoding import force_text
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
@@ -121,9 +118,11 @@ class TimePickerInput(forms.TimeInput):
     def render(self, name, value, attrs=None):
         format = self.format
         if hasattr(self, 'manual_format'):
-            # For django <= 1.6.5, see https://code.djangoproject.com/ticket/21173
+            # For django <= 1.6.5, see
+            # https://code.djangoproject.com/ticket/21173
             if self.is_localized and not self.manual_format:
-                format = force_text(formats.get_format('DATE_INPUT_FORMATS')[0])
+                format = force_text(
+                    formats.get_format('DATE_INPUT_FORMATS')[0])
         else:
             # For django >= 1.7
             format = format or formats.get_format(self.format_key)[0]
@@ -153,9 +152,11 @@ class DatePickerInput(forms.DateInput):
     def render(self, name, value, attrs=None):
         format = self.format
         if hasattr(self, 'manual_format'):
-            # For django <= 1.6.5, see https://code.djangoproject.com/ticket/21173
+            # For django <= 1.6.5, see
+            # https://code.djangoproject.com/ticket/21173
             if self.is_localized and not self.manual_format:
-                format = force_text(formats.get_format('DATE_INPUT_FORMATS')[0])
+                format = force_text(
+                    formats.get_format('DATE_INPUT_FORMATS')[0])
         else:
             # For django >= 1.7
             format = format or formats.get_format(self.format_key)[0]
@@ -199,9 +200,11 @@ class DateTimePickerInput(forms.DateTimeInput):
     def render(self, name, value, attrs=None):
         format = self.format
         if hasattr(self, 'manual_format'):
-            # For django <= 1.6.5, see https://code.djangoproject.com/ticket/21173
+            # For django <= 1.6.5, see
+            # https://code.djangoproject.com/ticket/21173
             if self.is_localized and not self.manual_format:
-                format = force_text(formats.get_format('DATETIME_INPUT_FORMATS')[0])
+                format = force_text(
+                    formats.get_format('DATETIME_INPUT_FORMATS')[0])
         else:
             # For django >= 1.7
             format = format or formats.get_format(self.format_key)[0]

tests/unit/forms/widget_tests.py

@@ -10,8 +10,8 @@ def compare_date_format(format, expected):
 
 def test_datetime_to_date_format_conversion():
     format_testcases = (
-        ('%Y-%m-%d', 'yy-mm-dd'),
-        ('%Y-%m-%d %H:%M', 'yy-mm-dd'),
+        ('%Y-%m-%d', 'yyyy-mm-dd'),
+        ('%Y-%m-%d %H:%M', 'yyyy-mm-dd'),
     )
     for format, expected in format_testcases:
         yield compare_date_format, format, expected
@@ -24,8 +24,8 @@ def compare_time_format(format, expected):
 
 def test_datetime_to_time_format_conversion():
     format_testcases = (
-        ('%Y-%m-%d %H:%M', 'HH:mm'),
-        ('%H:%M', 'HH:mm'),
+        ('%Y-%m-%d %H:%M', 'hh:ii'),
+        ('%H:%M', 'hh:ii'),
     )
     for format, expected in format_testcases:
         yield compare_time_format, format, expected