You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@avro.apache.org by ph...@apache.org on 2010/08/20 00:47:29 UTC

svn commit: r987342 - in /avro/trunk: CHANGES.txt lang/py/src/avro/protocol.py lang/py/src/avro/schema.py

Author: philz
Date: Thu Aug 19 22:47:29 2010
New Revision: 987342

URL: http://svn.apache.org/viewvc?rev=987342&view=rev
Log:
AVRO-629. Prefer the JSON module of python's stdlib over simplejson.
(Contributed by Harsh J Chouraria)


Modified:
    avro/trunk/CHANGES.txt
    avro/trunk/lang/py/src/avro/protocol.py
    avro/trunk/lang/py/src/avro/schema.py

Modified: avro/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=987342&r1=987341&r2=987342&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Thu Aug 19 22:47:29 2010
@@ -58,6 +58,8 @@ Avro 1.4.0 (unreleased)
     AVRO-611. IDL: Add support for one-way messages. (cutting)
 
   IMPROVEMENTS
+    AVRO-629. Prefer the JSON module of python's stdlib over simplejson.
+    (Harsh J Chouraria via philz)
 
     AVRO-587. Add Charts and Templating to Stats View
     (Patrick Wendell via philz)

Modified: avro/trunk/lang/py/src/avro/protocol.py
URL: http://svn.apache.org/viewvc/avro/trunk/lang/py/src/avro/protocol.py?rev=987342&r1=987341&r2=987342&view=diff
==============================================================================
--- avro/trunk/lang/py/src/avro/protocol.py (original)
+++ avro/trunk/lang/py/src/avro/protocol.py Thu Aug 19 22:47:29 2010
@@ -21,9 +21,9 @@ try:
 except ImportError:
   import md5
 try:
-  import simplejson as json
-except ImportError:
   import json
+except ImportError:
+  import simplejson as json
 from avro import schema
 
 #

Modified: avro/trunk/lang/py/src/avro/schema.py
URL: http://svn.apache.org/viewvc/avro/trunk/lang/py/src/avro/schema.py?rev=987342&r1=987341&r2=987342&view=diff
==============================================================================
--- avro/trunk/lang/py/src/avro/schema.py (original)
+++ avro/trunk/lang/py/src/avro/schema.py Thu Aug 19 22:47:29 2010
@@ -34,9 +34,9 @@ A schema may be one of:
   Null.
 """
 try:
-  import simplejson as json
-except ImportError:
   import json
+except ImportError:
+  import simplejson as json
 
 #
 # Constants