diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2017-08-07 16:22:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-07 16:22:33 +0200 |
| commit | 6d9b5b0c062126d2ac47fa50795c7d560321e0f7 (patch) | |
| tree | 199ed51447f0daa32d3f21ace18b0f3585b88c0a /mitmproxy | |
| parent | cf135eab4464d8f545343267a1ff4fe45771e8a5 (diff) | |
| parent | e30750bf9e067692d4b5335a916030da9fc1b76a (diff) | |
| download | mitmproxy-6d9b5b0c062126d2ac47fa50795c7d560321e0f7.tar.gz mitmproxy-6d9b5b0c062126d2ac47fa50795c7d560321e0f7.tar.bz2 mitmproxy-6d9b5b0c062126d2ac47fa50795c7d560321e0f7.zip | |
Merge pull request #2502 from mhils/optmanager
Fix optmanager equality check and deepcopy
Diffstat (limited to 'mitmproxy')
| -rw-r--r-- | mitmproxy/optmanager.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mitmproxy/optmanager.py b/mitmproxy/optmanager.py index 08d155cf..01d97af3 100644 --- a/mitmproxy/optmanager.py +++ b/mitmproxy/optmanager.py @@ -150,13 +150,17 @@ class OptManager: self.changed.connect(_call, weak=False) def __eq__(self, other): - return self._options == other._options + if isinstance(other, OptManager): + return self._options == other._options + return False - def __copy__(self): + def __deepcopy__(self, memodict = None): o = OptManager() - o.__dict__["_options"] = copy.deepcopy(self._options) + o.__dict__["_options"] = copy.deepcopy(self._options, memodict) return o + __copy__ = __deepcopy__ + def __getattr__(self, attr): if attr in self._options: return self._options[attr].current() |