diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2012-03-01 13:12:53 -0800 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2012-03-01 13:12:53 -0800 |
commit | 1790246fed463ea47d74b3cd99b24b5480ecc340 (patch) | |
tree | aa2a867ba39bcd63e6d5bc4eb862bbca5e373ac0 | |
parent | 533f61f67aab38f5bce882ad0dc03b7b5f292956 (diff) | |
parent | 15ad7704d25978a1e803a638e0ad6142a9b76671 (diff) | |
download | mitmproxy-1790246fed463ea47d74b3cd99b24b5480ecc340.tar.gz mitmproxy-1790246fed463ea47d74b3cd99b24b5480ecc340.tar.bz2 mitmproxy-1790246fed463ea47d74b3cd99b24b5480ecc340.zip |
Merge pull request #33 from dnet/master
Removed imports left unused after Py{OpenSSL,ASN1}
-rw-r--r-- | libmproxy/certutils.py | 2 | ||||
-rw-r--r-- | test/test_utils.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libmproxy/certutils.py b/libmproxy/certutils.py index 5d9902f0..43d14091 100644 --- a/libmproxy/certutils.py +++ b/libmproxy/certutils.py @@ -1,4 +1,4 @@ -import subprocess, os, tempfile, ssl, hashlib, socket, re +import subprocess, os, ssl, hashlib, socket from pyasn1.type import univ, constraint, char, namedtype, tag from pyasn1.codec.der.decoder import decode import OpenSSL diff --git a/test/test_utils.py b/test/test_utils.py index 17c677a7..9ab6d7b9 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -1,4 +1,4 @@ -import textwrap, os, re, json +import textwrap, re, json import libpry from libmproxy import utils |