Commits

Matthew Schinckel committed 4f63726

Revert changes: freezegun has been updated.

Comments (0)

Files changed (1)

jsonfield/utils.py

 
 from django.core.serializers.json import DjangoJSONEncoder
 
-DATETIME = (datetime.datetime,)
-DATE = (datetime.date,)
-TIME = (datetime.time,)
-
-try:
-    import freezegun.api
-except ImportError:
-    pass
-else:
-    DATETIME += (freezegun.api.FakeDatetime,)
-    DATE += (freezegun.api.FakeDate,)
-    
 class TZAwareJSONEncoder(DjangoJSONEncoder):
     def default(self, obj):
-        if isinstance(obj, DATETIME):
+        if isinstance(obj, datetime.datetime):
             return obj.strftime("%Y-%m-%d %H:%M:%S%z")
         return super(TZAwareJSONEncoder, self).default(obj)
 
         return o.to_json()
     if isinstance(o, Decimal):
         return str(o)
-    if isinstance(o, DATETIME):
+    if isinstance(o, datetime.datetime):
         if o.tzinfo:
             return o.strftime('%Y-%m-%dT%H:%M:%S%z')
         return o.strftime("%Y-%m-%dT%H:%M:%S")
-    if isinstance(o, DATE):
+    if isinstance(o, datetime.date):
         return o.strftime("%Y-%m-%d")
-    if isinstance(o, TIME):
+    if isinstance(o, datetime.time):
         if o.tzinfo:
             return o.strftime('%H:%M:%S%z')
         return o.strftime("%H:%M:%S")
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.