From 9f57236bb124314a1c9f773e0fc0bc7bd3ed4830 Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Thu, 4 Feb 2016 19:14:36 -0800
Subject: [PATCH] Try things the EvenMoreProper way

---
 letsencrypt/cli.py           | 8 +-------
 letsencrypt/configuration.py | 7 +++++++
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/letsencrypt/cli.py b/letsencrypt/cli.py
index 471f4a2fd..fd568afa2 100644
--- a/letsencrypt/cli.py
+++ b/letsencrypt/cli.py
@@ -864,12 +864,6 @@ def _renewal_conf_files(config):
     """Return /path/to/*.conf in the renewal conf directory"""
     return glob.glob(os.path.join(config.renewal_configs_dir, "*.conf"))
 
-def _copy_nsconfig(config):
-    # Work around https://bugs.python.org/issue1515 for py26 tests :( :(
-    # https://travis-ci.org/letsencrypt/letsencrypt/jobs/106900743#L3276
-    ns = copy.deepcopy(config.namespace)
-    new_config = configuration.NamespaceConfig(ns)
-    return new_config
 
 def renew(config, unused_plugins):
     """Renew previously-obtained certificates."""
@@ -893,7 +887,7 @@ def renew(config, unused_plugins):
         print("Processing " + renewal_file)
         # XXX: does this succeed in making a fully independent config object
         #      each time?
-        lineage_config = _copy_nsconfig(config)
+        lineage_config = copy.deepcopy(config)
 
         # Note that this modifies config (to add back the configuration
         # elements from within the renewal configuration file).
diff --git a/letsencrypt/configuration.py b/letsencrypt/configuration.py
index 37eaba3bd..2bbf1b019 100644
--- a/letsencrypt/configuration.py
+++ b/letsencrypt/configuration.py
@@ -1,4 +1,5 @@
 """Let's Encrypt user-supplied configuration."""
+import copy
 import os
 import urlparse
 
@@ -78,6 +79,12 @@ class NamespaceConfig(object):
         return os.path.join(
             self.namespace.work_dir, constants.TEMP_CHECKPOINT_DIR)
 
+    def __deepcopy__(self, _memo):
+        # Work around https://bugs.python.org/issue1515 for py26 tests :( :(
+        # https://travis-ci.org/letsencrypt/letsencrypt/jobs/106900743#L3276
+        new_ns = copy.deepcopy(self.namespace)
+        return type(self)(new_ns)
+
 
 class RenewerConfiguration(object):
     """Configuration wrapper for renewer."""