aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/protocol2/socks.py
diff options
context:
space:
mode:
Diffstat (limited to 'libmproxy/protocol2/socks.py')
-rw-r--r--libmproxy/protocol2/socks.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/libmproxy/protocol2/socks.py b/libmproxy/protocol2/socks.py
index 14564521..1222ef5c 100644
--- a/libmproxy/protocol2/socks.py
+++ b/libmproxy/protocol2/socks.py
@@ -1,10 +1,10 @@
from __future__ import (absolute_import, print_function, division)
-from ..proxy import ProxyError, Socks5ProxyMode, ProxyError2
+from ..exceptions import ProtocolException
+from ..proxy import ProxyError, Socks5ProxyMode
from .layer import Layer, ServerConnectionMixin
from .auto import AutoLayer
-
class Socks5IncomingLayer(Layer, ServerConnectionMixin):
def __call__(self):
try:
@@ -12,7 +12,7 @@ class Socks5IncomingLayer(Layer, ServerConnectionMixin):
address = s5mode.get_upstream_server(self.client_conn)[2:]
except ProxyError as e:
# TODO: Unmonkeypatch
- raise ProxyError2(str(e), e)
+ raise ProtocolException(str(e), e)
self.server_address = address