aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2019-07-18 03:15:08 +0200
committerGitHub <noreply@github.com>2019-07-18 03:15:08 +0200
commit4bebd3a1bc721c7db154a282319a50df80de9cc4 (patch)
tree9cf4b2d90ae87a7c82fe2aca8f5be13b1198d5b5
parenta0e19336a2c99e062599719a5f8e5bcf8ddf7e7b (diff)
parent2236b52816b53650e0f7204003a1292f724b682a (diff)
downloadmitmproxy-4bebd3a1bc721c7db154a282319a50df80de9cc4.tar.gz
mitmproxy-4bebd3a1bc721c7db154a282319a50df80de9cc4.tar.bz2
mitmproxy-4bebd3a1bc721c7db154a282319a50df80de9cc4.zip
Merge pull request #3587 from mhils/yaml-list
fix sequence option declaration in yaml files
-rw-r--r--mitmproxy/optmanager.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/mitmproxy/optmanager.py b/mitmproxy/optmanager.py
index 06e696c0..6e187b0d 100644
--- a/mitmproxy/optmanager.py
+++ b/mitmproxy/optmanager.py
@@ -320,7 +320,9 @@ class OptManager:
update = {}
for optname, optval in self.deferred.items():
if optname in self._options:
- update[optname] = self.parse_setval(self._options[optname], optval)
+ if isinstance(optval, str):
+ optval = self.parse_setval(self._options[optname], optval)
+ update[optname] = optval
self.update(**update)
for k in update.keys():
del self.deferred[k]