← Back to branch summary

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

« back to all changes in this revision

Viewing changes to services/diffservice

  • Committer: William Grant
  • Date: 2010-03-03 04:05:17 UTC
  • Revision ID: grantw@unimelb.edu.au-20100303040517-7grsyhj96ksqzi9e
Remove IVLEError support; only fileservice used it, and the last invocation is GONE.

Show diffs side-by-side

added added

removed removed

Lines of Context:
services/diffservice
26
26
 
27
27
import os
28
28
import sys
 
29
import locale
29
30
 
30
31
import cjson
31
32
import pysvn
32
33
 
 
34
import ivle.conf
33
35
import ivle.svn
34
36
 
 
37
# Set locale to UTF-8
 
38
locale.setlocale(locale.LC_CTYPE, "en_US.UTF-8")
35
39
 
36
40
# Default revisions
37
41
revs = [pysvn.Revision(x) for x in [pysvn.opt_revision_kind.base,
45
49
 
46
50
# Attempt to get the diff for these revisons
47
51
try:
48
 
    svnclient = pysvn.Client()
 
52
    svnclient = ivle.svn.create_auth_svn_client(username=ivle.conf.login,
 
53
                                                password=ivle.conf.svn_pass)
49
54
    svnclient.exception_style = 1
50
55
    diff = svnclient.diff
51
56
 
61
66
        revision1=revs[0],
62
67
        revision2=revs[1]
63
68
    )
64
 
    print cjson.encode({'diff': diff_text})
 
69
    print cjson.encode({'diff': diff_text.decode('utf-8')})
65
70
except pysvn.ClientError, e:
66
71
    error = e[0]
67
72