diff options
| author | Andrew Godwin <andrew@aeracode.org> | 2013-07-02 10:49:53 +0100 |
|---|---|---|
| committer | Andrew Godwin <andrew@aeracode.org> | 2013-07-02 10:49:53 +0100 |
| commit | b1e0ec06f0d538eb2ab16a7c1ecefd1d896e6382 (patch) | |
| tree | b837c6144106f304a7aacdfd4fae47ea95f4158a /tests/utils_tests/test_dateparse.py | |
| parent | 7a47ba6f6aeca36b8b092dbafd36abb342d34d4b (diff) | |
| parent | 6c66a41c3dc697dc3bda4e31e8b05084d2ede915 (diff) | |
Merge branch 'master' into schema-alteration
Diffstat (limited to 'tests/utils_tests/test_dateparse.py')
| -rw-r--r-- | tests/utils_tests/test_dateparse.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/utils_tests/test_dateparse.py b/tests/utils_tests/test_dateparse.py index 1a6ca646b8..836c26c573 100644 --- a/tests/utils_tests/test_dateparse.py +++ b/tests/utils_tests/test_dateparse.py @@ -1,9 +1,9 @@ from __future__ import unicode_literals from datetime import date, time, datetime +import unittest from django.utils.dateparse import parse_date, parse_time, parse_datetime -from django.utils import unittest from django.utils.tzinfo import FixedOffset |