- fixed logging problem in idp_test by copying over code from sp_test

- declared utf-8 as encoding in one of the files that had unicode in the
comments (caused problems with default ASCII encoding, might be needed
in other files as well)
- moved the JSON_DUMPS_ARGS to a separate package called commonArgs so
it can be installed correctly (the install won't accept src as package)

setup.py

@@ -26,7 +26,7 @@ setup(
     author = "Roland Hedberg",
     author_email = "roland.hedberg@adm.umu.se",
     license="Apache 2.0",
-    packages=["idp_test", "idp_test/package", "saml2test", "sp_test"],
+    packages=["idp_test", "idp_test/package", "saml2test", "sp_test", "commonArgs"],
     package_dir = {"": "src"},
     classifiers = [
         "Development Status :: 4 - Beta",

src/__init__.py

@@ -1,3 +0,0 @@
-__author__ = 'rolandh'
-
-JSON_DUMPS_ARGS = {"indent": 4, "sort_keys": True}

src/idp_test/__init__.py

@@ -34,14 +34,14 @@ from saml2.extension import mdattr
 from saml2.extension import ui
 from saml2.metadata import entity_descriptor
 from saml2.saml import NAME_FORMAT_UNSPECIFIED
-from src import JSON_DUMPS_ARGS
+from commonArgs import JSON_DUMPS_ARGS
 
 SCHEMA = [dri, idpdisc, md, mdattr, mdui, saml, ui, xmldsig, xmlenc]
 
 __author__ = 'rolandh'
 
-logger = logging.getLogger("")
+#logger = logging.getLogger("")
-logger.setLevel(logging.DEBUG)
+#logger.setLevel(logging.DEBUG)
 #formatter = logging.Formatter("%(asctime)s %(name)s:%(levelname)s %(message)s")
 formatter_2 = logging.Formatter("%(delta).6f - %(levelname)s - [%(name)s] %(message)s")
 
@@ -54,9 +54,14 @@ streamhandler.setFormatter(formatter_2)
 memoryhandler = logging.handlers.MemoryHandler(1024*10, logging.DEBUG)
 memoryhandler.addFilter(cf)
 
-saml2testlog = logging.getLogger("saml2test")
+#saml2testlog = logging.getLogger("saml2test")
-saml2testlog.addHandler(memoryhandler)
+#saml2testlog.addHandler(memoryhandler)
-saml2testlog.setLevel(logging.DEBUG)
+#saml2testlog.setLevel(logging.DEBUG)
+logger = logging.getLogger("saml2test")
+logger.setLevel(logging.DEBUG)
+logger.addHandler(memoryhandler)
+#logger.addHandler(streamhandler)
+logger.setLevel(logging.DEBUG)
 
 
 def recursive_find_module(name, path=None):

src/idp_test/interaction.py

@@ -1,4 +1,4 @@
-from src import JSON_DUMPS_ARGS
+from commonArgs import JSON_DUMPS_ARGS
 
 __author__ = 'rohe0002'
 

src/saml2test/interaction.py

@@ -1,4 +1,4 @@
-from src import JSON_DUMPS_ARGS
+from commonArgs import JSON_DUMPS_ARGS
 
 __author__ = 'rohe0002'
 

src/saml2test/opfunc.py

@@ -6,7 +6,7 @@ from urlparse import urlparse
 from mechanize import ParseResponseEx
 from mechanize._form import ControlNotFoundError, AmbiguityError
 from mechanize._form import ListControl
-from src import JSON_DUMPS_ARGS
+from commonArgs import JSON_DUMPS_ARGS
 
 __author__ = 'rohe0002'
 

src/sp_test/__init__.py

@@ -19,7 +19,7 @@ from saml2test import FatalError
 from saml2test import CheckError
 from saml2test import ContextFilter
 from saml2test import exception_trace
-from src import JSON_DUMPS_ARGS
+from commonArgs import JSON_DUMPS_ARGS
 
 __author__ = 'rolandh'
 

src/sp_test/tests.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import copy
 from saml2 import samlp, SamlBase
 from saml2 import NAMEID_FORMAT_EMAILADDRESS

tests/idp_test/target_idp.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 from saml2.saml import NAME_FORMAT_URI
-from src import JSON_DUMPS_ARGS
+from commonArgs import JSON_DUMPS_ARGS
 
 __author__ = 'rolandh'
 

tests/localhost.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 from saml2.saml import NAME_FORMAT_URI
-from src import JSON_DUMPS_ARGS
+from commonArgs import JSON_DUMPS_ARGS
 
 __author__ = 'rolandh'
 

tests/sp_test/targetsp.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 from saml2.saml import AUTHN_PASSWORD
-from src import JSON_DUMPS_ARGS
+from commonArgs import JSON_DUMPS_ARGS
 
 __author__ = 'rolandh'