summaryrefslogtreecommitdiff
path: root/django/utils/datetime_safe.py
diff options
context:
space:
mode:
authorOscar Ramirez <tuxskar@gmail.com>2014-12-17 00:30:26 +0100
committerTim Graham <timograham@gmail.com>2014-12-22 07:24:54 -0500
commit54085b0f9ba7d9f705f9b9c90d3433b0ef6aa042 (patch)
tree7edf36c9f52427467d62e47a2a087a1c0a15ae89 /django/utils/datetime_safe.py
parent936e87c97ba57c75708a240d9bfe71215d84faa3 (diff)
Fixed #23998 -- Added datetime.time support to migrations questioner.
Diffstat (limited to 'django/utils/datetime_safe.py')
-rw-r--r--django/utils/datetime_safe.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/django/utils/datetime_safe.py b/django/utils/datetime_safe.py
index 6cd0bf1cdd..51cdfe31ef 100644
--- a/django/utils/datetime_safe.py
+++ b/django/utils/datetime_safe.py
@@ -7,9 +7,9 @@
# >>> datetime_safe.date(1850, 8, 2).strftime("%Y/%m/%d was a %A")
# '1850/08/02 was a Friday'
-from datetime import date as real_date, datetime as real_datetime
+from datetime import date as real_date, time as real_time, datetime as real_datetime
import re
-import time
+import time as ttime
class date(real_date):
@@ -31,6 +31,10 @@ class datetime(real_datetime):
return date(self.year, self.month, self.day)
+class time(real_time):
+ pass
+
+
def new_date(d):
"Generate a safe date from a datetime.date object."
return date(d.year, d.month, d.day)
@@ -80,10 +84,10 @@ def strftime(dt, fmt):
# Move to around the year 2000
year = year + ((2000 - year) // 28) * 28
timetuple = dt.timetuple()
- s1 = time.strftime(fmt, (year,) + timetuple[1:])
+ s1 = ttime.strftime(fmt, (year,) + timetuple[1:])
sites1 = _findall(s1, str(year))
- s2 = time.strftime(fmt, (year + 28,) + timetuple[1:])
+ s2 = ttime.strftime(fmt, (year + 28,) + timetuple[1:])
sites2 = _findall(s2, str(year + 28))
sites = []