Hello community,
here is the log from the commit of package python-certbot-apache for
openSUSE:Factory checked in at 2020-01-21 21:01:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-certbot-apache (Old)
and /work/SRC/openSUSE:Factory/.python-certbot-apache.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-certbot-apache"
Tue Jan 21 21:01:55 2020 rev:16 rq:766007 version:1.1.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-certbot-apache/python-certbot-apache.changes
2020-01-03 17:39:50.971383912 +0100
+++
/work/SRC/openSUSE:Factory/.python-certbot-apache.new.26092/python-certbot-apache.changes
2020-01-21 21:02:27.936907695 +0100
@@ -1,0 +2,6 @@
+Tue Jan 21 09:39:46 UTC 2020 - Marketa Calabkova <[email protected]>
+
+- update to version 1.1.0
+ * Sync with main certbot package.
+
+-------------------------------------------------------------------
Old:
----
certbot-apache-1.0.0.tar.gz
New:
----
certbot-apache-1.1.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-certbot-apache.spec ++++++
--- /var/tmp/diff_new_pack.fSNoRs/_old 2020-01-21 21:02:28.964908174 +0100
+++ /var/tmp/diff_new_pack.fSNoRs/_new 2020-01-21 21:02:28.972908178 +0100
@@ -18,14 +18,14 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-certbot-apache
-Version: 1.0.0
+Version: 1.1.0
Release: 0
Summary: Apache plugin for Certbot
License: Apache-2.0
URL: https://github.com/letsencrypt/letsencrypt
Source:
https://files.pythonhosted.org/packages/source/c/certbot-apache/certbot-apache-%{version}.tar.gz
BuildRequires: %{python_module augeas}
-BuildRequires: %{python_module certbot >= 1.0.0}
+BuildRequires: %{python_module certbot >= 1.1.0}
BuildRequires: %{python_module mock}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools}
@@ -37,7 +37,7 @@
Requires: augeas-lenses
Requires: python-acme >= 0.34.0
Requires: python-augeas
-Requires: python-certbot >= 1.0.0
+Requires: python-certbot >= 1.1.0
Requires: python-zope.component
Requires: python-zope.interface
BuildArch: noarch
++++++ certbot-apache-1.0.0.tar.gz -> certbot-apache-1.1.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.0.0/PKG-INFO
new/certbot-apache-1.1.0/PKG-INFO
--- old/certbot-apache-1.0.0/PKG-INFO 2019-12-03 18:20:44.000000000 +0100
+++ new/certbot-apache-1.1.0/PKG-INFO 2020-01-14 19:41:46.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: certbot-apache
-Version: 1.0.0
+Version: 1.1.0
Summary: Apache plugin for Certbot
Home-page: https://github.com/letsencrypt/letsencrypt
Author: Certbot Project
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.0.0/certbot_apache/_internal/configurator.py
new/certbot-apache-1.1.0/certbot_apache/_internal/configurator.py
--- old/certbot-apache-1.0.0/certbot_apache/_internal/configurator.py
2019-12-03 18:20:30.000000000 +0100
+++ new/certbot-apache-1.1.0/certbot_apache/_internal/configurator.py
2020-01-14 19:41:31.000000000 +0100
@@ -1,5 +1,6 @@
"""Apache Configurator."""
# pylint: disable=too-many-lines
+from collections import defaultdict
import copy
import fnmatch
import logging
@@ -7,28 +8,26 @@
import socket
import time
-from collections import defaultdict
-
import pkg_resources
import six
-
import zope.component
import zope.interface
from acme import challenges
-from acme.magic_typing import DefaultDict, Dict, List, Set, Union # pylint:
disable=unused-import, no-name-in-module
-
+from acme.magic_typing import DefaultDict # pylint: disable=unused-import,
no-name-in-module
+from acme.magic_typing import Dict # pylint: disable=unused-import,
no-name-in-module
+from acme.magic_typing import List # pylint: disable=unused-import,
no-name-in-module
+from acme.magic_typing import Set # pylint: disable=unused-import,
no-name-in-module
+from acme.magic_typing import Union # pylint: disable=unused-import,
no-name-in-module
from certbot import errors
from certbot import interfaces
from certbot import util
-
from certbot.achallenges import KeyAuthorizationAnnotatedChallenge # pylint:
disable=unused-import
from certbot.compat import filesystem
from certbot.compat import os
from certbot.plugins import common
-from certbot.plugins.util import path_surgery
from certbot.plugins.enhancements import AutoHSTSEnhancement
-
+from certbot.plugins.util import path_surgery
from certbot_apache._internal import apache_util
from certbot_apache._internal import constants
from certbot_apache._internal import display_ops
@@ -450,7 +449,7 @@
filtered_vhosts[name] = vhost
# Only unique VHost objects
- dialog_input = set([vhost for vhost in filtered_vhosts.values()])
+ dialog_input = set(filtered_vhosts.values())
# Ask the user which of names to enable, expect list of names back
dialog_output = display_ops.select_vhost_multiple(list(dialog_input))
@@ -601,9 +600,9 @@
"in the Apache config.",
target_name)
raise errors.PluginError("No vhost selected")
- elif temp:
+ if temp:
return vhost
- elif not vhost.ssl:
+ if not vhost.ssl:
addrs = self._get_proposed_addrs(vhost, "443")
# TODO: Conflicts is too conservative
if not any(vhost.enabled and vhost.conflicts(addrs) for
@@ -952,13 +951,12 @@
loc = parser.get_aug_path(self.parser.loc["name"])
if addr.get_port() == "443":
- path = self.parser.add_dir_to_ifmodssl(
+ self.parser.add_dir_to_ifmodssl(
loc, "NameVirtualHost", [str(addr)])
else:
- path = self.parser.add_dir(loc, "NameVirtualHost", [str(addr)])
+ self.parser.add_dir(loc, "NameVirtualHost", [str(addr)])
- msg = ("Setting %s to be NameBasedVirtualHost\n"
- "\tDirective added to %s\n" % (addr, path))
+ msg = "Setting {0} to be NameBasedVirtualHost\n".format(addr)
logger.debug(msg)
self.save_notes += msg
@@ -1366,12 +1364,9 @@
result.append(comment)
sift = True
- result.append('\n'.join(
- ['# ' + l for l in chunk]))
- continue
+ result.append('\n'.join(['# ' + l for l in chunk]))
else:
result.append('\n'.join(chunk))
- continue
return result, sift
def _get_vhost_block(self, vhost):
@@ -2514,4 +2509,4 @@
self._autohsts_save_state()
-AutoHSTSEnhancement.register(ApacheConfigurator) # pylint: disable=no-member
+AutoHSTSEnhancement.register(ApacheConfigurator)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.0.0/certbot_apache/_internal/constants.py
new/certbot-apache-1.1.0/certbot_apache/_internal/constants.py
--- old/certbot-apache-1.0.0/certbot_apache/_internal/constants.py
2019-12-03 18:20:30.000000000 +0100
+++ new/certbot-apache-1.1.0/certbot_apache/_internal/constants.py
2020-01-14 19:41:31.000000000 +0100
@@ -3,7 +3,6 @@
from certbot.compat import os
-
MOD_SSL_CONF_DEST = "options-ssl-apache.conf"
"""Name of the mod_ssl config file as saved in `IConfig.config_dir`."""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.0.0/certbot_apache/_internal/display_ops.py
new/certbot-apache-1.1.0/certbot_apache/_internal/display_ops.py
--- old/certbot-apache-1.0.0/certbot_apache/_internal/display_ops.py
2019-12-03 18:20:30.000000000 +0100
+++ new/certbot-apache-1.1.0/certbot_apache/_internal/display_ops.py
2020-01-14 19:41:31.000000000 +0100
@@ -3,10 +3,10 @@
import zope.component
-import certbot.display.util as display_util
from certbot import errors
from certbot import interfaces
from certbot.compat import os
+import certbot.display.util as display_util
logger = logging.getLogger(__name__)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.0.0/certbot_apache/_internal/entrypoint.py
new/certbot-apache-1.1.0/certbot_apache/_internal/entrypoint.py
--- old/certbot-apache-1.0.0/certbot_apache/_internal/entrypoint.py
2019-12-03 18:20:30.000000000 +0100
+++ new/certbot-apache-1.1.0/certbot_apache/_internal/entrypoint.py
2020-01-14 19:41:31.000000000 +0100
@@ -4,13 +4,12 @@
from distutils.version import LooseVersion # pylint:
disable=no-name-in-module,import-error
from certbot import util
-
from certbot_apache._internal import configurator
from certbot_apache._internal import override_arch
-from certbot_apache._internal import override_fedora
+from certbot_apache._internal import override_centos
from certbot_apache._internal import override_darwin
from certbot_apache._internal import override_debian
-from certbot_apache._internal import override_centos
+from certbot_apache._internal import override_fedora
from certbot_apache._internal import override_gentoo
from certbot_apache._internal import override_suse
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.0.0/certbot_apache/_internal/http_01.py
new/certbot-apache-1.1.0/certbot_apache/_internal/http_01.py
--- old/certbot-apache-1.0.0/certbot_apache/_internal/http_01.py
2019-12-03 18:20:30.000000000 +0100
+++ new/certbot-apache-1.1.0/certbot_apache/_internal/http_01.py
2020-01-14 19:41:31.000000000 +0100
@@ -1,13 +1,12 @@
"""A class that performs HTTP-01 challenges for Apache"""
import logging
-from acme.magic_typing import List, Set # pylint: disable=unused-import,
no-name-in-module
-
+from acme.magic_typing import List # pylint: disable=unused-import,
no-name-in-module
+from acme.magic_typing import Set # pylint: disable=unused-import,
no-name-in-module
from certbot import errors
-from certbot.compat import os
from certbot.compat import filesystem
+from certbot.compat import os
from certbot.plugins import common
-
from certbot_apache._internal.obj import VirtualHost # pylint:
disable=unused-import
from certbot_apache._internal.parser import get_aug_path
@@ -195,8 +194,8 @@
if vhost not in self.moded_vhosts:
logger.debug(
- "Adding a temporary challenge validation Include for name: %s
" +
- "in: %s", vhost.name, vhost.filep)
+ "Adding a temporary challenge validation Include for name: %s
in: %s",
+ vhost.name, vhost.filep)
self.configurator.parser.add_dir_beginning(
vhost.path, "Include", self.challenge_conf_pre)
self.configurator.parser.add_dir(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.0.0/certbot_apache/_internal/obj.py
new/certbot-apache-1.1.0/certbot_apache/_internal/obj.py
--- old/certbot-apache-1.0.0/certbot_apache/_internal/obj.py 2019-12-03
18:20:30.000000000 +0100
+++ new/certbot-apache-1.1.0/certbot_apache/_internal/obj.py 2020-01-14
19:41:31.000000000 +0100
@@ -1,7 +1,7 @@
"""Module contains classes used by the Apache Configurator."""
import re
-from acme.magic_typing import Set # pylint: disable=unused-import,
no-name-in-module
+from acme.magic_typing import Set # pylint: disable=unused-import,
no-name-in-module
from certbot.plugins import common
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.0.0/certbot_apache/_internal/override_arch.py
new/certbot-apache-1.1.0/certbot_apache/_internal/override_arch.py
--- old/certbot-apache-1.0.0/certbot_apache/_internal/override_arch.py
2019-12-03 18:20:30.000000000 +0100
+++ new/certbot-apache-1.1.0/certbot_apache/_internal/override_arch.py
2020-01-14 19:41:31.000000000 +0100
@@ -1,13 +1,12 @@
""" Distribution specific override class for Arch Linux """
import pkg_resources
-
import zope.interface
from certbot import interfaces
from certbot.compat import os
-
from certbot_apache._internal import configurator
+
@zope.interface.provider(interfaces.IPluginFactory)
class ArchConfigurator(configurator.ApacheConfigurator):
"""Arch Linux specific ApacheConfigurator override class"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.0.0/certbot_apache/_internal/override_centos.py
new/certbot-apache-1.1.0/certbot_apache/_internal/override_centos.py
--- old/certbot-apache-1.0.0/certbot_apache/_internal/override_centos.py
2019-12-03 18:20:30.000000000 +0100
+++ new/certbot-apache-1.1.0/certbot_apache/_internal/override_centos.py
2020-01-14 19:41:31.000000000 +0100
@@ -4,19 +4,16 @@
import pkg_resources
import zope.interface
+from acme.magic_typing import List # pylint: disable=unused-import,
no-name-in-module
from certbot import errors
from certbot import interfaces
from certbot import util
from certbot.compat import os
from certbot.errors import MisconfigurationError
-
-from acme.magic_typing import List # pylint: disable=unused-import,
no-name-in-module
-
from certbot_apache._internal import apache_util
from certbot_apache._internal import configurator
from certbot_apache._internal import parser
-
logger = logging.getLogger(__name__)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.0.0/certbot_apache/_internal/override_darwin.py
new/certbot-apache-1.1.0/certbot_apache/_internal/override_darwin.py
--- old/certbot-apache-1.0.0/certbot_apache/_internal/override_darwin.py
2019-12-03 18:20:30.000000000 +0100
+++ new/certbot-apache-1.1.0/certbot_apache/_internal/override_darwin.py
2020-01-14 19:41:31.000000000 +0100
@@ -1,13 +1,12 @@
""" Distribution specific override class for macOS """
import pkg_resources
-
import zope.interface
from certbot import interfaces
from certbot.compat import os
-
from certbot_apache._internal import configurator
+
@zope.interface.provider(interfaces.IPluginFactory)
class DarwinConfigurator(configurator.ApacheConfigurator):
"""macOS specific ApacheConfigurator override class"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.0.0/certbot_apache/_internal/override_debian.py
new/certbot-apache-1.1.0/certbot_apache/_internal/override_debian.py
--- old/certbot-apache-1.0.0/certbot_apache/_internal/override_debian.py
2019-12-03 18:20:30.000000000 +0100
+++ new/certbot-apache-1.1.0/certbot_apache/_internal/override_debian.py
2020-01-14 19:41:31.000000000 +0100
@@ -9,7 +9,6 @@
from certbot import util
from certbot.compat import filesystem
from certbot.compat import os
-
from certbot_apache._internal import apache_util
from certbot_apache._internal import configurator
@@ -71,15 +70,14 @@
# Already in shape
vhost.enabled = True
return None
- else:
- logger.warning(
- "Could not symlink %s to %s, got error: %s", enabled_path,
- vhost.filep, err.strerror)
- errstring = ("Encountered error while trying to enable a " +
- "newly created VirtualHost located at {0} by " +
- "linking to it from {1}")
- raise errors.NotSupportedError(errstring.format(vhost.filep,
- enabled_path))
+ logger.warning(
+ "Could not symlink %s to %s, got error: %s", enabled_path,
+ vhost.filep, err.strerror)
+ errstring = ("Encountered error while trying to enable a " +
+ "newly created VirtualHost located at {0} by " +
+ "linking to it from {1}")
+ raise errors.NotSupportedError(errstring.format(vhost.filep,
+ enabled_path))
vhost.enabled = True
logger.info("Enabling available site: %s", vhost.filep)
self.save_notes += "Enabled site %s\n" % vhost.filep
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.0.0/certbot_apache/_internal/override_fedora.py
new/certbot-apache-1.1.0/certbot_apache/_internal/override_fedora.py
--- old/certbot-apache-1.0.0/certbot_apache/_internal/override_fedora.py
2019-12-03 18:20:30.000000000 +0100
+++ new/certbot-apache-1.1.0/certbot_apache/_internal/override_fedora.py
2020-01-14 19:41:31.000000000 +0100
@@ -6,7 +6,6 @@
from certbot import interfaces
from certbot import util
from certbot.compat import os
-
from certbot_apache._internal import apache_util
from certbot_apache._internal import configurator
from certbot_apache._internal import parser
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.0.0/certbot_apache/_internal/override_gentoo.py
new/certbot-apache-1.1.0/certbot_apache/_internal/override_gentoo.py
--- old/certbot-apache-1.0.0/certbot_apache/_internal/override_gentoo.py
2019-12-03 18:20:30.000000000 +0100
+++ new/certbot-apache-1.1.0/certbot_apache/_internal/override_gentoo.py
2020-01-14 19:41:31.000000000 +0100
@@ -1,15 +1,14 @@
""" Distribution specific override class for Gentoo Linux """
import pkg_resources
-
import zope.interface
from certbot import interfaces
from certbot.compat import os
-
from certbot_apache._internal import apache_util
from certbot_apache._internal import configurator
from certbot_apache._internal import parser
+
@zope.interface.provider(interfaces.IPluginFactory)
class GentooConfigurator(configurator.ApacheConfigurator):
"""Gentoo specific ApacheConfigurator override class"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.0.0/certbot_apache/_internal/override_suse.py
new/certbot-apache-1.1.0/certbot_apache/_internal/override_suse.py
--- old/certbot-apache-1.0.0/certbot_apache/_internal/override_suse.py
2019-12-03 18:20:30.000000000 +0100
+++ new/certbot-apache-1.1.0/certbot_apache/_internal/override_suse.py
2020-01-14 19:41:31.000000000 +0100
@@ -1,13 +1,12 @@
""" Distribution specific override class for OpenSUSE """
import pkg_resources
-
import zope.interface
from certbot import interfaces
from certbot.compat import os
-
from certbot_apache._internal import configurator
+
@zope.interface.provider(interfaces.IPluginFactory)
class OpenSUSEConfigurator(configurator.ApacheConfigurator):
"""OpenSUSE specific ApacheConfigurator override class"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.0.0/certbot_apache/_internal/parser.py
new/certbot-apache-1.1.0/certbot_apache/_internal/parser.py
--- old/certbot-apache-1.0.0/certbot_apache/_internal/parser.py 2019-12-03
18:20:30.000000000 +0100
+++ new/certbot-apache-1.1.0/certbot_apache/_internal/parser.py 2020-01-14
19:41:31.000000000 +0100
@@ -8,11 +8,11 @@
import six
-from acme.magic_typing import Dict, List, Set # pylint:
disable=unused-import, no-name-in-module
-
+from acme.magic_typing import Dict # pylint: disable=unused-import,
no-name-in-module
+from acme.magic_typing import List # pylint: disable=unused-import,
no-name-in-module
+from acme.magic_typing import Set # pylint: disable=unused-import,
no-name-in-module
from certbot import errors
from certbot.compat import os
-
from certbot_apache._internal import constants
logger = logging.getLogger(__name__)
@@ -284,8 +284,8 @@
mods.add(mod_name)
mods.add(os.path.basename(mod_filename)[:-2] + "c")
else:
- logger.debug("Could not read LoadModule directive from " +
- "Augeas path: %s", match_name[6:])
+ logger.debug("Could not read LoadModule directive from
Augeas path: %s",
+ match_name[6:])
self.modules.update(mods)
def update_runtime_variables(self):
@@ -625,7 +625,7 @@
# https://httpd.apache.org/docs/2.4/mod/core.html#include
for match in matches:
dir_ = self.aug.get(match).lower()
- if dir_ == "include" or dir_ == "includeoptional":
+ if dir_ in ("include", "includeoptional"):
ordered_matches.extend(self.find_dir(
directive, arg,
self._get_include_path(self.get_arg(match + "/arg")),
@@ -665,8 +665,7 @@
# e.g. strip now, not later
if not value:
return None
- else:
- value = value.strip("'\"")
+ value = value.strip("'\"")
variables = ApacheParser.arg_var_interpreter.findall(value)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.0.0/certbot_apache.egg-info/PKG-INFO
new/certbot-apache-1.1.0/certbot_apache.egg-info/PKG-INFO
--- old/certbot-apache-1.0.0/certbot_apache.egg-info/PKG-INFO 2019-12-03
18:20:44.000000000 +0100
+++ new/certbot-apache-1.1.0/certbot_apache.egg-info/PKG-INFO 2020-01-14
19:41:46.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: certbot-apache
-Version: 1.0.0
+Version: 1.1.0
Summary: Apache plugin for Certbot
Home-page: https://github.com/letsencrypt/letsencrypt
Author: Certbot Project
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.0.0/certbot_apache.egg-info/requires.txt
new/certbot-apache-1.1.0/certbot_apache.egg-info/requires.txt
--- old/certbot-apache-1.0.0/certbot_apache.egg-info/requires.txt
2019-12-03 18:20:44.000000000 +0100
+++ new/certbot-apache-1.1.0/certbot_apache.egg-info/requires.txt
2020-01-14 19:41:46.000000000 +0100
@@ -1,5 +1,5 @@
acme>=0.29.0
-certbot>=0.39.0
+certbot>=1.0.0
mock
python-augeas
setuptools
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.0.0/setup.py
new/certbot-apache-1.1.0/setup.py
--- old/certbot-apache-1.0.0/setup.py 2019-12-03 18:20:32.000000000 +0100
+++ new/certbot-apache-1.1.0/setup.py 2020-01-14 19:41:33.000000000 +0100
@@ -1,16 +1,16 @@
-from setuptools import setup
-from setuptools import find_packages
-from setuptools.command.test import test as TestCommand
import sys
+from setuptools import find_packages
+from setuptools import setup
+from setuptools.command.test import test as TestCommand
-version = '1.0.0'
+version = '1.1.0'
# Remember to update local-oldest-requirements.txt when changing the minimum
# acme/certbot version.
install_requires = [
'acme>=0.29.0',
- 'certbot>=0.39.0',
+ 'certbot>=1.0.0',
'mock',
'python-augeas',
'setuptools',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.0.0/tests/autohsts_test.py
new/certbot-apache-1.1.0/tests/autohsts_test.py
--- old/certbot-apache-1.0.0/tests/autohsts_test.py 2019-12-03
18:20:30.000000000 +0100
+++ new/certbot-apache-1.1.0/tests/autohsts_test.py 2020-01-14
19:41:31.000000000 +0100
@@ -2,13 +2,12 @@
"""Test for certbot_apache._internal.configurator AutoHSTS functionality"""
import re
import unittest
+
import mock
-# six is used in mock.patch()
-import six # pylint: disable=unused-import
+import six # pylint: disable=unused-import # six is used in mock.patch()
from certbot import errors
from certbot_apache._internal import constants
-
import util
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.0.0/tests/centos6_test.py
new/certbot-apache-1.1.0/tests/centos6_test.py
--- old/certbot-apache-1.0.0/tests/centos6_test.py 2019-12-03
18:20:30.000000000 +0100
+++ new/certbot-apache-1.1.0/tests/centos6_test.py 2020-01-14
19:41:31.000000000 +0100
@@ -3,11 +3,9 @@
from certbot.compat import os
from certbot.errors import MisconfigurationError
-
from certbot_apache._internal import obj
from certbot_apache._internal import override_centos
from certbot_apache._internal import parser
-
import util
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.0.0/tests/centos_test.py
new/certbot-apache-1.1.0/tests/centos_test.py
--- old/certbot-apache-1.0.0/tests/centos_test.py 2019-12-03
18:20:30.000000000 +0100
+++ new/certbot-apache-1.1.0/tests/centos_test.py 2020-01-14
19:41:31.000000000 +0100
@@ -6,10 +6,8 @@
from certbot import errors
from certbot.compat import filesystem
from certbot.compat import os
-
from certbot_apache._internal import obj
from certbot_apache._internal import override_centos
-
import util
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.0.0/tests/complex_parsing_test.py
new/certbot-apache-1.1.0/tests/complex_parsing_test.py
--- old/certbot-apache-1.0.0/tests/complex_parsing_test.py 2019-12-03
18:20:30.000000000 +0100
+++ new/certbot-apache-1.1.0/tests/complex_parsing_test.py 2020-01-14
19:41:31.000000000 +0100
@@ -4,7 +4,6 @@
from certbot import errors
from certbot.compat import os
-
import util
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.0.0/tests/configurator_reverter_test.py
new/certbot-apache-1.1.0/tests/configurator_reverter_test.py
--- old/certbot-apache-1.0.0/tests/configurator_reverter_test.py
2019-12-03 18:20:30.000000000 +0100
+++ new/certbot-apache-1.1.0/tests/configurator_reverter_test.py
2020-01-14 19:41:31.000000000 +0100
@@ -5,7 +5,6 @@
import mock
from certbot import errors
-
import util
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.0.0/tests/configurator_test.py
new/certbot-apache-1.1.0/tests/configurator_test.py
--- old/certbot-apache-1.0.0/tests/configurator_test.py 2019-12-03
18:20:30.000000000 +0100
+++ new/certbot-apache-1.1.0/tests/configurator_test.py 2020-01-14
19:41:31.000000000 +0100
@@ -7,24 +7,20 @@
import unittest
import mock
-# six is used in mock.patch()
-import six # pylint: disable=unused-import
+import six # pylint: disable=unused-import # six is used in mock.patch()
from acme import challenges
-
from certbot import achallenges
from certbot import crypto_util
from certbot import errors
-from certbot.compat import os
from certbot.compat import filesystem
+from certbot.compat import os
from certbot.tests import acme_util
from certbot.tests import util as certbot_util
-
from certbot_apache._internal import apache_util
from certbot_apache._internal import constants
from certbot_apache._internal import obj
from certbot_apache._internal import parser
-
import util
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.0.0/tests/debian_test.py
new/certbot-apache-1.1.0/tests/debian_test.py
--- old/certbot-apache-1.0.0/tests/debian_test.py 2019-12-03
18:20:30.000000000 +0100
+++ new/certbot-apache-1.1.0/tests/debian_test.py 2020-01-14
19:41:31.000000000 +0100
@@ -6,10 +6,8 @@
from certbot import errors
from certbot.compat import os
-
from certbot_apache._internal import apache_util
from certbot_apache._internal import obj
-
import util
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.0.0/tests/display_ops_test.py
new/certbot-apache-1.1.0/tests/display_ops_test.py
--- old/certbot-apache-1.0.0/tests/display_ops_test.py 2019-12-03
18:20:30.000000000 +0100
+++ new/certbot-apache-1.1.0/tests/display_ops_test.py 2020-01-14
19:41:31.000000000 +0100
@@ -4,15 +4,10 @@
import mock
from certbot import errors
-
from certbot.display import util as display_util
-
from certbot.tests import util as certbot_util
-
from certbot_apache._internal import obj
-
from certbot_apache._internal.display_ops import select_vhost_multiple
-
import util
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.0.0/tests/fedora_test.py
new/certbot-apache-1.1.0/tests/fedora_test.py
--- old/certbot-apache-1.0.0/tests/fedora_test.py 2019-12-03
18:20:30.000000000 +0100
+++ new/certbot-apache-1.1.0/tests/fedora_test.py 2020-01-14
19:41:31.000000000 +0100
@@ -6,10 +6,8 @@
from certbot import errors
from certbot.compat import filesystem
from certbot.compat import os
-
from certbot_apache._internal import obj
from certbot_apache._internal import override_fedora
-
import util
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.0.0/tests/gentoo_test.py
new/certbot-apache-1.1.0/tests/gentoo_test.py
--- old/certbot-apache-1.0.0/tests/gentoo_test.py 2019-12-03
18:20:30.000000000 +0100
+++ new/certbot-apache-1.1.0/tests/gentoo_test.py 2020-01-14
19:41:31.000000000 +0100
@@ -6,10 +6,8 @@
from certbot import errors
from certbot.compat import filesystem
from certbot.compat import os
-
from certbot_apache._internal import obj
from certbot_apache._internal import override_gentoo
-
import util
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.0.0/tests/http_01_test.py
new/certbot-apache-1.1.0/tests/http_01_test.py
--- old/certbot-apache-1.0.0/tests/http_01_test.py 2019-12-03
18:20:30.000000000 +0100
+++ new/certbot-apache-1.1.0/tests/http_01_test.py 2020-01-14
19:41:31.000000000 +0100
@@ -1,21 +1,18 @@
"""Test for certbot_apache._internal.http_01."""
import unittest
+
import mock
from acme import challenges
from acme.magic_typing import List # pylint: disable=unused-import,
no-name-in-module
-
from certbot import achallenges
from certbot import errors
from certbot.compat import filesystem
from certbot.compat import os
from certbot.tests import acme_util
-
from certbot_apache._internal.parser import get_aug_path
-
import util
-
NUM_ACHALLS = 3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.0.0/tests/parser_test.py
new/certbot-apache-1.1.0/tests/parser_test.py
--- old/certbot-apache-1.0.0/tests/parser_test.py 2019-12-03
18:20:30.000000000 +0100
+++ new/certbot-apache-1.1.0/tests/parser_test.py 2020-01-14
19:41:31.000000000 +0100
@@ -6,7 +6,6 @@
from certbot import errors
from certbot.compat import os
-
import util
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.0.0/tests/util.py
new/certbot-apache-1.1.0/tests/util.py
--- old/certbot-apache-1.0.0/tests/util.py 2019-12-03 18:20:30.000000000
+0100
+++ new/certbot-apache-1.1.0/tests/util.py 2020-01-14 19:41:31.000000000
+0100
@@ -12,7 +12,6 @@
from certbot.display import util as display_util
from certbot.plugins import common
from certbot.tests import util as test_util
-
from certbot_apache._internal import configurator
from certbot_apache._internal import entrypoint
from certbot_apache._internal import obj
