Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/certbot/certbot.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMads Jensen <mads.jensen@eficode.com>2021-03-06 03:53:20 +0300
committerGitHub <noreply@github.com>2021-03-06 03:53:20 +0300
commitc02b2d30f2535a254020184912a94c6ed19b5026 (patch)
tree606fba7970bc06caa96bb107e2392e6a24b60d80 /certbot-ci
parent94dc6936e73114ac4adc5f766d06f6c3cc9f67e8 (diff)
Removed Python legacy __future__ imports (#8697)
There are still some left, but the `modification_check` test fails. Some are still in `tools`, and they can probably be removed as well. `with_statement` was introduced officially in Python 2.5, so there's really old stuff in the code base.
Diffstat (limited to 'certbot-ci')
-rwxr-xr-xcertbot-ci/certbot_integration_tests/assets/hook.py1
-rw-r--r--certbot-ci/certbot_integration_tests/certbot_tests/test_main.py1
-rw-r--r--certbot-ci/certbot_integration_tests/conftest.py1
-rwxr-xr-xcertbot-ci/certbot_integration_tests/utils/acme_server.py1
-rwxr-xr-xcertbot-ci/certbot_integration_tests/utils/certbot_call.py1
-rw-r--r--certbot-ci/certbot_integration_tests/utils/dns_server.py2
-rw-r--r--certbot-ci/certbot_integration_tests/utils/misc.py2
-rw-r--r--certbot-ci/windows_installer_integration_tests/conftest.py2
8 files changed, 2 insertions, 9 deletions
diff --git a/certbot-ci/certbot_integration_tests/assets/hook.py b/certbot-ci/certbot_integration_tests/assets/hook.py
index 483892a93..c11704f47 100755
--- a/certbot-ci/certbot_integration_tests/assets/hook.py
+++ b/certbot-ci/certbot_integration_tests/assets/hook.py
@@ -1,5 +1,4 @@
#!/usr/bin/env python
-from __future__ import print_function
import os
import sys
diff --git a/certbot-ci/certbot_integration_tests/certbot_tests/test_main.py b/certbot-ci/certbot_integration_tests/certbot_tests/test_main.py
index 2d3d93669..0b649acdc 100644
--- a/certbot-ci/certbot_integration_tests/certbot_tests/test_main.py
+++ b/certbot-ci/certbot_integration_tests/certbot_tests/test_main.py
@@ -1,5 +1,4 @@
"""Module executing integration tests against certbot core."""
-from __future__ import print_function
import os
from os.path import exists
diff --git a/certbot-ci/certbot_integration_tests/conftest.py b/certbot-ci/certbot_integration_tests/conftest.py
index 230fb0eda..6fc77480d 100644
--- a/certbot-ci/certbot_integration_tests/conftest.py
+++ b/certbot-ci/certbot_integration_tests/conftest.py
@@ -6,7 +6,6 @@ for a directory a specific configuration using built-in pytest hooks.
See https://docs.pytest.org/en/latest/reference.html#hook-reference
"""
-from __future__ import print_function
import contextlib
import subprocess
import sys
diff --git a/certbot-ci/certbot_integration_tests/utils/acme_server.py b/certbot-ci/certbot_integration_tests/utils/acme_server.py
index 846e2d071..b16aa80af 100755
--- a/certbot-ci/certbot_integration_tests/utils/acme_server.py
+++ b/certbot-ci/certbot_integration_tests/utils/acme_server.py
@@ -1,6 +1,5 @@
#!/usr/bin/env python
"""Module to setup an ACME CA server environment able to run multiple tests in parallel"""
-from __future__ import print_function
import argparse
import errno
diff --git a/certbot-ci/certbot_integration_tests/utils/certbot_call.py b/certbot-ci/certbot_integration_tests/utils/certbot_call.py
index c9e46cdc7..b319eca4c 100755
--- a/certbot-ci/certbot_integration_tests/utils/certbot_call.py
+++ b/certbot-ci/certbot_integration_tests/utils/certbot_call.py
@@ -1,6 +1,5 @@
#!/usr/bin/env python
"""Module to call certbot in test mode"""
-from __future__ import absolute_import
import os
import subprocess
diff --git a/certbot-ci/certbot_integration_tests/utils/dns_server.py b/certbot-ci/certbot_integration_tests/utils/dns_server.py
index 62a58275e..eaa601f1b 100644
--- a/certbot-ci/certbot_integration_tests/utils/dns_server.py
+++ b/certbot-ci/certbot_integration_tests/utils/dns_server.py
@@ -1,7 +1,5 @@
#!/usr/bin/env python
"""Module to setup an RFC2136-capable DNS server"""
-from __future__ import print_function
-
import os
import os.path
import shutil
diff --git a/certbot-ci/certbot_integration_tests/utils/misc.py b/certbot-ci/certbot_integration_tests/utils/misc.py
index e6b9f0c88..cf2e7ff09 100644
--- a/certbot-ci/certbot_integration_tests/utils/misc.py
+++ b/certbot-ci/certbot_integration_tests/utils/misc.py
@@ -311,7 +311,7 @@ def echo(keyword, path=None):
if not re.match(r'^\w+$', keyword):
raise ValueError('Error, keyword `{0}` is not a single keyword.'
.format(keyword))
- return '{0} -c "from __future__ import print_function; print(\'{1}\')"{2}'.format(
+ return '{0} -c "print(\'{1}\')"{2}'.format(
os.path.basename(sys.executable), keyword, ' >> "{0}"'.format(path) if path else '')
diff --git a/certbot-ci/windows_installer_integration_tests/conftest.py b/certbot-ci/windows_installer_integration_tests/conftest.py
index c6a89c323..8a9de057f 100644
--- a/certbot-ci/windows_installer_integration_tests/conftest.py
+++ b/certbot-ci/windows_installer_integration_tests/conftest.py
@@ -6,7 +6,7 @@ for a directory a specific configuration using built-in pytest hooks.
See https://docs.pytest.org/en/latest/reference.html#hook-reference
"""
-from __future__ import print_function
+
import os
ROOT_PATH = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))