aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/platform
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-12-05 15:55:43 +1300
committerAldo Cortesi <aldo@nullcube.com>2016-12-08 10:21:06 +1300
commitd742d4fb8c8d601c19f7aa5ff746a4167d864f7e (patch)
tree7cac08c95870f5ef9f1263d77cc4d80736b1bdaf /mitmproxy/platform
parent6aacd27ab26e6831ad6f9cfe0b1f555617321a25 (diff)
downloadmitmproxy-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/platform')
-rw-r--r--mitmproxy/platform/windows.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/mitmproxy/platform/windows.py b/mitmproxy/platform/windows.py
index a59fe25f..1c90a7a0 100644
--- a/mitmproxy/platform/windows.py
+++ b/mitmproxy/platform/windows.py
@@ -7,7 +7,7 @@ import struct
import threading
import time
-import configargparse
+import argparse
import pydivert
import pydivert.consts
import pickle
@@ -386,8 +386,9 @@ class TransparentProxy:
if __name__ == "__main__":
- parser = configargparse.ArgumentParser(
- description="Windows Transparent Proxy")
+ parser = argparse.ArgumentParser(
+ description="Windows Transparent Proxy"
+ )
parser.add_argument(
'--mode',
choices=[