]>
Commit | Line | Data |
---|---|---|
7fb26094 JB |
1 | --- fido2-0.3.0/test/test_client.py.orig 2018-04-05 14:24:00.000000000 +0200 |
2 | +++ fido2-0.3.0/test/test_client.py 2018-05-20 21:11:47.066881551 +0200 | |
3 | @@ -29,8 +29,11 @@ | |
4 | ||
5 | from __future__ import absolute_import, unicode_literals | |
6 | ||
7 | -import mock | |
8 | import unittest | |
9 | +try: | |
10 | + import mock | |
11 | +except: | |
12 | + from unittest import mock | |
7c9a6a39 | 13 | from threading import Event, Timer |
7fb26094 JB |
14 | from binascii import a2b_hex |
15 | from fido2.utils import sha256, websafe_decode | |
16 | --- fido2-0.3.0/test/test_ctap1.py.orig 2018-04-05 14:24:00.000000000 +0200 | |
17 | +++ fido2-0.3.0/test/test_ctap1.py 2018-05-20 21:12:03.176881487 +0200 | |
18 | @@ -31,7 +31,10 @@ from fido2.ctap1 import CTAP1, ApduError | |
591dbe06 | 19 | from fido2.ctap1 import Ctap1, ApduError |
7fb26094 JB |
20 | from binascii import a2b_hex |
21 | import unittest | |
22 | -import mock | |
23 | +try: | |
24 | + import mock | |
25 | +except: | |
26 | + from unittest import mock | |
27 | ||
28 | ||
591dbe06 | 29 | class TestCtap1(unittest.TestCase): |
7fb26094 JB |
30 | --- fido2-0.3.0/test/test_ctap2.py.orig 2018-04-12 17:10:24.000000000 +0200 |
31 | +++ fido2-0.3.0/test/test_ctap2.py 2018-05-20 21:12:17.790214668 +0200 | |
32 | @@ -37,7 +37,10 @@ from cryptography.hazmat.backends import | |
33 | from cryptography.hazmat.primitives.asymmetric import ec | |
34 | ||
35 | import unittest | |
36 | -import mock | |
37 | +try: | |
38 | + import mock | |
39 | +except: | |
40 | + from unittest import mock | |
41 | ||
fd3d11a0 JP |
42 | _AAGUID = a2b_hex("F8A011F38C0A4D15800617111F9EDC7D") |
43 | _INFO = a2b_hex( |