diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2010-02-13 14:02:32 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2010-02-13 14:02:32 +0000 |
| commit | 03924929ba212368240bd7a26b14208fba965cb9 (patch) | |
| tree | 9be334990e4486b325043bbca0a05adf0b135089 /tests/regressiontests | |
| parent | b794441951f7328bbe5bcac305386862fd88f967 (diff) | |
Fixed #12524 -- Clarified handling of pre-1000AD dates in datetime_safe (and thus, the serializers). Patch includes moving the datetime_safe tests into the utils regressiontests module. Thanks to gsf for the report and initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12423 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests')
| -rw-r--r-- | tests/regressiontests/datetime_safe/__init__.py | 0 | ||||
| -rw-r--r-- | tests/regressiontests/datetime_safe/models.py | 0 | ||||
| -rw-r--r-- | tests/regressiontests/utils/datetime_safe.py (renamed from tests/regressiontests/datetime_safe/tests.py) | 9 | ||||
| -rw-r--r-- | tests/regressiontests/utils/tests.py | 2 |
4 files changed, 10 insertions, 1 deletions
diff --git a/tests/regressiontests/datetime_safe/__init__.py b/tests/regressiontests/datetime_safe/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/regressiontests/datetime_safe/__init__.py +++ /dev/null diff --git a/tests/regressiontests/datetime_safe/models.py b/tests/regressiontests/datetime_safe/models.py deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/regressiontests/datetime_safe/models.py +++ /dev/null diff --git a/tests/regressiontests/datetime_safe/tests.py b/tests/regressiontests/utils/datetime_safe.py index e1fe2b0f0e..6c3e7df359 100644 --- a/tests/regressiontests/datetime_safe/tests.py +++ b/tests/regressiontests/utils/datetime_safe.py @@ -1,4 +1,4 @@ -r""" +""" >>> from datetime import date as original_date, datetime as original_datetime >>> from django.utils.datetime_safe import date, datetime >>> just_safe = (1900, 1, 1) @@ -34,4 +34,11 @@ True '00' >>> datetime(*just_safe).strftime('%y') '00' + +>>> date(1850, 8, 2).strftime("%Y/%m/%d was a %A") +'1850/08/02 was a Friday' + +# Regression for #12524 -- Check that pre-1000AD dates are padded with zeros if necessary +>>> date(1, 1, 1).strftime("%Y/%m/%d was a %A") +'0001/01/01 was a Monday' """ diff --git a/tests/regressiontests/utils/tests.py b/tests/regressiontests/utils/tests.py index 56d41b9ae6..96b7b4d298 100644 --- a/tests/regressiontests/utils/tests.py +++ b/tests/regressiontests/utils/tests.py @@ -9,6 +9,7 @@ from django.utils.functional import SimpleLazyObject import timesince import datastructures +import datetime_safe import itercompat import tzinfo @@ -26,6 +27,7 @@ except NameError: __test__ = { 'timesince': timesince, 'datastructures': datastructures, + 'datetime_safe': datetime_safe, 'itercompat': itercompat, 'tzinfo': tzinfo, } |
