Merge pull request #75 from Renater/no-need-for-nose-at-setup-time

No need for nose at setup time

Author: leifj

Diff for: setup.py

@@ -33,7 +33,6 @@
     url='http://blogs.mnt.se',
     license='BSD',
     packages=find_packages('src'),
-    setup_requires=['nose>=1.0'],
     tests_require=['nose>=1.0', 'mock'],
     test_suite="nose.collector",
     package_dir = {'': 'src'},

Diff for: src/xmlsec/__init__.py

@@ -363,7 +363,7 @@ def _verify(t, keyspec, sig_path=".//{%s}Signature" % NS['ds'], drop_signature=F
                 if not this_cert.verify(b64d(sv), actual, sig_uri):
                     raise XMLSigException("Failed to validate {!s} using sig sig method {!s}".format(etree.tostring(sig), sig_uri))
                 validated.append(obj)
-        except (XMLSigException, ValueError) as ex:
+        except (XMLSigException, ValueError) as ex: # we will try the next available signature
             log.error(ex)
 
     if not validated:

Diff for: src/xmlsec/crypto.py

@@ -4,6 +4,7 @@
 import logging
 import threading
 import six
+import sys
 from six.moves import xrange
 from xmlsec import constants
 from binascii import hexlify
@@ -21,6 +22,8 @@
 
 if six.PY2:
     from UserDict import DictMixin
+elif sys.version_info[:2] >= (3, 8):
+    from collections.abc import MutableMapping as DictMixin
 else:
     from collections.abc import MutableMapping as DictMixin