diff options
Diffstat (limited to 'openid/extensions')
| -rw-r--r-- | openid/extensions/ax.py | 3 | ||||
| -rw-r--r-- | openid/extensions/draft/pape2.py | 5 | ||||
| -rw-r--r-- | openid/extensions/pape.py | 6 | ||||
| -rw-r--r-- | openid/extensions/sreg.py | 6 |
4 files changed, 7 insertions, 13 deletions
diff --git a/openid/extensions/ax.py b/openid/extensions/ax.py index 79856f7..e6ccaf2 100644 --- a/openid/extensions/ax.py +++ b/openid/extensions/ax.py @@ -312,8 +312,7 @@ class FetchRequest(AXMessage): message.getArg(OPENID_NS, 'return_to')) if not realm: - raise AXError(("Cannot validate update_url %r " + - "against absent realm") % (self.update_url,)) + raise AXError("Cannot validate update_url %r against absent realm" % self.update_url) tr = TrustRoot.parse(realm) if not tr.validateURL(self.update_url): diff --git a/openid/extensions/draft/pape2.py b/openid/extensions/draft/pape2.py index e8dec91..6e7e456 100644 --- a/openid/extensions/draft/pape2.py +++ b/openid/extensions/draft/pape2.py @@ -35,7 +35,7 @@ AUTH_MULTI_FACTOR = \ AUTH_PHISHING_RESISTANT = \ 'http://schemas.openid.net/pape/policies/2007/06/phishing-resistant' -TIME_VALIDATOR = re.compile('^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\dZ$') +TIME_VALIDATOR = re.compile(r'^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\dZ$') class Request(Extension): @@ -63,8 +63,7 @@ class Request(Extension): self.max_auth_age = max_auth_age def __bool__(self): - return bool(self.preferred_auth_policies or - self.max_auth_age is not None) + return bool(self.preferred_auth_policies or self.max_auth_age is not None) def __nonzero__(self): return self.__bool__() diff --git a/openid/extensions/pape.py b/openid/extensions/pape.py index 56a0b92..b2543fa 100644 --- a/openid/extensions/pape.py +++ b/openid/extensions/pape.py @@ -36,7 +36,7 @@ AUTH_PHISHING_RESISTANT = \ AUTH_NONE = \ 'http://schemas.openid.net/pape/policies/2007/06/none' -TIME_VALIDATOR = re.compile('^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\dZ$') +TIME_VALIDATOR = re.compile(r'^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\dZ$') LEVELS_NIST = 'http://csrc.nist.gov/publications/nistpubs/800-63/SP800-63V1_0_2.pdf' LEVELS_JISA = 'http://www.jisa.or.jp/spec/auth_level.html' @@ -131,9 +131,7 @@ class Request(PAPEExtension): self.addAuthLevel(auth_level) def __bool__(self): - return bool(self.preferred_auth_policies or - self.max_auth_age is not None or - self.preferred_auth_level_types) + return bool(self.preferred_auth_policies or self.max_auth_age is not None or self.preferred_auth_level_types) def __nonzero__(self): return self.__bool__() diff --git a/openid/extensions/sreg.py b/openid/extensions/sreg.py index a90e4d4..543a8b4 100644 --- a/openid/extensions/sreg.py +++ b/openid/extensions/sreg.py @@ -110,8 +110,7 @@ def supportsSReg(endpoint): @returns: Whether an sreg type was advertised by the endpoint @rtype: bool """ - return (endpoint.usesExtension(ns_uri_1_1) or - endpoint.usesExtension(ns_uri_1_0)) + return (endpoint.usesExtension(ns_uri_1_1) or endpoint.usesExtension(ns_uri_1_0)) class SRegNamespaceError(ValueError): @@ -294,8 +293,7 @@ class SRegRequest(Extension): def __contains__(self, field_name): """Was this field in the request?""" - return (field_name in self.required or - field_name in self.optional) + return (field_name in self.required or field_name in self.optional) def requestField(self, field_name, required=False, strict=False): """Request the specified field from the OpenID user |