← Back to branch summary

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

« back to all changes in this revision

Viewing changes to services/svnlogservice

  • Committer: David Coles
  • Date: 2010-08-30 03:26:13 UTC
  • Revision ID: coles.david@gmail.com-20100830032613-d14vng0jkelniu3l
python-console: Fix globals broken with new JSON library.

simplejson always returns unicode strings. cJSON would return ordinary strings 
if possible. cPickle.loads() only accepts strings. At present we use pickle 
version 0 so they should all works as ASCII strings. Higher versions of pickle 
are not plain ASCII and are likely to break this and so this should be fixed 
at some point.

Also replaced unconditional exception with one that catches Pickle errors. Not 
sure the best way to report failures of these functions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
services/svnlogservice
26
26
 
27
27
import os
28
28
import sys
29
 
 
30
 
import cjson
 
29
import locale
 
30
 
 
31
try:
 
32
    import json
 
33
except ImportError:
 
34
    import simplejson as json
 
35
 
31
36
import pysvn
32
37
 
 
38
import ivle.conf
33
39
import ivle.svn
34
40
 
 
41
# Set locale to UTF-8
 
42
locale.setlocale(locale.LC_CTYPE, "en_US.UTF-8")
 
43
 
35
44
try:
36
 
    client = pysvn.Client()
 
45
    client = ivle.svn.create_auth_svn_client(username=ivle.conf.login,
 
46
                                             password=ivle.conf.svn_pass)
37
47
    client.exception_style = 1
38
 
    logs = client.log(os.path.join('/home', sys.argv[1]),
 
48
    logs = client.log(os.path.join('/home', sys.argv[1].decode('utf-8')),
39
49
                      discover_changed_paths=True)
40
 
    print cjson.encode({'logs': [{'revno': log.revision.number,
41
 
                                  'author': log.author,
42
 
                                  'message': log.message,
43
 
                                  'date': log.date,
44
 
                                  'paths': [(p.path, p.action)
45
 
                                            for p in log.changed_paths]}
46
 
                                 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]})
47
57
except pysvn.ClientError, e:
48
58
    error = e[0]
49
59
 
62
72
    except IndexError:
63
73
        pass
64
74
 
65
 
    print cjson.encode({'error': error})
 
75
    print json.dumps({'error': error})