aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/contrib
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-10-17 17:34:46 +1300
committerAldo Cortesi <aldo@nullcube.com>2016-10-17 18:03:07 +1300
commitc774a9fec93feedc37a450400a03b83f5f4cb4b9 (patch)
tree507c346e8f8c605d428140274678fced2e6bbc16 /mitmproxy/contrib
parenta647b30365593a4a3056fcf6936f5441ab9eda88 (diff)
downloadmitmproxy-c774a9fec93feedc37a450400a03b83f5f4cb4b9.tar.gz
mitmproxy-c774a9fec93feedc37a450400a03b83f5f4cb4b9.tar.bz2
mitmproxy-c774a9fec93feedc37a450400a03b83f5f4cb4b9.zip
python3: clean up super and __future__
Diffstat (limited to 'mitmproxy/contrib')
-rw-r--r--mitmproxy/contrib/tls/__init__.py1
-rw-r--r--mitmproxy/contrib/tls/_constructs.py1
-rw-r--r--mitmproxy/contrib/tls/utils.py1
-rw-r--r--mitmproxy/contrib/wbxml/ASWBXMLCodePage.py2
-rw-r--r--mitmproxy/contrib/wbxml/GlobalTokens.py2
-rw-r--r--mitmproxy/contrib/wbxml/InvalidDataException.py2
6 files changed, 3 insertions, 6 deletions
diff --git a/mitmproxy/contrib/tls/__init__.py b/mitmproxy/contrib/tls/__init__.py
index 4b540884..450986f7 100644
--- a/mitmproxy/contrib/tls/__init__.py
+++ b/mitmproxy/contrib/tls/__init__.py
@@ -2,4 +2,3 @@
# 2.0, and the BSD License. See the LICENSE file in the root of this repository
# for complete details.
-from __future__ import absolute_import, division, print_function
diff --git a/mitmproxy/contrib/tls/_constructs.py b/mitmproxy/contrib/tls/_constructs.py
index 4cb7d382..f599f0fd 100644
--- a/mitmproxy/contrib/tls/_constructs.py
+++ b/mitmproxy/contrib/tls/_constructs.py
@@ -2,7 +2,6 @@
# 2.0, and the BSD License. See the LICENSE file in the root of this repository
# for complete details.
-from __future__ import absolute_import, division, print_function
from construct import (Array, Bytes, Struct, UBInt16, UBInt32, UBInt8, PascalString, Embed, TunnelAdapter, GreedyRange,
Switch, OptionalGreedyRange, Optional)
diff --git a/mitmproxy/contrib/tls/utils.py b/mitmproxy/contrib/tls/utils.py
index 87afbacb..ff442387 100644
--- a/mitmproxy/contrib/tls/utils.py
+++ b/mitmproxy/contrib/tls/utils.py
@@ -2,7 +2,6 @@
# 2.0, and the BSD License. See the LICENSE file in the root of this repository
# for complete details.
-from __future__ import absolute_import, division, print_function
import construct
diff --git a/mitmproxy/contrib/wbxml/ASWBXMLCodePage.py b/mitmproxy/contrib/wbxml/ASWBXMLCodePage.py
index 2f9d8717..1d00afd4 100644
--- a/mitmproxy/contrib/wbxml/ASWBXMLCodePage.py
+++ b/mitmproxy/contrib/wbxml/ASWBXMLCodePage.py
@@ -49,4 +49,4 @@ class ASWBXMLCodePage:
return None
def __repr__(self):
- return str(self.tokenLookup) \ No newline at end of file
+ return str(self.tokenLookup)
diff --git a/mitmproxy/contrib/wbxml/GlobalTokens.py b/mitmproxy/contrib/wbxml/GlobalTokens.py
index 41310fb1..85d5e558 100644
--- a/mitmproxy/contrib/wbxml/GlobalTokens.py
+++ b/mitmproxy/contrib/wbxml/GlobalTokens.py
@@ -47,4 +47,4 @@ class GlobalTokens:
EXT_1 = 0xC1
EXT_2 = 0xC2
OPAQUE = 0xC3
- LITERAL_AC = 0xC4 \ No newline at end of file
+ LITERAL_AC = 0xC4
diff --git a/mitmproxy/contrib/wbxml/InvalidDataException.py b/mitmproxy/contrib/wbxml/InvalidDataException.py
index 67f8ea93..e9e3e087 100644
--- a/mitmproxy/contrib/wbxml/InvalidDataException.py
+++ b/mitmproxy/contrib/wbxml/InvalidDataException.py
@@ -28,4 +28,4 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
'''
class InvalidDataException(Exception):
- pass \ No newline at end of file
+ pass