--- certbot/tests/util_test.py.orig	2017-05-16 07:27:15 UTC

+++ certbot/tests/util_test.py

@@ -5,6 +5,7 @@ import os

 import stat

 import unittest

+import configargparse

 import mock

 import six

@@ -333,6 +334,22 @@ class AddDeprecatedArgumentTest(unittest

                 pass

         self.assertTrue("--old-option" not in stdout.getvalue())

+    def test_when_configargparse(self):

+        '''In configargparse version < 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_when_configargparse_tuple(self):

+        '''In configargparse version >= 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

+

 class EnforceLeValidity(unittest.TestCase):

     """Test enforce_le_validity."""

--- certbot/util.py.orig	2017-05-16 07:21:46 UTC

+++ certbot/util.py

@@ -437,7 +437,12 @@ def add_deprecated_argument(add_argument

             sys.stderr.write(

                 "Use of {0} is deprecated.\n".format(option_string))

-    configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE.add(ShowWarning)

+    # 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):

+        configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE.add(ShowWarning)

+    else:

+        configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE += (ShowWarning,)

     add_argument(argument_name, action=ShowWarning,

                  help=argparse.SUPPRESS, nargs=nargs)