From 1001b027cb47096a2fc7a78ad812679beafafd3d Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Wed, 22 Apr 2015 06:47:27 +0000
Subject: [PATCH] ConfArgParse -> ConfigArgParse

ConfArgParse + subparsers = config scoped only to subcommand
ConfArgParse doesn't seem to respect formatter_class (no defaults)

ConfigArgParse works with ENV variables

https://github.com/bw2/ConfigArgParse#design-notes
---
 letsencrypt/client/cli.py | 7 +++++--
 setup.py                  | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/letsencrypt/client/cli.py b/letsencrypt/client/cli.py
index 47bd9189a..d3465469e 100644
--- a/letsencrypt/client/cli.py
+++ b/letsencrypt/client/cli.py
@@ -6,7 +6,7 @@ import logging
 import pkg_resources
 import sys
 
-import confargparse
+import configargparse
 import zope.component
 import zope.interface.exceptions
 import zope.interface.verify
@@ -213,7 +213,10 @@ def read_file(filename):
 
 def create_parser():
     """Create parser."""
-    parser = confargparse.ConfArgParser(description=__doc__)
+    parser = configargparse.ArgParser(
+        description=__doc__,
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter,
+        args_for_setting_config_path=["-c", "--config"])
 
     # --help is automatically provided by argparse
     parser.add_argument(
diff --git a/setup.py b/setup.py
index 2f9e85526..6e0ce0aa6 100644
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@ changes = read_file(os.path.join(here, 'CHANGES.rst'))
 
 install_requires = [
     'argparse',
-    'ConfArgParse',
+    'ConfigArgParse',
     'jsonschema',
     'mock',
     'ndg-httpsclient',  # urllib3 InsecurePlatformWarning (#304)