diff options
| author | Aldo Cortesi <aldo@corte.si> | 2014-03-10 17:24:05 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@corte.si> | 2014-03-10 17:24:05 +1300 |
| commit | 554deee222fa4d2100b93becc4dd06f7342e3694 (patch) | |
| tree | 8acbf873630193e7bc34185f3a243e1aab408869 /libmproxy/protocol/primitives.py | |
| parent | 2e50b1073538730fc5bd6369e2cb8176874f2f03 (diff) | |
| parent | dd3aedca01a61f2fe33d009320f7fe656f1fc671 (diff) | |
| download | mitmproxy-554deee222fa4d2100b93becc4dd06f7342e3694.tar.gz mitmproxy-554deee222fa4d2100b93becc4dd06f7342e3694.tar.bz2 mitmproxy-554deee222fa4d2100b93becc4dd06f7342e3694.zip | |
Merge pull request #233 from mitmproxy/untangle_circular_dependencies
Untangle circular dependencies
Diffstat (limited to 'libmproxy/protocol/primitives.py')
| -rw-r--r-- | libmproxy/protocol/primitives.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmproxy/protocol/primitives.py b/libmproxy/protocol/primitives.py index 90191eeb..f2701458 100644 --- a/libmproxy/protocol/primitives.py +++ b/libmproxy/protocol/primitives.py @@ -1,5 +1,5 @@ from .. import stateobject, utils, version -from ..proxy import ServerConnection, ClientConnection +from ..proxy.connection import ClientConnection, ServerConnection import copy |