Skip to content

No need for nose at setup time #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 27, 2023
Merged

No need for nose at setup time #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fbaea75
clarify
leifj Mar 31, 2021
e996aa8
Update crypto.py
mrvanes Apr 20, 2022
ad40939
Merge pull request #2 from mrvanes/patch-1
leifj Apr 20, 2022
c220d07
node is needed for testing only, not for setup
Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'},
Expand Down
2 changes: 1 addition & 1 deletion src/xmlsec/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ def _verify(t, keyspec, sig_path=".//{%s}Signature" % NS['ds'], drop_signature=F
if not this_cert.verify(b64d(sv), actual, sig_digest_alg):
raise XMLSigException("Failed to validate {!s} using sig digest {!s} and cm {!s}".format(etree.tostring(sig), sig_digest_alg, cm_alg))
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:
Expand Down
3 changes: 3 additions & 0 deletions src/xmlsec/crypto.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -20,6 +21,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 import MutableMapping as DictMixin

Expand Down