diff options
| author | Brad Warren <bmw@users.noreply.github.com> | 2021-02-09 22:43:15 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-09 22:43:15 +0300 |
| commit | 3d0dad8718e3b1904c1acb7da530a08053ced08f (patch) | |
| tree | 77c1469cc3bcb33b365fbcd3982e0215a957601e /tests | |
| parent | edad9bd82b11e2e6fdc2bfd633e8c790e0da23d7 (diff) | |
Remove dependency on six (#8650)
Fixes https://github.com/certbot/certbot/issues/8494.
I left the `six` dependency pinned in `tests/letstest/requirements.txt` and `tools/oldest_constraints.txt` because `six` is still a transitive dependency with our current pinnings.
The extra moving around of imports is due to me using `isort` to help me keep dependencies in sorted order after replacing imports of `six`.
* remove some six usage in acme
* remove six from acme
* remove six.add_metaclass usage
* fix six.moves.zip
* fix six.moves.builtins.open
* six.moves server fixes
* 's/six\.moves\.range/range/g'
* stop using six.moves.xrange
* fix urllib imports
* s/six\.binary_type/bytes/g
* s/six\.string_types/str/g
* 's/six\.text_type/str/g'
* fix six.iteritems usage
* fix itervalues usage
* switch from six.StringIO to io.StringIO
* remove six imports
* misc fixes
* stop using six.reload_module
* no six.PY2
* rip out six
* keep six pinned in oldest constraints
* fix log_test.py
* update changelog
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/letstest/multitester.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/letstest/multitester.py b/tests/letstest/multitester.py index 5ad1d8c15..83a92e6dc 100644 --- a/tests/letstest/multitester.py +++ b/tests/letstest/multitester.py @@ -39,11 +39,11 @@ import socket import sys import time import traceback +import urllib.error as urllib_error +import urllib.request as urllib_request import boto3 from botocore.exceptions import ClientError -from six.moves.urllib import error as urllib_error -from six.moves.urllib import request as urllib_request import yaml from fabric import Config |