projects / packages / python-httplib2.git / blame
| Commit | Line | Data |
|---|---|---|
| ebcdddb2 JB |
1 | --- httplib2-0.17.0/tests/test_cacerts_from_env.py.orig 2020-01-24 14:57:26.000000000 +0100 |
| 2 | +++ httplib2-0.17.0/tests/test_cacerts_from_env.py 2020-03-23 20:44:34.443627324 +0100 | |
| 3 | @@ -1,10 +1,12 @@ | |
| 4 | import os | |
| 5 | import sys | |
| 6 | -import mock | |
| 7 | import pytest | |
| 8 | import tempfile | |
| 9 | import httplib2 | |
| 10 | - | |
| 11 | +try: | |
| 12 | + import mock | |
| 13 | +except ImportError: | |
| 14 | + from unittest import mock | |
| 15 | ||
| 16 | CA_CERTS_BUILTIN = os.path.join(os.path.dirname(httplib2.__file__), "cacerts.txt") | |
| 17 | CERTIFI_CERTS_FILE = "unittest_certifi_file" | |
| 18 | --- httplib2-0.17.0/tests/test_http.py.orig 2020-01-24 14:57:26.000000000 +0100 | |
| 19 | +++ httplib2-0.17.0/tests/test_http.py 2020-03-23 20:45:02.520141887 +0100 | |
| 20 | @@ -5,13 +5,15 @@ | |
| 21 | import email.utils | |
| 22 | import errno | |
| 23 | import httplib2 | |
| 24 | -import mock | |
| 25 | import os | |
| 26 | import pytest | |
| 27 | from six.moves import http_client, urllib | |
| 28 | import socket | |
| 29 | import tests | |
| 30 | - | |
| 31 | +try: | |
| 32 | + import mock | |
| 33 | +except ImportError: | |
| 34 | + from unittest import mock | |
| 35 | ||
| 36 | def _raise_connection_refused_exception(*args, **kwargs): | |
| 37 | raise socket.error(errno.ECONNREFUSED, "Connection refused.") | |
| 38 | --- httplib2-0.17.0/tests/test_other.py.orig 2020-01-24 14:57:26.000000000 +0100 | |
| 39 | +++ httplib2-0.17.0/tests/test_other.py 2020-03-23 20:45:22.020036247 +0100 | |
| 40 | @@ -1,5 +1,4 @@ | |
| 41 | import httplib2 | |
| 42 | -import mock | |
| 43 | import os | |
| 44 | import pickle | |
| 45 | import pytest | |
| 46 | @@ -8,7 +7,10 @@ | |
| 47 | import tests | |
| 48 | import time | |
| 49 | from six.moves import urllib | |
| 50 | - | |
| 51 | +try: | |
| 52 | + import mock | |
| 53 | +except ImportError: | |
| 54 | + from unittest import mock | |
| 55 | ||
| 56 | @pytest.mark.skipif( | |
| 57 | sys.version_info <= (3,), | |
| 58 | --- httplib2-0.17.0/tests/test_proxy.py.orig 2020-01-24 14:57:26.000000000 +0100 | |
| 59 | +++ httplib2-0.17.0/tests/test_proxy.py 2020-03-23 20:45:42.219926815 +0100 | |
| 60 | @@ -9,12 +9,15 @@ | |
| 61 | from __future__ import print_function | |
| 62 | ||
| 63 | import httplib2 | |
| 64 | -import mock | |
| 65 | import os | |
| 66 | import pytest | |
| 67 | import socket | |
| 68 | import tests | |
| 69 | from six.moves import urllib | |
| 70 | +try: | |
| 71 | + import mock | |
| 72 | +except ImportError: | |
| 73 | + from unittest import mock | |
| 74 | ||
| 75 | ||
| 76 | def _raise_name_not_known_error(*args, **kwargs): |