diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-12-05 15:55:43 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-12-08 10:21:06 +1300 |
| commit | d742d4fb8c8d601c19f7aa5ff746a4167d864f7e (patch) | |
| tree | 7cac08c95870f5ef9f1263d77cc4d80736b1bdaf /mitmproxy/optmanager.py | |
| parent | 6aacd27ab26e6831ad6f9cfe0b1f555617321a25 (diff) | |
| download | mitmproxy-d742d4fb8c8d601c19f7aa5ff746a4167d864f7e.tar.gz mitmproxy-d742d4fb8c8d601c19f7aa5ff746a4167d864f7e.tar.bz2 mitmproxy-d742d4fb8c8d601c19f7aa5ff746a4167d864f7e.zip | |
Replace configargparse with argparse, enable new options loading
This commit ditches configargparse and enables the new config file format. The
default location is ~/.mitmproxy/config.yaml. Unifying all of the various
Options objects will follow in the next patch.
Diffstat (limited to 'mitmproxy/optmanager.py')
| -rw-r--r-- | mitmproxy/optmanager.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mitmproxy/optmanager.py b/mitmproxy/optmanager.py index 2ce3c48b..081836ce 100644 --- a/mitmproxy/optmanager.py +++ b/mitmproxy/optmanager.py @@ -238,6 +238,7 @@ class OptManager(metaclass=_DefaultsMeta): OptionsError. """ for p in paths: + p = os.path.expanduser(p) if os.path.exists(p) and os.path.isfile(p): txt = open(p, "r").read() self.load(txt) |