Author: jacob Date: 2009-04-07 17:13:30 -0500 (Tue, 07 Apr 2009) New Revision: 10441
Modified: django/branches/releases/1.0.X/tests/regressiontests/utils/timesince.py Log: [1.0.X] Added some tests to show that #9672 has been fixed ever since [10215]. Refs #9672. Backport of r10440 from trunk. Modified: django/branches/releases/1.0.X/tests/regressiontests/utils/timesince.py =================================================================== --- django/branches/releases/1.0.X/tests/regressiontests/utils/timesince.py 2009-04-07 22:12:53 UTC (rev 10440) +++ django/branches/releases/1.0.X/tests/regressiontests/utils/timesince.py 2009-04-07 22:13:30 UTC (rev 10441) @@ -1,18 +1,18 @@ """ ->>> from datetime import datetime, timedelta +>>> import datetime >>> from django.utils.timesince import timesince, timeuntil >>> from django.utils.tzinfo import LocalTimezone, FixedOffset ->>> t = datetime(2007, 8, 14, 13, 46, 0) +>>> t = datetime.datetime(2007, 8, 14, 13, 46, 0) ->>> onemicrosecond = timedelta(microseconds=1) ->>> onesecond = timedelta(seconds=1) ->>> oneminute = timedelta(minutes=1) ->>> onehour = timedelta(hours=1) ->>> oneday = timedelta(days=1) ->>> oneweek = timedelta(days=7) ->>> onemonth = timedelta(days=30) ->>> oneyear = timedelta(days=365) +>>> onemicrosecond = datetime.timedelta(microseconds=1) +>>> onesecond = datetime.timedelta(seconds=1) +>>> oneminute = datetime.timedelta(minutes=1) +>>> onehour = datetime.timedelta(hours=1) +>>> oneday = datetime.timedelta(days=1) +>>> oneweek = datetime.timedelta(days=7) +>>> onemonth = datetime.timedelta(days=30) +>>> oneyear = datetime.timedelta(days=365) # equal datetimes. >>> timesince(t, t) @@ -77,13 +77,22 @@ u'0 minutes' # When using two different timezones. ->>> now = datetime.now() ->>> now_tz = datetime.now(LocalTimezone(now)) ->>> now_tz_i = datetime.now(FixedOffset((3 * 60) + 15)) +>>> now = datetime.datetime.now() +>>> now_tz = datetime.datetime.now(LocalTimezone(now)) +>>> now_tz_i = datetime.datetime.now(FixedOffset((3 * 60) + 15)) >>> timesince(now) u'0 minutes' >>> timesince(now_tz) u'0 minutes' >>> timeuntil(now_tz, now_tz_i) u'0 minutes' + +# Timesince should work with both date objects (#9672) +>>> today = datetime.date.today() +>>> timeuntil(today+oneday, today) +u'1 day' +>>> timeuntil(today-oneday, today) +u'0 minutes' +>>> timeuntil(today+oneweek, today) +u'1 week' """ --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Django updates" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/django-updates?hl=en -~----------~----~----~----~------~----~------~--~---
