Merge pull request #279 from OlegGirko/fix_python3_support

Fix Python 3 support

Author: Roland Hedberg

src/saml2/mdstore.py

@@ -589,7 +589,7 @@ def __init__(self, onts, attrc, filename=None, cert=None, **kwargs):
         self.cert = cert
 
     def get_metadata_content(self):
-        return open(self.filename).read()
+        return open(self.filename, 'rb').read()
 
     def load(self):
         _txt = self.get_metadata_content()

tests/idp_conf_sp_no_encrypt.py

@@ -36,7 +36,7 @@
                     # }
                 }
             },
-            "subject_data": full_path("subject_data.db"),
+            "subject_data": full_path("subject_data_3.db"),
             #"domain": "umu.se",
             #"name_qualifier": ""
         },

tests/idp_conf_verify_cert.py

@@ -45,7 +45,7 @@ def verify_encrypt_cert(cert_str):
                     # }
                 }
             },
-            "subject_data": full_path("subject_data.db"),
+            "subject_data": full_path("subject_data_2.db"),
             #"domain": "umu.se",
             #"name_qualifier": ""
         },

tests/test_12_s_utils.py

@@ -106,7 +106,7 @@ def test_status_from_tuple():
 def test_status_from_tuple_empty_message():
     stat = utils.error_status_factory((samlp.STATUS_UNKNOWN_PRINCIPAL, None))
     status_text = "%s" % stat
-    assert status_text == ERROR_STATUS_EMPTY
+    assert status_text in (ERROR_STATUS_EMPTY, ERROR_STATUS_NO_HEADER_EMPTY)
 
 
 def test_attribute_sn():