From d60ef617e33211cee3808c8b145d576f34ff437a Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Mon, 17 Oct 2016 15:43:38 +1300 Subject: pathod: remove six --- pathod/pathoc.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'pathod/pathoc.py') 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: -- cgit v1.2.3