← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to services/diffservice

  • Committer: Matt Giuca
  • Date: 2010-07-23 06:27:02 UTC
  • mfrom: (1818.1.1 project-extensions)
  • Revision ID: matt.giuca@gmail.com-20100723062702-cknq5zzk1cwf8q2q
Merge from branch project-extensions (changes project_extension.deadline into project_extension.days in the database).
The branch isn't finished; I just want this DB change to be included before we release 1.0.2, in case the rest of the changes for this branch don't make it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
services/diffservice
28
28
import sys
29
29
import locale
30
30
 
31
 
try:
32
 
    import json
33
 
except ImportError:
34
 
    import simplejson as json
 
31
import cjson
35
32
import pysvn
36
33
 
37
34
import ivle.conf
69
66
        revision1=revs[0],
70
67
        revision2=revs[1]
71
68
    )
72
 
    print json.dumps({'diff': diff_text.decode('utf-8')})
 
69
    print cjson.encode({'diff': diff_text.decode('utf-8')})
73
70
except pysvn.ClientError, e:
74
71
    error = e[0]
75
72
 
87
84
    except IndexError:
88
85
        pass
89
86
 
90
 
    print json.dumps({'error': error})
 
87
    print cjson.encode({'error': error})