diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-07-30 13:50:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-30 13:50:08 -0700 |
| commit | 47f0c2141763385980a483b97dc403b582aa2127 (patch) | |
| tree | 258d8164696aefe00b890181fb8ccfcc1d85ead4 | |
| parent | 63f64cd66086f302f53456f29f60b1e28c8ee178 (diff) | |
| parent | 07f77f086673a065d2f0f34a85b8e9ab6b06b06a (diff) | |
| download | mitmproxy-47f0c2141763385980a483b97dc403b582aa2127.tar.gz mitmproxy-47f0c2141763385980a483b97dc403b582aa2127.tar.bz2 mitmproxy-47f0c2141763385980a483b97dc403b582aa2127.zip | |
Merge pull request #1450 from vhaupert/master
Fix platform import, substitute "~" with user's home
| -rw-r--r-- | mitmproxy/onboarding/app.py | 1 | ||||
| -rw-r--r-- | mitmproxy/platform/__init__.py | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mitmproxy/onboarding/app.py b/mitmproxy/onboarding/app.py index e26efae8..491ddbfe 100644 --- a/mitmproxy/onboarding/app.py +++ b/mitmproxy/onboarding/app.py @@ -48,6 +48,7 @@ class PEM(tornado.web.RequestHandler): def get(self): p = os.path.join(self.request.master.options.cadir, self.filename) + p = os.path.expanduser(p) self.set_header("Content-Type", "application/x-x509-ca-cert") self.set_header( "Content-Disposition", diff --git a/mitmproxy/platform/__init__.py b/mitmproxy/platform/__init__.py index e1ff7c47..2e350131 100644 --- a/mitmproxy/platform/__init__.py +++ b/mitmproxy/platform/__init__.py @@ -1,8 +1,9 @@ import sys +import re resolver = None -if sys.platform == "linux2": +if re.match(r"linux(?:2)?", sys.platform): from . import linux resolver = linux.Resolver elif sys.platform == "darwin": |