← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to loggerhead/controllers/changelog_ui.py

  • Committer: Max Bowsher
  • Date: 2011-03-04 15:49:43 UTC
  • mfrom: (431 trunk-rich)
  • mto: This revision was merged to the branch mainline in revision 432.
  • Revision ID: maxb@f2s.com-20110304154943-zrtlx1ipy49xc8u0
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/controllers/changelog_ui.py
20
20
 
21
21
import urllib
22
22
 
23
 
try:
24
 
    import simplejson
25
 
except ImportError:
26
 
    import json as simplejson
 
23
import simplejson
27
24
 
28
25
from paste.httpexceptions import HTTPServerError
29
26