Merge pull request #224 from SpamapS/master

A plethora of python3 fixes

1 files changed, 10 insertions, 23 deletions

diff --git a/tests/test_50_server.py b/tests/test_50_server.py
index 1b57d4be..e7e2ad88 100644
--- a/tests/test_50_server.py
+++ b/tests/test_50_server.py
@@ -4,7 +4,7 @@ import base64
 import copy
 import os
 from contextlib import closing
-from urlparse import parse_qs
+from six.moves.urllib.parse import parse_qs
 import uuid
 
 from saml2.cert import OpenSSLWrapper
@@ -541,7 +541,6 @@ class TestServer1():
             encrypt_assertion=False,
             encrypt_assertion_self_contained=True,
             pefim=True,
-            #encrypted_advice_attributes=True,
             encrypt_cert_advice=cert_str,
         )
 
@@ -562,7 +561,7 @@ class TestServer1():
 
         assert valid
 
-        _, key_file = make_temp("%s" % cert_key_str, decode=False)
+        _, key_file = make_temp(str(cert_key_str).encode('ascii'), decode=False)
 
         decr_text = self.server.sec.decrypt(signed_resp, key_file)
 
@@ -654,7 +653,7 @@ class TestServer1():
                                                  id_attr="")
         assert valid
 
-        _, key_file = make_temp("%s" % cert_key_str, decode=False)
+        _, key_file = make_temp(str(cert_key_str).encode('ascii'), decode=False)
 
         decr_text = self.server.sec.decrypt(signed_resp, key_file)
 
@@ -689,7 +688,6 @@ class TestServer1():
             sign_assertion=True,
             encrypt_assertion=True,
             encrypt_assertion_self_contained=True,
-            #encrypted_advice_attributes=True,
             pefim=True,
             encrypt_cert_advice=cert_str,
         )
@@ -717,7 +715,7 @@ class TestServer1():
 
         assert valid
 
-        _, key_file = make_temp("%s" % cert_key_str, decode=False)
+        _, key_file = make_temp(cert_key_str, decode=False)
 
         decr_text = self.server.sec.decrypt(decr_text, key_file)
 
@@ -750,7 +748,6 @@ class TestServer1():
             sign_assertion=False,
             encrypt_assertion=False,
             encrypt_assertion_self_contained=True,
-            #encrypted_advice_attributes=True,
             pefim=True,
             encrypt_cert_advice=cert_str_advice,
         )
@@ -761,7 +758,7 @@ class TestServer1():
 
         assert sresponse.signature is None
 
-        _, key_file = make_temp("%s" % cert_key_str_advice, decode=False)
+        _, key_file = make_temp(cert_key_str_advice, decode=False)
 
         decr_text = self.server.sec.decrypt(_resp, key_file)
 
@@ -783,7 +780,6 @@ class TestServer1():
             sign_assertion=False,
             encrypt_assertion=True,
             encrypt_assertion_self_contained=True,
-            #encrypted_advice_attributes=True,
             pefim=True,
             encrypt_cert_advice=cert_str_advice,
         )
@@ -794,7 +790,7 @@ class TestServer1():
 
         decr_text_1 = self.server.sec.decrypt(_resp, self.client.config.encryption_keypairs[1]["key_file"])
 
-        _, key_file = make_temp("%s" % cert_key_str_advice, decode=False)
+        _, key_file = make_temp(cert_key_str_advice, decode=False)
 
         decr_text_2 = self.server.sec.decrypt(decr_text_1, key_file)
 
@@ -825,7 +821,7 @@ class TestServer1():
 
         assert sresponse.signature is None
 
-        _, key_file = make_temp("%s" % cert_key_str_assertion, decode=False)
+        _, key_file = make_temp(cert_key_str_assertion, decode=False)
 
         decr_text = self.server.sec.decrypt(_resp, key_file)
 
@@ -876,7 +872,6 @@ class TestServer1():
             sign_assertion=False,
             encrypt_assertion=False,
             encrypt_assertion_self_contained=True,
-            #encrypted_advice_attributes=True,
             pefim=True
         )
 
@@ -909,7 +904,6 @@ class TestServer1():
             sign_assertion=False,
             encrypt_assertion=True,
             encrypt_assertion_self_contained=True,
-            #encrypted_advice_attributes=True,
             pefim=True,
             encrypt_cert_advice=cert_str_advice,
             encrypt_cert_assertion=cert_str_assertion
@@ -919,11 +913,11 @@ class TestServer1():
 
         assert sresponse.signature is None
 
-        _, key_file = make_temp("%s" % cert_key_str_assertion, decode=False)
+        _, key_file = make_temp(cert_key_str_assertion, decode=False)
 
         decr_text_1 = _server.sec.decrypt(_resp, key_file)
 
-        _, key_file = make_temp("%s" % cert_key_str_advice, decode=False)
+        _, key_file = make_temp(cert_key_str_advice, decode=False)
 
         decr_text_2 = _server.sec.decrypt(decr_text_1, key_file)
 
@@ -944,7 +938,6 @@ class TestServer1():
             sign_assertion=False,
             encrypt_assertion=True,
             encrypt_assertion_self_contained=True,
-            #encrypted_advice_attributes=True,
             pefim=True
         )
 
@@ -974,7 +967,6 @@ class TestServer1():
                 sign_assertion=False,
                 encrypt_assertion=True,
                 encrypt_assertion_self_contained=True,
-                #encrypted_advice_attributes=True,
                 pefim=True,
                 encrypt_cert_advice="whatever",
                 encrypt_cert_assertion="whatever"
@@ -996,7 +988,6 @@ class TestServer1():
                 sign_assertion=False,
                 encrypt_assertion=False,
                 encrypt_assertion_self_contained=True,
-                #encrypted_advice_attributes=True,
                 pefim=True,
                 encrypt_cert_advice="whatever",
             )
@@ -1039,7 +1030,6 @@ class TestServer1():
                 sign_assertion=False,
                 encrypt_assertion=True,
                 encrypt_assertion_self_contained=True,
-                #encrypted_advice_attributes=True,
                 pefim=True,
                 encrypt_cert_advice="whatever",
                 encrypt_cert_assertion="whatever"
@@ -1061,7 +1051,6 @@ class TestServer1():
                 sign_assertion=False,
                 encrypt_assertion=False,
                 encrypt_assertion_self_contained=True,
-                #encrypted_advice_attributes=True,
                 pefim=True,
                 encrypt_cert_advice="whatever",
             )
@@ -1104,7 +1093,6 @@ class TestServer1():
             sign_assertion=False,
             encrypt_assertion=True,
             encrypt_assertion_self_contained=True,
-            #encrypted_advice_attributes=True,
             pefim=True,
         )
 
@@ -1120,7 +1108,6 @@ class TestServer1():
             sign_assertion=False,
             encrypt_assertion=False,
             encrypt_assertion_self_contained=True,
-            #encrypted_advice_attributes=True,
             pefim=True
         )
 
@@ -1160,7 +1147,7 @@ class TestServer1():
             issuer_entity_id="urn:mace:example.com:saml:roland:idp",
             reason="I'm tired of this")
 
-        intermed = base64.b64encode("%s" % logout_request)
+        intermed = base64.b64encode(str(logout_request).encode('utf-8'))
 
         #saml_soap = make_soap_enveloped_saml_thingy(logout_request)
         request = self.server.parse_logout_request(intermed, BINDING_HTTP_POST)