From b6eafe63b52d575ab879ab6b05e1e0104d0ea305 Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Mon, 17 Aug 2015 19:50:36 +0000 Subject: [PATCH] Normalize plugins.common.dest_namespace (fixes #689). --- letsencrypt/plugins/common.py | 2 +- letsencrypt/plugins/common_test.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/letsencrypt/plugins/common.py b/letsencrypt/plugins/common.py index 39956fc90..bef8b4d81 100644 --- a/letsencrypt/plugins/common.py +++ b/letsencrypt/plugins/common.py @@ -20,7 +20,7 @@ def option_namespace(name): def dest_namespace(name): """ArgumentParser dest namespace (prefix of all destinations).""" - return name + "_" + return name.replace("-", "_") + "_" private_ips_regex = re.compile( # pylint: disable=invalid-name r"(^127\.0\.0\.1)|(^10\.)|(^172\.1[6-9]\.)|" diff --git a/letsencrypt/plugins/common_test.py b/letsencrypt/plugins/common_test.py index 16d653631..fa761839c 100644 --- a/letsencrypt/plugins/common_test.py +++ b/letsencrypt/plugins/common_test.py @@ -23,6 +23,10 @@ class NamespaceFunctionsTest(unittest.TestCase): from letsencrypt.plugins.common import dest_namespace self.assertEqual("foo_", dest_namespace("foo")) + def test_dest_namespace_with_dashes(self): + from letsencrypt.plugins.common import dest_namespace + self.assertEqual("foo_bar_", dest_namespace("foo-bar")) + class PluginTest(unittest.TestCase): """Test for letsencrypt.plugins.common.Plugin."""