diff options
| author | Tim Graham <timograham@gmail.com> | 2014-09-06 07:59:27 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-09-06 08:01:02 -0400 |
| commit | 8635fa0b118fcf7e7a0234fb2edb57715d6f6a61 (patch) | |
| tree | 5905a7f98928102e0c586cdb89e05be2c880790a | |
| parent | c9e0afe2d3fa51b1b76ff5cbd53f95cf19f984f1 (diff) | |
[1.6.x] Additional edits for refs #23340; thanks Loic.
Backport of 0a2bc6e6bd from master
| -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 8134752844..7e936bcd45 100644 --- a/django/contrib/humanize/tests.py +++ b/django/contrib/humanize/tests.py @@ -261,7 +261,6 @@ class HumanizeTests(TransRealMixin, 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: @@ -269,8 +268,12 @@ class HumanizeTests(TransRealMixin, 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 |