From 337fb2968520e0dd93c504fffc5959fe1019fb8e Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Fri, 25 Feb 2011 13:24:38 +0100
Subject: [PATCH] python2.5

---
 ox/django/fields.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/ox/django/fields.py b/ox/django/fields.py
index 5c13e43..d958397 100644
--- a/ox/django/fields.py
+++ b/ox/django/fields.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+# vi:si:et:sw=4:sts=4:ts=4
 import time
 import datetime
 
@@ -6,15 +8,18 @@ from ox.utils import json
 
 
 def to_json(python_object):
-    if isinstance(python_object, bytes):
-        return {'__class__': 'bytes',
-                '__value__': list(python_object)}
     if isinstance(python_object, datetime.datetime):
         return {'__class__': 'datetime.datetime',
                 '__value__': python_object.strftime('%Y-%m-%dT%H:%M:%SZ')}
     if isinstance(python_object, time.struct_time):
         return {'__class__': 'time.asctime',
                 '__value__': time.asctime(python_object)}
+    try:
+        if isinstance(python_object, bytes):
+            return {'__class__': 'bytes',
+                '__value__': list(python_object)}
+    except:
+        pass
     raise TypeError(repr(python_object) + ' is not JSON serializable')
 
 def from_json(json_object):