diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-05-31 17:33:57 -0700 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-05-31 17:33:57 -0700 |
| commit | 1dd078beb23aa0b483f945eed39c0136984f81a6 (patch) | |
| tree | c21863e80e79f934c1744ad1e5851d2ef95c9087 /netlib/socks.py | |
| parent | ebeda5e8d261bcdd8763ce4e634d534b0285527c (diff) | |
| parent | 44fdcb4b8291a5be6738f32d6fde307af3f2034e (diff) | |
| download | mitmproxy-1dd078beb23aa0b483f945eed39c0136984f81a6.tar.gz mitmproxy-1dd078beb23aa0b483f945eed39c0136984f81a6.tar.bz2 mitmproxy-1dd078beb23aa0b483f945eed39c0136984f81a6.zip | |
Merge pull request #1182 from cortesi/netlibimports
Reorganise netlib imports according to Google Style Guide
Diffstat (limited to 'netlib/socks.py')
| -rw-r--r-- | netlib/socks.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/netlib/socks.py b/netlib/socks.py index 675fa784..8d7c5279 100644 --- a/netlib/socks.py +++ b/netlib/socks.py @@ -2,7 +2,8 @@ from __future__ import (absolute_import, print_function, division) import struct import array import ipaddress -from . import tcp, utils + +from netlib import tcp, utils class SocksError(Exception): |