← Back to branch summary

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

« back to all changes in this revision

Viewing changes to services/svnlogservice

  • Committer: William Grant
  • Date: 2010-07-28 04:13:05 UTC
  • mfrom: (1801.1.2 die-cjson-die)
  • Revision ID: grantw@unimelb.edu.au-20100728041305-xwypm3cn1l1mnki1
Port from cjson to (simple)json.

Show diffs side-by-side

added added

removed removed

Lines of Context:
services/svnlogservice
28
28
import sys
29
29
import locale
30
30
 
31
 
import cjson
 
31
try:
 
32
    import json
 
33
except ImportError:
 
34
    import simplejson as json
 
35
 
32
36
import pysvn
33
37
 
34
38
import ivle.conf
43
47
    client.exception_style = 1
44
48
    logs = client.log(os.path.join('/home', sys.argv[1].decode('utf-8')),
45
49
                      discover_changed_paths=True)
46
 
    print cjson.encode({'logs': [{'revno': log.revision.number,
47
 
                                  'author': log.author.decode('utf-8'),
48
 
                                  'message': log.message.decode('utf-8'),
49
 
                                  'date': log.date,
50
 
                                  'paths': [(p.path.decode('utf-8'), p.action)
51
 
                                            for p in log.changed_paths]}
52
 
                                 for log in logs]})
 
50
    print json.dumps({'logs': [{'revno': log.revision.number,
 
51
                                'author': log.author.decode('utf-8'),
 
52
                                'message': log.message.decode('utf-8'),
 
53
                                'date': log.date,
 
54
                                'paths': [(p.path.decode('utf-8'), p.action)
 
55
                                          for p in log.changed_paths]}
 
56
                               for log in logs]})
53
57
except pysvn.ClientError, e:
54
58
    error = e[0]
55
59
 
68
72
    except IndexError:
69
73
        pass
70
74
 
71
 
    print cjson.encode({'error': error})
 
75
    print json.dumps({'error': error})