test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[1.6.x] Additional edits for refs #23340; thanks Loic. 

Backport of 0a2bc6e6bd from master
This commit is contained in:
Tim Graham 2014-09-06 07:59:27 -04:00
parent c9e0afe2d3
commit 8635fa0b11
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
django/contrib/humanize/tests.py
View File

@ -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