diff options
author | Ivan Kanakarakis <ivan.kanak@gmail.com> | 2020-02-10 20:49:07 +0200 |
---|---|---|
committer | Ivan Kanakarakis <ivan.kanak@gmail.com> | 2020-02-10 22:46:47 +0200 |
commit | 79f5fad58854a731bf24dcb48ff07e248cb6b42a (patch) | |
tree | 7228519e4479b3f56b784842838782cfee88031d | |
parent | ca27122dab1b1649c3ec8451e493a484355afac8 (diff) | |
download | pysaml2-79f5fad58854a731bf24dcb48ff07e248cb6b42a.tar.gz |
Fix compile warnings
Test for compile warning using:
find src/ -iname '*.py' | xargs -P 4 -I{} python -Wall -m py_compile {}
find tests/ -iname '*.py' | xargs -P 4 -I{} python -Wall -m py_compile {}
Signed-off-by: Ivan Kanakarakis <ivan.kanak@gmail.com>
-rw-r--r-- | src/saml2/httpbase.py | 2 | ||||
-rw-r--r-- | src/saml2/s2repoze/plugins/sp.py | 2 | ||||
-rw-r--r-- | src/saml2/saml.py | 2 | ||||
-rw-r--r-- | src/saml2/soap.py | 2 | ||||
-rw-r--r-- | src/saml2/time_util.py | 2 | ||||
-rw-r--r-- | src/saml2/validate.py | 4 | ||||
-rw-r--r-- | tests/test_20_assertion.py | 14 |
7 files changed, 14 insertions, 14 deletions
diff --git a/src/saml2/httpbase.py b/src/saml2/httpbase.py index 1c2ebfd7..d7f3f030 100644 --- a/src/saml2/httpbase.py +++ b/src/saml2/httpbase.py @@ -196,7 +196,7 @@ class HTTPBase(object): std_attr["domain"] = _domain std_attr["domain_specified"] = True - if morsel["max-age"] is 0: + if morsel["max-age"] == 0: try: self.cookiejar.clear(domain=std_attr["domain"], path=std_attr["path"], diff --git a/src/saml2/s2repoze/plugins/sp.py b/src/saml2/s2repoze/plugins/sp.py index afc74539..2292ed0c 100644 --- a/src/saml2/s2repoze/plugins/sp.py +++ b/src/saml2/s2repoze/plugins/sp.py @@ -670,7 +670,7 @@ def make_plugin( discovery="", idp_query_param="", ): - if saml_conf is "": + if saml_conf == "": raise ValueError("must include saml_conf in configuration") if remember_name is None: diff --git a/src/saml2/saml.py b/src/saml2/saml.py index bdb1ec60..c4d9f2b2 100644 --- a/src/saml2/saml.py +++ b/src/saml2/saml.py @@ -256,7 +256,7 @@ class AttributeValueBase(SamlBase): xsd_ns, xsd_type = ( ['', type(None)] if xsd_string is None - else ['', ''] if xsd_string is '' + else ['', ''] if xsd_string == '' else [ XSD if xsd_string in xsd_types_props else '', xsd_string diff --git a/src/saml2/soap.py b/src/saml2/soap.py index 055c690a..46c08b76 100644 --- a/src/saml2/soap.py +++ b/src/saml2/soap.py @@ -159,7 +159,7 @@ def parse_soap_enveloped_saml_thingy(text, expected_tags): import re -NS_AND_TAG = re.compile("\{([^}]+)\}(.*)") +NS_AND_TAG = re.compile(r"\{([^}]+)\}(.*)") def instanciate_class(item, modules): diff --git a/src/saml2/time_util.py b/src/saml2/time_util.py index efe57144..fa4b48e1 100644 --- a/src/saml2/time_util.py +++ b/src/saml2/time_util.py @@ -18,7 +18,7 @@ import six TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ" TIME_FORMAT_WITH_FRAGMENT = re.compile( - "^(\d{4,4}-\d{2,2}-\d{2,2}T\d{2,2}:\d{2,2}:\d{2,2})(\.\d*)?Z?$") + r"^(\d{4,4}-\d{2,2}-\d{2,2}T\d{2,2}:\d{2,2}:\d{2,2})(\.\d*)?Z?$") # --------------------------------------------------------------------------- # I'm sure this is implemented somewhere else can't find it now though, so I diff --git a/src/saml2/validate.py b/src/saml2/validate.py index 26de5472..c5cb3b33 100644 --- a/src/saml2/validate.py +++ b/src/saml2/validate.py @@ -41,7 +41,7 @@ class ToEarly(Exception): # --------------------- validators ------------------------------------- # -NCNAME = re.compile("(?P<NCName>[a-zA-Z_](\w|[_.-])*)") +NCNAME = re.compile(r"(?P<NCName>[a-zA-Z_](\w|[_.-])*)") def valid_ncname(name): @@ -436,7 +436,7 @@ def valid_instance(instance): def valid_domain_name(dns_name): m = re.match( - "^[a-z0-9]+([-.]{ 1 }[a-z0-9]+).[a-z]{2,5}(:[0-9]{1,5})?(\/.)?$", + r"^[a-z0-9]+([-.]{ 1 }[a-z0-9]+).[a-z]{2,5}(:[0-9]{1,5})?(\/.)?$", dns_name, re.I) if not m: raise ValueError("Not a proper domain name") diff --git a/tests/test_20_assertion.py b/tests/test_20_assertion.py index eeb8dea8..bb4dbb73 100644 --- a/tests/test_20_assertion.py +++ b/tests/test_20_assertion.py @@ -151,7 +151,7 @@ def test_lifetime_1(): "attribute_restrictions": { "givenName": None, "surName": None, - "mail": [".*@.*\.umu\.se"], + "mail": [r".*@.*\.umu\.se"], } }} @@ -173,7 +173,7 @@ def test_lifetime_2(): "attribute_restrictions": { "givenName": None, "surName": None, - "mail": [".*@.*\.umu\.se"], + "mail": [r".*@.*\.umu\.se"], } }} @@ -195,7 +195,7 @@ def test_ava_filter_1(): "attribute_restrictions": { "givenName": None, "surName": None, - "mail": [".*@.*\.umu\.se"], + "mail": [r".*@.*\.umu\.se"], } }} @@ -225,7 +225,7 @@ def test_ava_filter_2(): "attribute_restrictions": { "givenName": None, "sn": None, - "mail": [".*@.*\.umu\.se"], + "mail": [r".*@.*\.umu\.se"], } }} @@ -261,7 +261,7 @@ def test_ava_filter_dont_fail(): "attribute_restrictions": { "givenName": None, "surName": None, - "mail": [".*@.*\.umu\.se"], + "mail": [r".*@.*\.umu\.se"], }, "fail_on_missing_requested": False }} @@ -688,7 +688,7 @@ def test_filter_ava_3(): "urn:mace:example.com:saml:roland:sp": { "lifetime": {"minutes": 5}, "attribute_restrictions": { - "mail": [".*@example\.com$"], + "mail": [r".*@example\.com$"], } }}) @@ -712,7 +712,7 @@ def test_filter_ava_4(): "urn:mace:example.com:saml:roland:sp": { "lifetime": {"minutes": 5}, "attribute_restrictions": { - "mail": [".*@example\.com$"], + "mail": [r".*@example\.com$"], } }}) |