Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #18951 -- Formatting of microseconds.

Thanks olofom at gmail com for the report.
  • Loading branch information...
commit 822cfce3df53301d9f9f4c14bd8a0cb2a1956e2e 1 parent baa33cd
@aaugustin aaugustin authored
View
4 django/utils/dateformat.py
@@ -110,8 +110,8 @@ def s(self):
return '%02d' % self.data.second
def u(self):
- "Microseconds"
- return self.data.microsecond
+ "Microseconds; i.e. '000000' to '999999'"
+ return '%06d' %self.data.microsecond
class DateFormat(TimeFormat):
View
2  docs/ref/templates/builtins.txt
@@ -1251,7 +1251,7 @@ S English ordinal suffix for day of the ``'st'``, ``'nd'``,
month, 2 characters.
t Number of days in the given month. ``28`` to ``31``
T Time zone of this machine. ``'EST'``, ``'MDT'``
-u Microseconds. ``0`` to ``999999``
+u Microseconds. ``000000`` to ``999999``
U Seconds since the Unix Epoch
(January 1 1970 00:00:00 UTC).
w Day of the week, digits without ``'0'`` (Sunday) to ``'6'`` (Saturday)
View
5 tests/regressiontests/utils/dateformat.py
@@ -72,6 +72,11 @@ def test_am_pm(self):
self.assertEqual(dateformat.format(my_birthday, 'a'), 'p.m.')
+ def test_microsecond(self):
+ # Regression test for #18951
+ dt = datetime(2009, 5, 16, microsecond=123)
+ self.assertEqual(dateformat.format(dt, 'u'), '000123')
+
def test_date_formats(self):
my_birthday = datetime(1979, 7, 8, 22, 00)
timestamp = datetime(2008, 5, 19, 11, 45, 23, 123456)
Please sign in to comment.
Something went wrong with that request. Please try again.