aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Czub <chris.czub@gmail.com>2015-11-04 15:04:18 -0500
committerChris Czub <chris.czub@gmail.com>2015-11-04 15:04:18 -0500
commit9398d5896b62a92d1fd41996ec337e9ca13f69af (patch)
tree709f8289d660b6e8c5285967b1d24c03b08ba9d8
parent88451ef2456a423a7528fb3aebbd56382c1f3ebb (diff)
downloadmitmproxy-9398d5896b62a92d1fd41996ec337e9ca13f69af.tar.gz
mitmproxy-9398d5896b62a92d1fd41996ec337e9ca13f69af.tar.bz2
mitmproxy-9398d5896b62a92d1fd41996ec337e9ca13f69af.zip
PR 809 make code more pythonic
-rw-r--r--libmproxy/platform/osx.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/libmproxy/platform/osx.py b/libmproxy/platform/osx.py
index 520b9874..2824718e 100644
--- a/libmproxy/platform/osx.py
+++ b/libmproxy/platform/osx.py
@@ -19,7 +19,6 @@ class Resolver(object):
def original_addr(self, csock):
peer = csock.getpeername()
- insufficient_priv = False
try:
stxt = subprocess.check_output(self.STATECMD, stderr=subprocess.STDOUT)
except subprocess.CalledProcessError, e:
@@ -27,8 +26,10 @@ class Resolver(object):
insufficient_priv = True
else:
raise RuntimeError("Error getting pfctl state: " + repr(e))
+ else:
+ insufficient_priv = "sudo: a password is required" in stxt
- if insufficient_priv is True or "sudo: a password is required" in stxt:
+ if insufficient_priv:
raise RuntimeError(
"Insufficient privileges to access pfctl. "
"See http://mitmproxy.org/doc/transparent/osx.html for details.")