Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-29 19:08:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into solidcore

Browse Source
This commit is contained in:
Aldo Cortesi 2016-05-28 20:59:51 +12:00
commit 4632cb5dbd
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -22,9 +22,9 @@ matrix:
git:
depth: 9999999
- python: 3.5
env: SCOPE="netlib ./test/mitmproxy/script ./test/pathod/test_utils.py"
env: SCOPE="netlib ./test/mitmproxy/script ./test/pathod/test_utils.py ./test/pathod/test_log.py"
- python: 3.5
env: SCOPE="netlib ./test/mitmproxy/script ./test/pathod/test_utils.py" NO_ALPN=1
env: SCOPE="netlib ./test/mitmproxy/script ./test/pathod/test_utils.py ./test/pathod/test_log.py" NO_ALPN=1
- python: 2.7
env: DOCS=1
script: 'cd docs && make html'

6
test/pathod/test_log.py
View File

@ -1,10 +1,10 @@
import StringIO
from pathod import log
from netlib.exceptions import TcpDisconnect
import netlib.tcp
import six
class DummyIO(StringIO.StringIO):
class DummyIO(six.StringIO):
def start_log(self, *args, **kwargs):
pass