~bzr/loggerhead/daily-ppa

« back to all changes in this revision

Viewing changes to loggerhead/controllers/revision_ui.py

  • Committer: Max Bowsher
  • Date: 2011-03-15 00:35:34 UTC
  • mfrom: (182.150.14 trunk)
  • Revision ID: maxb@f2s.com-20110315003534-n4shb8sx63e14r3p
Merge trunk, resolving conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
17
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
18
18
#
19
19
 
20
 
try:
21
 
    import simplejson
22
 
except ImportError:
23
 
    import json as simplejson
 
20
import simplejson
24
21
import urllib
25
22
 
26
23
from paste.httpexceptions import HTTPServerError