diff options
| author | Tim Graham <timograham@gmail.com> | 2014-09-06 07:59:27 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-09-06 07:59:27 -0400 |
| commit | 0a2bc6e6bd29ccfbed86c58835c68c349c5a6757 (patch) | |
| tree | 05c8f19ccc262f8b09c01be41f208831e317fcbd | |
| parent | 7353e26d5d41563ca51520fb38b5950530cb6b9c (diff) | |
Additional edits for refs #23340; thanks Loic.
| -rw-r--r-- | django/contrib/humanize/tests.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/django/contrib/humanize/tests.py b/django/contrib/humanize/tests.py index 6ae5926bfe..dd1505c988 100644 --- a/django/contrib/humanize/tests.py +++ b/django/contrib/humanize/tests.py @@ -270,7 +270,6 @@ class HumanizeTests(TestCase): ) class DocumentedMockDateTime(datetime.datetime): - """Override Class for humanize.datetime """ @classmethod def now(cls, tz=None): if tz is None or tz.utcoffset(documented_now) is None: @@ -278,8 +277,12 @@ class HumanizeTests(TestCase): else: return documented_now.replace(tzinfo=tz) + tz.utcoffset(now) + orig_humanize_datetime = humanize.datetime humanize.datetime = DocumentedMockDateTime - for test_time_string, expected_natural_time in test_data: - test_time = datetime.datetime.strptime(test_time_string, time_format) - natural_time = humanize.naturaltime(test_time).replace('\xa0', ' ') + try: + for test_time_string, expected_natural_time in test_data: + test_time = datetime.datetime.strptime(test_time_string, time_format) + natural_time = humanize.naturaltime(test_time).replace('\xa0', ' ') self.assertEqual(expected_natural_time, natural_time) + finally: + humanize.datetime = orig_humanize_datetime |
