Merge pull request #3301 from scop/deprecated

Deprecation fixes

acme/acme/fields.py

@@ -24,7 +24,7 @@ class Fixed(jose.Field):
 
     def encode(self, value):
         if value != self.value:
-            logger.warn(
+            logger.warning(
                 'Overriding fixed field (%s) with %r', self.json_name, value)
         return value
 

certbot-apache/certbot_apache/configurator.py

@@ -244,7 +244,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
 
         if not path["cert_path"] or not path["cert_key"]:
             # Throw some can't find all of the directives error"
-            logger.warn(
+            logger.warning(
                 "Cannot find a cert or key directive in %s. "
                 "VirtualHost was not modified", vhost.path)
             # Presumably break here so that the virtualhost is not modified
@@ -522,7 +522,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
         try:
             args = self.aug.match(path + "/arg")
         except RuntimeError:
-            logger.warn("Encountered a problem while parsing file: %s, skipping", path)
+            logger.warning("Encountered a problem while parsing file: %s, skipping", path)
             return None
         for arg in args:
             addrs.add(obj.Addr.fromstring(self.parser.get_arg(arg)))
@@ -1089,7 +1089,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
         try:
             func(self.choose_vhost(domain), options)
         except errors.PluginError:
-            logger.warn("Failed %s for %s", enhancement, domain)
+            logger.warning("Failed %s for %s", enhancement, domain)
             raise
 
     def _enable_ocsp_stapling(self, ssl_vhost, unused_options):
@@ -1276,9 +1276,9 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
             # but redirect loops are possible in very obscure cases; see #1620
             # for reasoning.
             if self._is_rewrite_exists(general_vh):
-                logger.warn("Added an HTTP->HTTPS rewrite in addition to "
-                            "other RewriteRules; you may wish to check for "
-                            "overall consistency.")
+                logger.warning("Added an HTTP->HTTPS rewrite in addition to "
+                               "other RewriteRules; you may wish to check for "
+                               "overall consistency.")
 
             # Add directives to server
             # Note: These are not immediately searchable in sites-enabled

certbot-apache/certbot_apache/display_ops.py

@@ -91,7 +91,7 @@ def _vhost_menu(domain, vhosts):
                "non-interactive mode. Currently Certbot needs each vhost to be "
                "in its own conf file, and may need vhosts to be explicitly "
                "labelled with ServerName or ServerAlias directories.")
-        logger.warn(msg)
+        logger.warning(msg)
         raise errors.MissingCommandlineFlag(msg)
 
     return code, tag

certbot-apache/certbot_apache/parser.py

@@ -146,7 +146,7 @@ class ApacheParser(object):
                 constants.os_constant("define_cmd"))
         # Small errors that do not impede
         if proc.returncode != 0:
-            logger.warn("Error in checking parameter list: %s", stderr)
+            logger.warning("Error in checking parameter list: %s", stderr)
             raise errors.MisconfigurationError(
                 "Apache is unable to check whether or not the module is "
                 "loaded because Apache is misconfigured.")

certbot-apache/certbot_apache/tests/configurator_test.py

@@ -56,7 +56,7 @@ class MultipleVhostsTest(util.ApacheTest):
         mock_surgery.return_value = False
         with mock.patch.dict('os.environ', silly_path):
             self.assertRaises(errors.NoInstallationError, self.config.prepare)
-            self.assertEquals(mock_surgery.call_count, 1)
+            self.assertEqual(mock_surgery.call_count, 1)
 
     @mock.patch("certbot_apache.augeas_configurator.AugeasConfigurator.init_augeas")
     def test_prepare_no_augeas(self, mock_init_augeas):
@@ -1242,8 +1242,8 @@ class MultipleVhostsTest(util.ApacheTest):
         mock_match = mock.Mock(return_value=["something"])
         self.config.aug.match = mock_match
         # pylint: disable=protected-access
-        self.assertEquals(self.config._check_aug_version(),
-                          ["something"])
+        self.assertEqual(self.config._check_aug_version(),
+                         ["something"])
         self.config.aug.match.side_effect = RuntimeError
         self.assertFalse(self.config._check_aug_version())
 

certbot-apache/certbot_apache/tls_sni_01.py

@@ -129,7 +129,7 @@ class ApacheTlsSni01(common.TLSSNI01):
             # because it's a new vhost that's not configured yet (GH #677),
             # or perhaps because there were multiple <VirtualHost> sections
             # in the config file (GH #1042).  See also GH #2600.
-            logger.warn("Falling back to default vhost %s...", default_addr)
+            logger.warning("Falling back to default vhost %s...", default_addr)
             addrs.add(default_addr)
             return addrs
 

certbot-compatibility-test/certbot_compatibility_test/test_driver.py

@@ -369,10 +369,10 @@ def main():
         plugin.cleanup_from_tests()
 
     if overall_success:
-        logger.warn("All compatibility tests succeeded")
+        logger.warning("All compatibility tests succeeded")
         sys.exit(0)
     else:
-        logger.warn("One or more compatibility tests failed")
+        logger.warning("One or more compatibility tests failed")
         sys.exit(1)
 
 

certbot-nginx/certbot_nginx/configurator.py

@@ -179,7 +179,7 @@ class NginxConfigurator(common.Plugin):
                         vhost.filep, vhost.names)
         except errors.MisconfigurationError as error:
             logger.debug(error)
-            logger.warn(
+            logger.warning(
                 "Cannot find a cert or key directive in %s for %s. "
                 "VirtualHost was not modified.", vhost.filep, vhost.names)
             # Presumably break here so that the virtualhost is not modified
@@ -385,7 +385,7 @@ class NginxConfigurator(common.Plugin):
             raise errors.PluginError(
                 "Unsupported enhancement: {0}".format(enhancement))
         except errors.PluginError:
-            logger.warn("Failed %s for %s", enhancement, domain)
+            logger.warning("Failed %s for %s", enhancement, domain)
 
     def _enable_redirect(self, vhost, unused_options):
         """Redirect all equivalent HTTP traffic to ssl_vhost.

certbot-nginx/certbot_nginx/parser.py

@@ -168,7 +168,7 @@ class NginxParser(object):
                     self.parsed[item] = parsed
                     trees.append(parsed)
             except IOError:
-                logger.warn("Could not open file: %s", item)
+                logger.warning("Could not open file: %s", item)
             except pyparsing.ParseException:
                 logger.debug("Could not parse file: %s", item)
         return trees

certbot-nginx/certbot_nginx/tests/configurator_test.py

@@ -37,8 +37,8 @@ class NginxConfiguratorTest(util.NginxTest):
             errors.NoInstallationError, self.config.prepare)
 
     def test_prepare(self):
-        self.assertEquals((1, 6, 2), self.config.version)
-        self.assertEquals(5, len(self.config.parser.parsed))
+        self.assertEqual((1, 6, 2), self.config.version)
+        self.assertEqual(5, len(self.config.parser.parsed))
 
     @mock.patch("certbot_nginx.configurator.util.exe_exists")
     @mock.patch("certbot_nginx.configurator.subprocess.Popen")
@@ -56,7 +56,7 @@ class NginxConfiguratorTest(util.NginxTest):
         self.config.version = None
         self.config.config_test = mock.Mock()
         self.config.prepare()
-        self.assertEquals((1, 6, 2), self.config.version)
+        self.assertEqual((1, 6, 2), self.config.version)
 
     @mock.patch("certbot_nginx.configurator.socket.gethostbyaddr")
     def test_get_all_names(self, mock_gethostbyaddr):

certbot-nginx/certbot_nginx/tests/nginxparser_test.py

@@ -134,8 +134,8 @@ class TestRawNginxParser(unittest.TestCase):
             parsed_new = load(handle)
         try:
             self.maxDiff = None
-            self.assertEquals(parsed[0], parsed_new[0])
-            self.assertEquals(parsed[1:], parsed_new[1:])
+            self.assertEqual(parsed[0], parsed_new[0])
+            self.assertEqual(parsed[1:], parsed_new[1:])
         finally:
             os.unlink(util.get_data_filename('nginx.new.conf'))
 
@@ -150,7 +150,7 @@ class TestRawNginxParser(unittest.TestCase):
             parsed_new = load(handle)
 
         try:
-            self.assertEquals(parsed, parsed_new)
+            self.assertEqual(parsed, parsed_new)
 
             self.assertEqual(parsed_new, [
                 ['#', " Use bar.conf when it's a full moon!"],

certbot-nginx/certbot_nginx/tests/parser_test.py

@@ -117,9 +117,9 @@ class NginxParserTest(util.NginxTest):
         fooconf = [x for x in vhosts if 'foo.conf' in x.filep][0]
         self.assertEqual(vhost5, fooconf)
         localhost = [x for x in vhosts if 'localhost' in x.names][0]
-        self.assertEquals(vhost1, localhost)
+        self.assertEqual(vhost1, localhost)
         somename = [x for x in vhosts if 'somename' in x.names][0]
-        self.assertEquals(vhost2, somename)
+        self.assertEqual(vhost2, somename)
 
     def test_add_server_directives(self):
         nparser = parser.NginxParser(self.config_path, self.ssl_options)

certbot/cli.py

@@ -158,7 +158,7 @@ def possible_deprecation_warning(config):
         # need warnings
         return
     if "CERTBOT_AUTO" not in os.environ:
-        logger.warn("You are running with an old copy of letsencrypt-auto that does "
+        logger.warning("You are running with an old copy of letsencrypt-auto that does "
             "not receive updates, and is less reliable than more recent versions. "
             "We recommend upgrading to the latest certbot-auto script, or using native "
             "OS packages.")

certbot/client.py

@@ -104,10 +104,10 @@ def register(config, account_storage, tos_cb=None):
         if not config.register_unsafely_without_email:
             msg = ("No email was provided and "
                    "--register-unsafely-without-email was not present.")
-            logger.warn(msg)
+            logger.warning(msg)
             raise errors.Error(msg)
         if not config.dry_run:
-            logger.warn("Registering without email!")
+            logger.warning("Registering without email!")
 
     # Each new registration shall use a fresh new key
     key = jose.JWKRSA(key=jose.ComparableRSAKey(
@@ -453,10 +453,10 @@ class Client(object):
                 try:
                     self.installer.enhance(dom, enhancement, options)
                 except errors.PluginEnhancementAlreadyPresent:
-                    logger.warn("Enhancement %s was already set.",
+                    logger.warning("Enhancement %s was already set.",
                             enhancement)
                 except errors.PluginError:
-                    logger.warn("Unable to set enhancement %s for %s",
+                    logger.warning("Unable to set enhancement %s for %s",
                             enhancement, dom)
                     raise
 

certbot/hooks.py

@@ -53,7 +53,7 @@ def post_hook(config, final=False):
         if not pre_hook.already:
             logger.info("No renewals attempted, so not running post-hook")
             if config.verb != "renew":
-                logger.warn("Sanity failure in renewal hooks")
+                logger.warning("Sanity failure in renewal hooks")
             return
         if final or config.verb != "renew":
             logger.info("Running post-hook command: %s", config.post_hook)

certbot/main.py

@@ -773,5 +773,5 @@ def main(cli_args=sys.argv[1:]):
 if __name__ == "__main__":
     err_string = main()
     if err_string:
-        logger.warn("Exiting with message %s", err_string)
+        logger.warning("Exiting with message %s", err_string)
     sys.exit(err_string)  # pragma: no cover

certbot/plugins/selection.py

@@ -174,7 +174,7 @@ def choose_configurator_plugins(config, plugins, verb):
     if verb == "install":
         need_inst = True
         if config.authenticator:
-            logger.warn("Specifying an authenticator doesn't make sense in install mode")
+            logger.warning("Specifying an authenticator doesn't make sense in install mode")
 
     # Try to meet the user's request and/or ask them to pick plugins
     authenticator = installer = None

certbot/plugins/util.py

@@ -38,7 +38,7 @@ def path_surgery(restart_cmd):
         return True
     else:
         expanded = " expanded" if any(added) else ""
-        logger.warn("Failed to find %s in%s PATH: %s", restart_cmd, expanded, path)
+        logger.warning("Failed to find %s in%s PATH: %s", restart_cmd, expanded, path)
         return False
 
 def already_listening(port, renewer=False):

certbot/plugins/util_test.py

@@ -8,7 +8,7 @@ import psutil
 class PathSurgeryTest(unittest.TestCase):
     """Tests for certbot.plugins.path_surgery."""
 
-    @mock.patch("certbot.plugins.util.logger.warn")
+    @mock.patch("certbot.plugins.util.logger.warning")
     @mock.patch("certbot.plugins.util.logger.debug")
     def test_path_surgery(self, mock_debug, mock_warn):
         from certbot.plugins.util import path_surgery
@@ -16,15 +16,15 @@ class PathSurgeryTest(unittest.TestCase):
         with mock.patch.dict('os.environ', all_path):
             with mock.patch('certbot.util.exe_exists') as mock_exists:
                 mock_exists.return_value = True
-                self.assertEquals(path_surgery("eg"), True)
-                self.assertEquals(mock_debug.call_count, 0)
-                self.assertEquals(mock_warn.call_count, 0)
-                self.assertEquals(os.environ["PATH"], all_path["PATH"])
+                self.assertEqual(path_surgery("eg"), True)
+                self.assertEqual(mock_debug.call_count, 0)
+                self.assertEqual(mock_warn.call_count, 0)
+                self.assertEqual(os.environ["PATH"], all_path["PATH"])
         no_path = {"PATH": "/tmp/"}
         with mock.patch.dict('os.environ', no_path):
             path_surgery("thingy")
-            self.assertEquals(mock_debug.call_count, 1)
-            self.assertEquals(mock_warn.call_count, 1)
+            self.assertEqual(mock_debug.call_count, 1)
+            self.assertEqual(mock_warn.call_count, 1)
             self.assertTrue("Failed to find" in mock_warn.call_args[0][0])
             self.assertTrue("/usr/local/bin" in os.environ["PATH"])
             self.assertTrue("/tmp" in os.environ["PATH"])

certbot/reverter.py

@@ -552,7 +552,7 @@ class Reverter(object):
         others.sort()
         if others[-1] != timestamp:
             timetravel = str(float(others[-1]) + 1)
-            logger.warn("Current timestamp %s does not correspond to newest reverter "
+            logger.warning("Current timestamp %s does not correspond to newest reverter "
                 "checkpoint; your clock probably jumped. Time travelling to %s",
                 timestamp, timetravel)
             timestamp = timetravel

certbot/tests/client_test.py

@@ -82,7 +82,7 @@ class RegisterTest(unittest.TestCase):
                 self.config.register_unsafely_without_email = True
                 self.config.dry_run = False
                 self._call()
-                mock_logger.warn.assert_called_once_with(mock.ANY)
+                mock_logger.warning.assert_called_once_with(mock.ANY)
 
     def test_unsupported_error(self):
         from acme import messages

certbot/tests/reverter_test.py

@@ -362,8 +362,8 @@ class TestFullCheckpointsReverter(unittest.TestCase):
         self.assertEqual(mock_logger.warning.call_count, 1)
 
         # Test Generic warning
-        mock_logger.warning.call_count = 0
         self._setup_three_checkpoints()
+        mock_logger.warning.call_count = 0
         self.reverter.rollback_checkpoints(4)
         self.assertEqual(mock_logger.warning.call_count, 1)
 

certbot/util.py

@@ -349,7 +349,7 @@ def safe_email(email):
     if EMAIL_REGEX.match(email) is not None:
         return not email.startswith(".") and ".." not in email
     else:
-        logger.warn("Invalid email address: %s.", email)
+        logger.warning("Invalid email address: %s.", email)
         return False