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

Proposed by Jelmer Vernooij
Status: Merged
Approved by: John A Meinel
Approved revision: 430
Merged at revision: 430
Proposed branch: lp:~jelmer/loggerhead/only-simplejson
Merge into: lp:loggerhead
Diff against target: 80 lines (+8/-18)
5 files modified
NEWS (+3/-0)
loggerhead/controllers/changelog_ui.py (+1/-4)
loggerhead/controllers/revision_ui.py (+1/-4)
loggerhead/load_test.py (+1/-4)
loggerhead/templatefunctions.py (+2/-6)
To merge this branch: bzr merge lp:~jelmer/loggerhead/only-simplejson
Reviewer Review Type Date Requested Status
John A Meinel Approve
Review via email: mp+51903@code.launchpad.net

This proposal supersedes a proposal from 2011-03-02.

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Garrr.. not my day.

Revision history for this message
John A Meinel (jameinel) wrote :

-----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
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'NEWS'
--- NEWS 2011-02-10 23:05:31 +0000
+++ NEWS 2011-03-02 14:32:16 +0000
@@ -16,6 +16,9 @@
16 - Merge the pqm changes back into trunk, after trunk was reverted to an old16 - Merge the pqm changes back into trunk, after trunk was reverted to an old
17 revision. (John Arbash Meinel, #716152)17 revision. (John Arbash Meinel, #716152)
1818
19 - The json module is no longer claimed to be supported as alternative for
20 simplejson. (Jelmer Vernooij, #586611)
21
1922
201.18 [10Nov2010]231.18 [10Nov2010]
21----------------24----------------
2225
=== 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 @@
2020
21import urllib21import urllib
2222
23try:23import simplejson
24 import simplejson
25except ImportError:
26 import json as simplejson
2724
28from paste.httpexceptions import HTTPServerError25from paste.httpexceptions import HTTPServerError
2926
3027
=== 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 @@
17# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA17# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18#18#
1919
20try:20import simplejson
21 import simplejson
22except ImportError:
23 import json as simplejson
24import urllib21import urllib
2522
26from paste.httpexceptions import HTTPServerError23from paste.httpexceptions import HTTPServerError
2724
=== 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 @@
67import time67import time
68import Queue68import Queue
6969
70try:70import simplejson
71 import simplejson
72except ImportError:
73 import json as simplejson
7471
75from bzrlib import (72from bzrlib import (
76 errors,73 errors,
7774
=== 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 @@
186186
187 # TODO: On old Python versions, elementtree may be used.187 # TODO: On old Python versions, elementtree may be used.
188188
189 try:189 import simplejson
190 import simplejson190 versions.append(('simplejson', simplejson.__version__))
191 except ImportError:
192 pass
193 else:
194 versions.append(('simplejson', simplejson.__version__))
195191
196 try:192 try:
197 Dozer = pkg_resources.get_distribution('Dozer')193 Dozer = pkg_resources.get_distribution('Dozer')

Subscribers

People subscribed via source and target branches