diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-07-19 18:09:33 -0700 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-07-19 18:09:33 -0700 |
| commit | b27db1fc812b5b9935599caf5d0a2cdfe34d7322 (patch) | |
| tree | 8ab0337fa9fa51daad4c212fff534297a5431852 | |
| parent | 1ff800598a9edf56c6e7eafda0e9558ab6a88489 (diff) | |
| download | mitmproxy-b27db1fc812b5b9935599caf5d0a2cdfe34d7322.tar.gz mitmproxy-b27db1fc812b5b9935599caf5d0a2cdfe34d7322.tar.bz2 mitmproxy-b27db1fc812b5b9935599caf5d0a2cdfe34d7322.zip | |
minor fixes
| -rw-r--r-- | mitmproxy/contrib/tnetstring.py | 2 | ||||
| -rw-r--r-- | mitmproxy/flow/io_compat.py | 1 | ||||
| -rw-r--r-- | netlib/encoding.py | 4 | ||||
| -rw-r--r-- | release/setup.py | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/mitmproxy/contrib/tnetstring.py b/mitmproxy/contrib/tnetstring.py index d99a83f9..86236caa 100644 --- a/mitmproxy/contrib/tnetstring.py +++ b/mitmproxy/contrib/tnetstring.py @@ -188,9 +188,9 @@ def load(file_handle): def parse(data_type, data): + # type: (int, bytes) -> TSerializable if six.PY2: data_type = ord(data_type) - # type: (int, bytes) -> TSerializable if data_type == ord(b','): return data if data_type == ord(b';'): diff --git a/mitmproxy/flow/io_compat.py b/mitmproxy/flow/io_compat.py index bcfbd375..8cd883c3 100644 --- a/mitmproxy/flow/io_compat.py +++ b/mitmproxy/flow/io_compat.py @@ -4,6 +4,7 @@ This module handles the import of mitmproxy flows generated by old versions. from __future__ import absolute_import, print_function, division import six +from typing import Any # noqa from netlib import version, strutils diff --git a/netlib/encoding.py b/netlib/encoding.py index 8b67b543..e3cf5f30 100644 --- a/netlib/encoding.py +++ b/netlib/encoding.py @@ -12,7 +12,7 @@ from typing import Union # noqa def decode(obj, encoding, errors='strict'): - # type: (Union[str, bytes], str) -> Union[str, bytes] + # type: (Union[str, bytes], str, str) -> Union[str, bytes] """ Decode the given input object @@ -36,7 +36,7 @@ def decode(obj, encoding, errors='strict'): def encode(obj, encoding, errors='strict'): - # type: (Union[str, bytes], str) -> Union[str, bytes] + # type: (Union[str, bytes], str, str) -> Union[str, bytes] """ Encode the given input object diff --git a/release/setup.py b/release/setup.py index 78155140..601654e5 100644 --- a/release/setup.py +++ b/release/setup.py @@ -7,7 +7,7 @@ setup( install_requires=[ "click>=6.2, <7.0", "twine>=1.6.5, <1.7", - "virtualenv>=14.0.5, <14.1", + "virtualenv>=14.0.5, <15.1", "wheel>=0.29.0, <0.30", "six>=1.10.0, <1.11", "pysftp>=0.2.8, !=0.2.9, <0.3", |