Remove obsolete xmlsec_path from pathutils.

20 files changed, 35 insertions, 47 deletions

diff --git a/tests/aa_conf.py b/tests/aa_conf.py
index faa26a7e..fbeaff14 100644
--- a/tests/aa_conf.py
+++ b/tests/aa_conf.py
@@ -2,7 +2,7 @@
 from saml2 import BINDING_SOAP, BINDING_HTTP_REDIRECT, NAME_FORMAT_URI
 BASE = "http://localhost:8089/"
 
-from pathutils import full_path, xmlsec_path
+from pathutils import full_path
 
 
 CONFIG={
@@ -27,7 +27,7 @@ CONFIG={
     "debug" : 1,
     "key_file" : full_path("test.key"),
     "cert_file" : full_path("test.pem"),
-    #"xmlsec_binary" : xmlsec_path,
+    #"xmlsec_binary" : None,
     "metadata": {
         "local": [full_path("metadata.xml"), full_path("vo_metadata.xml")],
     },
diff --git a/tests/disco_conf.py b/tests/disco_conf.py
index 1b9417f7..1f7554d7 100644
--- a/tests/disco_conf.py
+++ b/tests/disco_conf.py
@@ -1,6 +1,6 @@
 from saml2.extension.idpdisc import BINDING_DISCO
 
-from pathutils import full_path, xmlsec_path
+from pathutils import full_path
 
 BASE = "http://localhost:8088"
 
@@ -17,7 +17,7 @@ CONFIG = {
         },
     },
     "debug" : 1,
-    "xmlsec_binary" : xmlsec_path,
+    "xmlsec_binary" : None,
     "metadata": {
         "local": [full_path("servera.xml")],
     },
diff --git a/tests/idp_all_conf.py b/tests/idp_all_conf.py
index 1fc072b5..860b8b1f 100644
--- a/tests/idp_all_conf.py
+++ b/tests/idp_all_conf.py
@@ -7,7 +7,7 @@ from saml2 import BINDING_HTTP_ARTIFACT
 from saml2.saml import NAMEID_FORMAT_PERSISTENT
 from saml2.saml import NAME_FORMAT_URI
 
-from pathutils import full_path, xmlsec_path
+from pathutils import full_path
 
 BASE = "http://localhost:8088"
 
@@ -85,7 +85,7 @@ CONFIG = {
     "debug" : 1,
     "key_file" : full_path("test.key"),
     "cert_file" : full_path("test.pem"),
-    "xmlsec_binary" : xmlsec_path,
+    "xmlsec_binary" : None,
     "metadata": {
         "local": [full_path("servera.xml"),
                   full_path("vo_metadata.xml")],
diff --git a/tests/idp_conf.py b/tests/idp_conf.py
index a0e3a867..1fb27ad1 100644
--- a/tests/idp_conf.py
+++ b/tests/idp_conf.py
@@ -2,7 +2,7 @@ from saml2 import BINDING_SOAP, BINDING_HTTP_REDIRECT, BINDING_HTTP_POST
 from saml2.saml import NAMEID_FORMAT_PERSISTENT
 from saml2.saml import NAME_FORMAT_URI
 
-from pathutils import full_path, xmlsec_path
+from pathutils import full_path
 
 BASE = "http://localhost:8088"
 
@@ -41,7 +41,7 @@ CONFIG = {
     "debug" : 1,
     "key_file" : full_path("test.key"),
     "cert_file" : full_path("test.pem"),
-    "xmlsec_binary" : xmlsec_path,
+    "xmlsec_binary" : None,
     "metadata": {
         "local": [full_path("metadata_sp_1.xml"),
                   full_path("vo_metadata.xml")],
diff --git a/tests/idp_conf_mdb.py b/tests/idp_conf_mdb.py
index f997263c..847c50ac 100644
--- a/tests/idp_conf_mdb.py
+++ b/tests/idp_conf_mdb.py
@@ -7,7 +7,7 @@ from saml2 import BINDING_HTTP_ARTIFACT
 from saml2.saml import NAMEID_FORMAT_PERSISTENT
 from saml2.saml import NAME_FORMAT_URI
 
-from pathutils import full_path, xmlsec_path
+from pathutils import full_path
 
 BASE = "http://localhost:8088"
 
@@ -86,7 +86,7 @@ CONFIG = {
     "debug": 1,
     "key_file": full_path("test.key"),
     "cert_file": full_path("test.pem"),
-    "xmlsec_binary": xmlsec_path,
+    "xmlsec_binary": None,
     "metadata": {
         "local": [full_path("servera.xml"),
                   full_path("vo_metadata.xml")],
diff --git a/tests/idp_conf_mdb2.py b/tests/idp_conf_mdb2.py
index edd86c5e..ede0d5db 100644
--- a/tests/idp_conf_mdb2.py
+++ b/tests/idp_conf_mdb2.py
@@ -7,7 +7,7 @@ from saml2 import BINDING_HTTP_ARTIFACT
 from saml2.saml import NAMEID_FORMAT_PERSISTENT
 from saml2.saml import NAME_FORMAT_URI
 
-from pathutils import full_path, xmlsec_path
+from pathutils import full_path
 
 BASE = "http://localhost:8089"
 
@@ -86,7 +86,7 @@ CONFIG = {
     "debug": 1,
     "key_file": full_path("test.key"),
     "cert_file": full_path("test.pem"),
-    "xmlsec_binary": xmlsec_path,
+    "xmlsec_binary": None,
     "metadata": {
         "local": [full_path("servera.xml"),
                   full_path("vo_metadata.xml")],
diff --git a/tests/idp_slo_redirect_conf.py b/tests/idp_slo_redirect_conf.py
index c38eb441..530f0fe0 100644
--- a/tests/idp_slo_redirect_conf.py
+++ b/tests/idp_slo_redirect_conf.py
@@ -2,7 +2,7 @@ from saml2 import BINDING_HTTP_REDIRECT
 from saml2.saml import NAMEID_FORMAT_PERSISTENT
 from saml2.saml import NAME_FORMAT_URI
 
-from pathutils import full_path, xmlsec_path
+from pathutils import full_path
 
 CONFIG = {
     "entityid" : "urn:mace:example.com:saml:roland:idp",
@@ -32,7 +32,7 @@ CONFIG = {
     "debug" : 1,
     "key_file" : full_path("test.key"),
     "cert_file" : full_path("test.pem"),
-    "xmlsec_binary" : xmlsec_path,
+    "xmlsec_binary" : None,
     "metadata": {
         "local": [full_path("sp_slo_redirect.xml")],
     },
diff --git a/tests/idp_soap_conf.py b/tests/idp_soap_conf.py
index 580d95ff..110bccdf 100644
--- a/tests/idp_soap_conf.py
+++ b/tests/idp_soap_conf.py
@@ -36,7 +36,7 @@ CONFIG={
     "debug" : 1,
     "key_file" : full_path("test.key"),
     "cert_file" : full_path("test.pem"),
-    #"xmlsec_binary" : xmlsec_path,
+    #"xmlsec_binary" : None,
     "metadata": {
         "local": [full_path("metadata.xml"), full_path("vo_metadata.xml")],
     },
diff --git a/tests/idp_sp_conf.py b/tests/idp_sp_conf.py
index e4da5e68..2f7a7b50 100644
--- a/tests/idp_sp_conf.py
+++ b/tests/idp_sp_conf.py
@@ -6,7 +6,7 @@ from saml2.saml import NAME_FORMAT_URI
 
 BASE = "http://localhost:8088/"
 
-from pathutils import full_path, xmlsec_path
+from pathutils import full_path
 
 CONFIG = {
     "entityid" : "urn:mace:example.com:saml:roland:idp",
@@ -49,7 +49,7 @@ CONFIG = {
     "debug" : 1,
     "key_file" : full_path("test.key"),
     "cert_file" : full_path("test.pem"),
-    "xmlsec_binary" : xmlsec_path,
+    "xmlsec_binary" : None,
     "metadata": {
         "local": [full_path("metadata.xml"), full_path("vo_metadata.xml")],
     },
diff --git a/tests/pathutils.py b/tests/pathutils.py
index cae0ef71..a651060d 100644
--- a/tests/pathutils.py
+++ b/tests/pathutils.py
@@ -12,15 +12,3 @@ def dotname(module):
         return 'tests.' + module
     else:
         return module
-
-
-try:
-    from saml2.sigver import get_xmlsec_binary
-except ImportError:
-    get_xmlsec_binary = None
-
-
-if get_xmlsec_binary:
-    xmlsec_path = get_xmlsec_binary(["/opt/local/bin"])
-else:
-    xmlsec_path = '/usr/bin/xmlsec1'
diff --git a/tests/restrictive_idp_conf.py b/tests/restrictive_idp_conf.py
index c12e1ce7..468c9782 100644
--- a/tests/restrictive_idp_conf.py
+++ b/tests/restrictive_idp_conf.py
@@ -3,7 +3,7 @@ from saml2.saml import NAME_FORMAT_URI
 
 BASE = "http://localhost:8089/"
 
-from pathutils import full_path, xmlsec_path
+from pathutils import full_path
 
 CONFIG = {
     "entityid" : "urn:mace:example.com:saml:roland:idpr",
@@ -36,7 +36,7 @@ CONFIG = {
     },
     "key_file" : full_path("test.key"),
     "cert_file" : full_path("test.pem"),
-    "xmlsec_binary" : xmlsec_path,
+    "xmlsec_binary" : None,
     "metadata": {
         "local": [full_path("sp_0.metadata")],
     },
diff --git a/tests/server2_conf.py b/tests/server2_conf.py
index 47de8349..bd098db9 100644
--- a/tests/server2_conf.py
+++ b/tests/server2_conf.py
@@ -1,4 +1,4 @@
-from pathutils import full_path, xmlsec_path
+from pathutils import full_path
 
 CONFIG = {
     "entityid" : "urn:mace:example.com:saml:roland:sp",
@@ -18,7 +18,7 @@ CONFIG = {
     "debug" : 1,
     "key_file" : full_path("test.key"),
     "cert_file" : full_path("test.pem"),
-    "xmlsec_binary" : xmlsec_path,
+    "xmlsec_binary" : None,
     "metadata": {
         "local": [full_path("idp_soap.xml"), full_path("vo_metadata.xml")],
     },
diff --git a/tests/server3_conf.py b/tests/server3_conf.py
index 1da1b239..764fec4a 100644
--- a/tests/server3_conf.py
+++ b/tests/server3_conf.py
@@ -1,4 +1,4 @@
-from pathutils import full_path, xmlsec_path
+from pathutils import full_path
 
 CONFIG = {
     "entityid" : "urn:mace:example.com:saml:roland:sp",
@@ -18,7 +18,7 @@ CONFIG = {
     "debug" : 1,
     "key_file" : full_path("test.key"),
     "cert_file" : full_path("test.pem"),
-    "xmlsec_binary" : xmlsec_path,
+    "xmlsec_binary" : None,
     "metadata": {
         "local": [full_path("idp_aa.xml"), full_path("vo_metadata.xml")],
     },
diff --git a/tests/server_conf.py b/tests/server_conf.py
index c571a1d1..1430912b 100644
--- a/tests/server_conf.py
+++ b/tests/server_conf.py
@@ -1,4 +1,4 @@
-from pathutils import full_path, xmlsec_path
+from pathutils import full_path
 
 CONFIG={
     "entityid" : "urn:mace:example.com:saml:roland:sp",
@@ -19,7 +19,7 @@ CONFIG={
     "key_file": full_path("test.key"),
     "cert_file": full_path("test.pem"),
     "ca_certs": full_path("cacerts.txt"),
-    "xmlsec_binary": xmlsec_path,
+    "xmlsec_binary": None,
     "metadata": {
         "local": [full_path("idp.xml"), full_path("vo_metadata.xml")],
     },
diff --git a/tests/server_conf_syslog.py b/tests/server_conf_syslog.py
index e76b528e..72e6a748 100644
--- a/tests/server_conf_syslog.py
+++ b/tests/server_conf_syslog.py
@@ -20,7 +20,7 @@ CONFIG={
     "debug" : 1,
     "key_file" : full_path("test.key"),
     "cert_file" : full_path("test.pem"),
-    #"xmlsec_binary" : xmlsec_path,
+    #"xmlsec_binary" : None,
     "metadata": {
         "local": [full_path("idp.xml"), full_path("vo_metadata.xml")],
     },
diff --git a/tests/servera_conf.py b/tests/servera_conf.py
index a79cbc4d..8dcfcb02 100644
--- a/tests/servera_conf.py
+++ b/tests/servera_conf.py
@@ -7,7 +7,7 @@ from saml2 import BINDING_HTTP_ARTIFACT
 from saml2.saml import NAMEID_FORMAT_TRANSIENT
 from saml2.saml import NAMEID_FORMAT_PERSISTENT
 
-from pathutils import full_path, xmlsec_path
+from pathutils import full_path
 
 BASE = "http://lingon.catalogix.se:8087"
 
@@ -48,7 +48,7 @@ CONFIG={
     "key_file": full_path("test.key"),
     "cert_file": full_path("test.pem"),
     "ca_certs": full_path("cacerts.txt"),
-    "xmlsec_binary" : xmlsec_path,
+    "xmlsec_binary" : None,
     "metadata": {
         "local": [full_path("idp_all.xml"), full_path("vo_metadata.xml")],
     },
diff --git a/tests/sp_1_conf.py b/tests/sp_1_conf.py
index aee542c5..e39be482 100644
--- a/tests/sp_1_conf.py
+++ b/tests/sp_1_conf.py
@@ -1,4 +1,4 @@
-from pathutils import full_path, xmlsec_path
+from pathutils import full_path
 
 
 CONFIG = {
@@ -18,7 +18,7 @@ CONFIG = {
     "debug" : 1,
     "key_file" : full_path("test.key"),
     "cert_file" : full_path("test.pem"),
-    "xmlsec_binary" : xmlsec_path,
+    "xmlsec_binary" : None,
     "metadata": {
         "local": [full_path("idp.xml"), full_path("vo_metadata.xml")],
     },
diff --git a/tests/sp_2_conf.py b/tests/sp_2_conf.py
index a8023bdf..b07f0f2c 100644
--- a/tests/sp_2_conf.py
+++ b/tests/sp_2_conf.py
@@ -1,4 +1,4 @@
-from pathutils import full_path, xmlsec_path
+from pathutils import full_path
 
 CONFIG = {
     "entityid" : "urn:mace:example.com:saml:roland:sp",
@@ -17,7 +17,7 @@ CONFIG = {
     "debug" : 1,
     "key_file" : full_path("test.key"),
     "cert_file" : full_path("test.pem"),
-    "xmlsec_binary" : xmlsec_path,
+    "xmlsec_binary" : None,
     "metadata": {
         "local": [full_path("idp_2.xml")],
         },
diff --git a/tests/sp_slo_redirect_conf.py b/tests/sp_slo_redirect_conf.py
index 912653e7..7856c11e 100644
--- a/tests/sp_slo_redirect_conf.py
+++ b/tests/sp_slo_redirect_conf.py
@@ -2,7 +2,7 @@ from saml2 import BINDING_HTTP_REDIRECT
 from saml2.saml import NAMEID_FORMAT_PERSISTENT
 from saml2.saml import NAME_FORMAT_URI
 
-from pathutils import full_path, xmlsec_path
+from pathutils import full_path
 
 HOME = "http://lingon.catalogix.se:8087/"
 CONFIG = {
@@ -26,7 +26,7 @@ CONFIG = {
     "debug" : 1,
     "key_file" : full_path("test.key"),
     "cert_file" : full_path("test.pem"),
-    "xmlsec_binary" : xmlsec_path,
+    "xmlsec_binary" : None,
     "metadata": {
         "local": [full_path("idp_slo_redirect.xml")],
     },
diff --git a/tests/test_63_ecp.py b/tests/test_63_ecp.py
index 5f1dac54..41f2e938 100644
--- a/tests/test_63_ecp.py
+++ b/tests/test_63_ecp.py
@@ -14,7 +14,7 @@ from saml2 import create_class_from_xml_string
 from saml2.profile import ecp as ecp_prof
 from saml2.client import Saml2Client
 
-from pathutils import dotname, full_path, xmlsec_path
+from pathutils import dotname, full_path
 
 __author__ = 'rolandh'