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 <[email protected]>

Author: c00kiemon5ter

src/saml2/httpbase.py

@@ -196,7 +196,7 @@ def set_cookie(self, kaka, request):
                 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"],

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:

src/saml2/saml.py

@@ -256,7 +256,7 @@ def _wrong_type_value(xsd, value):
 
         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

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

src/saml2/time_util.py

@@ -18,7 +18,7 @@
 
 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

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

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$"],
             }
         }})