← 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-02-23 08:48:09 UTC
  • mfrom: (1673 trunk)
  • mto: This revision was merged to the branch mainline in revision 1674.
  • Revision ID: grantw@unimelb.edu.au-20100223084809-du6dvsxrjhw15ytr
Merge trunk.

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
 
33
34
import ivle.svn
34
35
 
 
36
# Set locale to UTF-8
 
37
locale.setlocale(locale.LC_CTYPE, "en_US.UTF-8")
35
38
 
36
39
# Default revisions
37
40
revs = [pysvn.Revision(x) for x in [pysvn.opt_revision_kind.base,
61
64
        revision1=revs[0],
62
65
        revision2=revs[1]
63
66
    )
64
 
    print cjson.encode({'diff': diff_text})
 
67
    print cjson.encode({'diff': diff_text.decode('utf-8')})
65
68
except pysvn.ClientError, e:
66
69
    error = e[0]
67
70