← Back to branch summary

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

« back to all changes in this revision

Viewing changes to services/diffservice

  • Committer: David Coles
  • Date: 2010-07-17 11:32:50 UTC
  • Revision ID: coles.david@gmail.com-20100717113250-vi18n50bcjmfmzrt
https://launchpad.net/bugs/592514
Show warning for CGI header field-names which contain restricted characters.

Forbidden characters are the separators defined by RFC3875. This is mainly to 
fix an issue where printing a dictionary (with no CGI headers) could be 
assumed to be a CGI header with no warnings.

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})