From 8c313449f9028716e13039e6e47d322fab5d4cdf Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Mon, 15 May 2017 15:01:54 -0700
Subject: [PATCH] Make 42d07d7 more closely follow repo conventions

(cherry picked from commit d467295d2a3f71148c4c04ace5212b4697f30168)
---
 certbot/tests/util_test.py | 36 +++++++++++++++++++++---------------
 certbot/util.py            |  5 +++--
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/certbot/tests/util_test.py b/certbot/tests/util_test.py
index 60b3089bb..3d51a1d96 100644
--- a/certbot/tests/util_test.py
+++ b/certbot/tests/util_test.py
@@ -6,7 +6,6 @@ import shutil
 import stat
 import unittest
 
-import configargparse
 import mock
 import six
 from six.moves import reload_module  # pylint: disable=import-error
@@ -369,21 +368,28 @@ class AddDeprecatedArgumentTest(unittest.TestCase):
                 pass
         self.assertTrue("--old-option" not in stdout.getvalue())
 
-    def test_when_configargparse_set(self):
-        '''In configargparse versions < 0.12.0 ACTION_TYPES_THAT_DONT_NEED_A_VALUE is a set.'''
-        orig = configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE
-        configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE = set()
-        self._call("--old-option", 1)
-        self.assertEqual(len(configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE), 1)
-        configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE = orig
+    def test_set_constant(self):
+        """Test when ACTION_TYPES_THAT_DONT_NEED_A_VALUE is a set.
 
-    def test_when_configargparse_tuple(self):
-        '''In configargparse versions >= 0.12.0 ACTION_TYPES_THAT_DONT_NEED_A_VALUE is a tuple.'''
-        orig = configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE
-        configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE = tuple()
-        self._call("--old-option", 1)
-        self.assertEqual(len(configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE), 1)
-        configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE = orig
+        This variable is a set in configargparse versions < 0.12.0.
+
+        """
+        self._test_constant_common(set)
+
+    def test_tuple_constant(self):
+        """Test when ACTION_TYPES_THAT_DONT_NEED_A_VALUE is a tuple.
+
+        This variable is a tuple in configargparse versions >= 0.12.0.
+
+        """
+        self._test_constant_common(tuple)
+
+    def _test_constant_common(self, typ):
+        with mock.patch("certbot.util.configargparse") as mock_configargparse:
+            mock_configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE = typ()
+            self._call("--old-option", 1)
+        self.assertEqual(
+            len(mock_configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE), 1)
 
 
 class EnforceLeValidity(unittest.TestCase):
diff --git a/certbot/util.py b/certbot/util.py
index d362b447a..43e402883 100644
--- a/certbot/util.py
+++ b/certbot/util.py
@@ -476,9 +476,10 @@ def add_deprecated_argument(add_argument, argument_name, nargs):
             sys.stderr.write(
                 "Use of {0} is deprecated.\n".format(option_string))
 
-    # In version 0.12.0 ACTION_TYPES_THAT_DONT_NEED_A_VALUE was changed from a set
-    # to a tuple.
+    # In version 0.12.0 ACTION_TYPES_THAT_DONT_NEED_A_VALUE was changed from a
+    # set to a tuple.
     if isinstance(configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE, set):
+        # pylint: disable=no-member
         configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE.add(ShowWarning)
     else:
         configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE += (ShowWarning,)