fixed newlines

This commit is contained in:
mdipierro
2013-03-29 02:13:35 -05:00
parent fcfa8aa917
commit 244d3c68eb
15 changed files with 2392 additions and 2395 deletions
+1 -1
View File
@@ -1 +1 @@
Version 2.4.5-stable+timestamp.2013.03.29.02.07.58 Version 2.4.5-stable+timestamp.2013.03.29.02.12.57
+1
View File
@@ -0,0 +1 @@
-1
View File
@@ -662,4 +662,3 @@ def ldap_auth(server='ldap', port=None,
if filterstr[0] == '(' and filterstr[-1] == ')': # rfc4515 syntax if filterstr[0] == '(' and filterstr[-1] == ')': # rfc4515 syntax
filterstr = filterstr[1:-1] # parens added again where used filterstr = filterstr[1:-1] # parens added again where used
return ldap_auth_aux return ldap_auth_aux
@@ -1,4 +1,3 @@
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
-1
View File
@@ -226,4 +226,3 @@ def sanitize(text, permitted_tags=[
return str(text) return str(text)
return XssCleaner(permitted_tags=permitted_tags, return XssCleaner(permitted_tags=permitted_tags,
allowed_attributes=allowed_attributes).strip(text, escape) allowed_attributes=allowed_attributes).strip(text, escape)
-1
View File
@@ -181,4 +181,3 @@ def loads_yaml(data):
if have_yaml: if have_yaml:
return yamlib.load(data) return yamlib.load(data)
else: raise ImportError("No YAML serializer available") else: raise ImportError("No YAML serializer available")
+1 -1
View File
@@ -4330,7 +4330,7 @@ class Service(object):
# jsonrpc 2.0 error types. records the following structure {code: (message,meaning)} # jsonrpc 2.0 error types. records the following structure {code: (message,meaning)}
jsonrpc_errors = { jsonrpc_errors = {
-32700: ("Parse error. Invalid JSON was received by the server.", "An error occurred on the server while parsing the JSON text."), -32700: ("Parse error. Invalid JSON was received by the server.", "An error occurred on the server while parsing the JSON text."),
-32600: ("Invalid Request", "The JSON sent is not a valid Request object."), -32600: ("Invalid Request", "The JSON sent is not a valid Request object."),
-32601: ("Method not found", "The method does not exist / is not available."), -32601: ("Method not found", "The method does not exist / is not available."),
-32602: ("Invalid params", "Invalid method parameter(s)."), -32602: ("Invalid params", "Invalid method parameter(s)."),