From 8c174f38b5e59ecf2298abf08a84c52110cc4091 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Mon, 13 Jun 2016 17:00:59 -0700
Subject: [PATCH] Add has_default_value method

---
 certbot/cli.py | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/certbot/cli.py b/certbot/cli.py
index 428227657..3c18c3c98 100644
--- a/certbot/cli.py
+++ b/certbot/cli.py
@@ -217,6 +217,21 @@ def set_by_cli(var):
 set_by_cli.detector = None
 
 
+def has_default_value(option, value):
+    """Does option have the default value?
+
+    If the default value of option is not known, False is returned.
+
+    :param str option: configuration variable being considered
+    :param value: value of the configuration variable named option
+
+    :returns: True if option has the default value, otherwise, False
+    :rtype: bool
+
+    """
+    return option in DEFAULTS and DEFAULTS[option] == value
+
+
 def option_was_set(option, value):
     """Was option set by the user or does it differ from the default?
 
@@ -227,9 +242,7 @@ def option_was_set(option, value):
     :rtype: bool
 
     """
-    return (set_by_cli(option) or
-            option not in DEFAULTS or
-            DEFAULTS[option] != value)
+    return set_by_cli(option) or not has_default_value(option, value)
 
 
 def argparse_type(variable):