diff options
| author | Aldo Cortesi <aldo@corte.si> | 2016-10-17 17:03:02 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-17 17:03:02 +1300 |
| commit | ae3ff8ee1edc646e7a640219df1a312c27f7c339 (patch) | |
| tree | 490697113ceaf12cc704c418357139e60a0190f3 /pathod/pathoc.py | |
| parent | 3fbce7e981cab5d20b3ef17a50f14b34e8c60fa3 (diff) | |
| parent | ce98a9219e060b729d4b0d2dc28bf4510649f0fd (diff) | |
| download | mitmproxy-ae3ff8ee1edc646e7a640219df1a312c27f7c339.tar.gz mitmproxy-ae3ff8ee1edc646e7a640219df1a312c27f7c339.tar.bz2 mitmproxy-ae3ff8ee1edc646e7a640219df1a312c27f7c339.zip | |
Merge pull request #1615 from cortesi/python3a
exterminate 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: |