summaryrefslogtreecommitdiff
path: root/tests/regressiontests/utils
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2010-06-07 17:52:53 +0000
committerAlex Gaynor <alex.gaynor@gmail.com>2010-06-07 17:52:53 +0000
commita61b34b048d84b2a8af78a42a4e635371252bd3f (patch)
tree6c0733ffe75a10b95719ac7b99bcd9b9abc6b578 /tests/regressiontests/utils
parent9d3e6668d91af5ef442d07192b5508707d7e0a2a (diff)
[soc2010/query-refactor] Merged up to trunk r13328.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/query-refactor@13329 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests/utils')
-rw-r--r--tests/regressiontests/utils/timesince.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/regressiontests/utils/timesince.py b/tests/regressiontests/utils/timesince.py
index 04878b272a..5a54bf4c8c 100644
--- a/tests/regressiontests/utils/timesince.py
+++ b/tests/regressiontests/utils/timesince.py
@@ -88,11 +88,11 @@ u'0 minutes'
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'
+>>> 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'
"""