diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-10-17 15:43:38 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-10-17 15:43:38 +1300 |
| commit | d60ef617e33211cee3808c8b145d576f34ff437a (patch) | |
| tree | bda1af29899f63203e459774dd148aaf09c062c5 /pathod/pathoc.py | |
| parent | 8360f70024330eeeb5c53d29e4a05194f872b511 (diff) | |
| download | mitmproxy-d60ef617e33211cee3808c8b145d576f34ff437a.tar.gz mitmproxy-d60ef617e33211cee3808c8b145d576f34ff437a.tar.bz2 mitmproxy-d60ef617e33211cee3808c8b145d576f34ff437a.zip | |
pathod: remove six
Diffstat (limited to 'pathod/pathoc.py')
| -rw-r--r-- | pathod/pathoc.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pathod/pathoc.py b/pathod/pathoc.py index 59ae5fba..f122c14f 100644 --- a/pathod/pathoc.py +++ b/pathod/pathoc.py @@ -4,13 +4,12 @@ import sys import os import itertools import hashlib -from six.moves import queue +import queue import random import select import time import OpenSSL.crypto -import six import logging from netlib.tutils import treq @@ -250,9 +249,9 @@ class Pathoc(tcp.TCPClient): if resp.status_code != 200: raise exceptions.HttpException("Unexpected status code: %s" % resp.status_code) except exceptions.HttpException as e: - six.reraise(PathocError, PathocError( + raise PathocError( "Proxy CONNECT failed: %s" % repr(e) - )) + ) def socks_connect(self, connect_to): try: |