Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 00:01:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1275 from Kriechi/more-py3

Browse Source 
py3++
This commit is contained in:
Thomas Kriechbaumer 2016-06-19 16:50:54 +02:00 committed by GitHub
commit c4c9527fa0
5 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mitmproxy/controller.py
View File

@ -6,7 +6,8 @@ import threading
from six.moves import queue
from netlib import basethread
from mitmproxy import exceptions
from . import exceptions
Events = frozenset([
@ -76,9 +77,9 @@ class Master(object):
if mtype not in Events:
raise exceptions.ControlException("Unknown event %s" % repr(mtype))
handle_func = getattr(self, mtype)
if not hasattr(handle_func, "func_dict"):
if not hasattr(handle_func, "__dict__"):
raise exceptions.ControlException("Handler %s not a function" % mtype)
if not handle_func.func_dict.get("__handler"):
if not handle_func.__dict__.get("__handler"):
raise exceptions.ControlException(
"Handler function %s is not decorated with controller.handler" % (
handle_func
@ -177,7 +178,7 @@ def handler(f):
message.reply.ack()
return ret
# Mark this function as a handler wrapper
wrapper.func_dict["__handler"] = True
wrapper.__dict__["__handler"] = True
return wrapper

2
mitmproxy/platform/osx.py
View File

@ -1,6 +1,6 @@
import subprocess
import pf
from . import pf
"""
Doing this the "right" way by using DIOCNATLOOK on the pf device turns out

4
mitmproxy/tnetstring.py
View File

@ -130,7 +130,7 @@ def _rdumpq(q, size, value, encoding=None):
if value is False:
write("5:false!")
return size + 8
if isinstance(value, (int, long)):
if isinstance(value, six.integer_types):
data = str(value)
ldata = len(data)
span = str(ldata)
@ -208,7 +208,7 @@ def _gdumps(value, encoding):
yield "4:true!"
elif value is False:
yield "5:false!"
elif isinstance(value, (int, long)):
elif isinstance(value, six.integer_types):
data = str(value)
yield str(len(data))
yield ":"

5
test/mitmproxy/mastertest.py
View File

@ -1,7 +1,8 @@
import tutils
import netlib.tutils
import mock
from . import tutils
import netlib.tutils
from mitmproxy import flow, proxy, models

16
test/mitmproxy/test_contentview.py
View File

@ -138,16 +138,16 @@ class TestContentView:
def test_view_image(self):
v = cv.ViewImage()
p = tutils.test_data.path("data/image.png")
assert v(file(p, "rb").read())
assert v(open(p, "rb").read())
p = tutils.test_data.path("data/image.gif")
assert v(file(p, "rb").read())
assert v(open(p, "rb").read())
p = tutils.test_data.path("data/image-err1.jpg")
assert v(file(p, "rb").read())
assert v(open(p, "rb").read())
p = tutils.test_data.path("data/image.ico")
assert v(file(p, "rb").read())
assert v(open(p, "rb").read())
assert not v("flibble")
@ -252,22 +252,22 @@ if pyamf:
v = cv.ViewAMF()
p = tutils.test_data.path("data/amf01")
assert v(file(p, "rb").read())
assert v(open(p, "rb").read())
p = tutils.test_data.path("data/amf02")
assert v(file(p, "rb").read())
assert v(open(p, "rb").read())
def test_view_amf_response():
v = cv.ViewAMF()
p = tutils.test_data.path("data/amf03")
assert v(file(p, "rb").read())
assert v(open(p, "rb").read())
if cv.ViewProtobuf.is_available():
def test_view_protobuf_request():
v = cv.ViewProtobuf()
p = tutils.test_data.path("data/protobuf01")
content_type, output = v(file(p, "rb").read())
content_type, output = v(open(p, "rb").read())
assert content_type == "Protobuf"
assert output.next()[0][1] == '1: "3bbc333c-e61c-433b-819a-0b9a8cc103b8"'