diff options
| author | Jim Shaver <dcypherd@gmail.com> | 2015-06-23 21:48:05 -0500 |
|---|---|---|
| committer | Jim Shaver <dcypherd@gmail.com> | 2015-06-23 21:48:05 -0500 |
| commit | 080e4534253338c94e6d8c86cb3679ff15410f85 (patch) | |
| tree | 6322fb822332b4135f0ff14de8c2d7137016f734 /libmproxy/platform/__init__.py | |
| parent | db5c0b210b0133d7cd58124c727dbc24480e2568 (diff) | |
| parent | 074d8d7c7463cdb1f0a90e165a4b3ada3554b4c2 (diff) | |
| download | mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.tar.gz mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.tar.bz2 mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.zip | |
Merge branch 'master' into hardfailvenv
Conflicts:
dev
Diffstat (limited to 'libmproxy/platform/__init__.py')
| -rw-r--r-- | libmproxy/platform/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmproxy/platform/__init__.py b/libmproxy/platform/__init__.py index 1b2cf909..e1ff7c47 100644 --- a/libmproxy/platform/__init__.py +++ b/libmproxy/platform/__init__.py @@ -8,9 +8,9 @@ if sys.platform == "linux2": elif sys.platform == "darwin": from . import osx resolver = osx.Resolver -elif sys.platform == "freebsd10": +elif sys.platform.startswith("freebsd"): from . import osx resolver = osx.Resolver elif sys.platform == "win32": from . import windows - resolver = windows.Resolver
\ No newline at end of file + resolver = windows.Resolver |