diff options
| author | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2017-05-20 20:44:12 +0000 |
|---|---|---|
| committer | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2017-05-20 20:44:12 +0000 |
| commit | ab14924944d3f6180e10103237164f3f4915d425 (patch) | |
| tree | a6e4d006c6f4c346ece7fb810a3285617a55b763 | |
| parent | 9fcc0361c84d3b41814c14b8e48a9261410774c2 (diff) | |
| download | ports-ab14924944d3f6180e10103237164f3f4915d425.tar.gz ports-ab14924944d3f6180e10103237164f3f4915d425.zip | |
Notes
| -rw-r--r-- | security/py-certbot/Makefile | 2 | ||||
| -rw-r--r-- | security/py-certbot/files/patch-certbot_tests_util__test.py | 40 | ||||
| -rw-r--r-- | security/py-certbot/files/patch-certbot_util.py | 23 |
3 files changed, 64 insertions, 1 deletions
diff --git a/security/py-certbot/Makefile b/security/py-certbot/Makefile index f9b4c2ed04c5..91a0c84f4409 100644 --- a/security/py-certbot/Makefile +++ b/security/py-certbot/Makefile @@ -3,7 +3,7 @@ PORTNAME= certbot PORTVERSION= 0.13.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= security python MASTER_SITES= CHEESESHOP diff --git a/security/py-certbot/files/patch-certbot_tests_util__test.py b/security/py-certbot/files/patch-certbot_tests_util__test.py new file mode 100644 index 000000000000..22f8eb24d77f --- /dev/null +++ b/security/py-certbot/files/patch-certbot_tests_util__test.py @@ -0,0 +1,40 @@ +From 42d07d756df0cf96c9d20b44e772858391d48384 Mon Sep 17 00:00:00 2001 +From: Ryan Pineo <ry@tsl.io> +Date: Fri, 12 May 2017 15:45:54 -0400 +Subject: [PATCH] support version 0.12.0 of configargparse + +fixes #4648 + +--- 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.""" diff --git a/security/py-certbot/files/patch-certbot_util.py b/security/py-certbot/files/patch-certbot_util.py new file mode 100644 index 000000000000..c06f799c43d8 --- /dev/null +++ b/security/py-certbot/files/patch-certbot_util.py @@ -0,0 +1,23 @@ +From 42d07d756df0cf96c9d20b44e772858391d48384 Mon Sep 17 00:00:00 2001 +From: Ryan Pineo <ry@tsl.io> +Date: Fri, 12 May 2017 15:45:54 -0400 +Subject: [PATCH] support version 0.12.0 of configargparse + +fixes #4648 + +--- 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) + |