Merge lp:~jelmer/loggerhead/only-simplejson into lp:loggerhead

[Jelmer Vernooij]

loggerhead still supported the "json" module as alternative to "simplejson", but the json module lacks a dumps function that loggerhead relies on.

This MP makes loggerhead stop try to support this fallback, and just rely on simplejson.

[Jelmer Vernooij (jelmer)]

Garrr.. not my day.

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 3/2/2011 3:34 PM, Jelmer Vernooij wrote:
> Garrr.. not my day.

The old one was marked merged, but I'll:

 merge: approve

This one.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk1uWfkACgkQJdeBCYSNAAMsrQCglwl/4gT+ls2zaRaezknb3rB6
L2oAoKHxi2BJ94YqCqhSCOtfCWNw9yG/
=iE6k
-----END PGP SIGNATURE-----

review: Approve

[Jelmer Vernooij (jelmer)]

On Wed, 2011-03-02 at 14:55 +0000, John A Meinel wrote:
> Review: Approve
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 3/2/2011 3:34 PM, Jelmer Vernooij wrote:
> > Garrr.. not my day.
>
> The old one was marked merged, but I'll:
I accidentally pushed without specifying a target location and it pushed
to lp:loggerhead. I'll do a proper merge now.

Thanks for the review :)

Cheers,

Jelmer

=== modified file 'NEWS'
--- NEWS	2011-02-10 23:05:31 +0000
+++ NEWS	2011-03-02 14:32:16 +0000
@@ -16,6 +16,9 @@
     - Merge the pqm changes back into trunk, after trunk was reverted to an old
       revision. (John Arbash Meinel, #716152)
 
+    - The json module is no longer claimed to be supported as alternative for 
+      simplejson. (Jelmer Vernooij, #586611)
+
 
 1.18 [10Nov2010]
 ----------------
 
=== modified file 'loggerhead/controllers/changelog_ui.py'
--- loggerhead/controllers/changelog_ui.py	2010-04-22 08:52:59 +0000
+++ loggerhead/controllers/changelog_ui.py	2011-03-02 14:32:16 +0000
@@ -20,10 +20,7 @@
 
 import urllib
 
-try:
-    import simplejson
-except ImportError:
-    import json as simplejson
+import simplejson
 
 from paste.httpexceptions import HTTPServerError
 
 
=== modified file 'loggerhead/controllers/revision_ui.py'
--- loggerhead/controllers/revision_ui.py	2009-08-04 04:08:03 +0000
+++ loggerhead/controllers/revision_ui.py	2011-03-02 14:32:16 +0000
@@ -17,10 +17,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-try:
-    import simplejson
-except ImportError:
-    import json as simplejson
+import simplejson
 import urllib
 
 from paste.httpexceptions import HTTPServerError
 
=== modified file 'loggerhead/load_test.py'
--- loggerhead/load_test.py	2011-02-10 01:00:32 +0000
+++ loggerhead/load_test.py	2011-03-02 14:32:16 +0000
@@ -67,10 +67,7 @@
 import time
 import Queue
 
-try:
-    import simplejson
-except ImportError:
-    import json as simplejson
+import simplejson
 
 from bzrlib import (
     errors,
 
=== modified file 'loggerhead/templatefunctions.py'
--- loggerhead/templatefunctions.py	2010-12-01 08:30:02 +0000
+++ loggerhead/templatefunctions.py	2011-03-02 14:32:16 +0000
@@ -186,12 +186,8 @@
 
         # TODO: On old Python versions, elementtree may be used.
 
-        try:
-            import simplejson
-        except ImportError:
-            pass
-        else:
-            versions.append(('simplejson', simplejson.__version__))
+        import simplejson
+        versions.append(('simplejson', simplejson.__version__))
 
         try:
             Dozer = pkg_resources.get_distribution('Dozer')