diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-03-09 21:51:24 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-03-09 21:51:24 +0100 |
| commit | 5598a8de82f28232fb4407911a8643dceacc9ebc (patch) | |
| tree | 832c4db3c0b897ad6615761083a7735e18d45b44 /libmproxy/protocol | |
| parent | fc4fe83eafc68ebb9763fa5cbee1ed7e16964c9c (diff) | |
| download | mitmproxy-5598a8de82f28232fb4407911a8643dceacc9ebc.tar.gz mitmproxy-5598a8de82f28232fb4407911a8643dceacc9ebc.tar.bz2 mitmproxy-5598a8de82f28232fb4407911a8643dceacc9ebc.zip | |
finish proxy.py split up
Diffstat (limited to 'libmproxy/protocol')
| -rw-r--r-- | libmproxy/protocol/__init__.py | 2 | ||||
| -rw-r--r-- | libmproxy/protocol/http.py | 6 | ||||
| -rw-r--r-- | libmproxy/protocol/primitives.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libmproxy/protocol/__init__.py b/libmproxy/protocol/__init__.py index 392a8e3d..6200757f 100644 --- a/libmproxy/protocol/__init__.py +++ b/libmproxy/protocol/__init__.py @@ -1,4 +1,4 @@ -from ..prxy.server import AddressPriority +from libmproxy.proxy.primitives import AddressPriority KILL = 0 # const for killed requests diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py index 3f9668ae..77a09e61 100644 --- a/libmproxy/protocol/http.py +++ b/libmproxy/protocol/http.py @@ -1,8 +1,8 @@ import Cookie, urllib, urlparse, time, copy from email.utils import parsedate_tz, formatdate, mktime_tz -from ..prxy.connection import ServerConnection -from ..prxy.exception import ProxyError, ConnectionTypeChange -from ..prxy.server import AddressPriority +from libmproxy.proxy.primitives import AddressPriority +from ..proxy.connection import ServerConnection +from ..proxy.primitives import ProxyError, ConnectionTypeChange import netlib.utils from netlib import http, tcp, http_status from netlib.odict import ODict, ODictCaseless diff --git a/libmproxy/protocol/primitives.py b/libmproxy/protocol/primitives.py index 7cee074d..f2701458 100644 --- a/libmproxy/protocol/primitives.py +++ b/libmproxy/protocol/primitives.py @@ -1,5 +1,5 @@ from .. import stateobject, utils, version -from ..prxy.connection import ClientConnection, ServerConnection +from ..proxy.connection import ClientConnection, ServerConnection import copy |