Merge 6e69b48 into c1ab91a

spulec · May 5, 2013 · 124093e · 124093e
2 parents c1ab91a + 6e69b48
commit 124093e
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/freezegun/api.py b/freezegun/api.py
@@ -175,4 +175,13 @@ def wrapper(*args, **kwargs):
 
 
 def freeze_time(time_to_freeze, tz_offset=0):
+    if isinstance(time_to_freeze, datetime.date):
+        time_to_freeze = time_to_freeze.strftime('%X')
+    elif isinstance(time_to_freeze, datetime.datetime):
+        time_to_freeze = time_to_freeze.strftime('%X %x')
+
+    if not isinstance(time_to_freeze, basestring):
+        raise TypeError(('freeze_time() expected a string '
+                         'but got type %s.') % type(time_to_freeze))
+
     return _freeze_time(time_to_freeze, tz_offset)