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

Fixed print function to be inline with python 3

Browse Source
This commit is contained in:
Jim Shaver 2015-05-29 23:17:48 -04:00
parent 97c6d7ed25
commit 4fe2c069cc
10 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/flowbasic
View File

@ -30,7 +30,7 @@ class MyMaster(flow.FlowMaster):
f = flow.FlowMaster.handle_response(self, f) f = flow.FlowMaster.handle_response(self, f)
if f: if f:
f.reply() f.reply()
print f print(f)
return f return f

2
examples/har_extractor.py
View File

@ -231,4 +231,4 @@ def print_attributes(obj, filter_string=None, hide_privates=False):
if filter_string is not None and filter_string not in attr: if filter_string is not None and filter_string not in attr:
continue continue
value = getattr(obj, attr) value = getattr(obj, attr)
print "%s.%s" % ('obj', attr), value, type(value) print("%s.%s" % ('obj', attr), value, type(value))

6
examples/mitmproxywrapper.py
View File

@ -28,12 +28,12 @@ class Wrapper(object):
return dict([re.findall(r'([^:]+): (.*)', line)[0] for line in state]) return dict([re.findall(r'([^:]+): (.*)', line)[0] for line in state])
def enable_proxy_for_service(self, service): def enable_proxy_for_service(self, service):
print 'Enabling proxy on {}...'.format(service) print('Enabling proxy on {}...'.format(service))
for subcommand in ['-setwebproxy', '-setsecurewebproxy']: for subcommand in ['-setwebproxy', '-setsecurewebproxy']:
self.run_networksetup_command(subcommand, service, '127.0.0.1', str(self.port)) self.run_networksetup_command(subcommand, service, '127.0.0.1', str(self.port))
def disable_proxy_for_service(self, service): def disable_proxy_for_service(self, service):
print 'Disabling proxy on {}...'.format(service) print('Disabling proxy on {}...'.format(service))
for subcommand in ['-setwebproxystate', '-setsecurewebproxystate']: for subcommand in ['-setwebproxystate', '-setsecurewebproxystate']:
self.run_networksetup_command(subcommand, service, 'Off') self.run_networksetup_command(subcommand, service, 'Off')
@ -112,7 +112,7 @@ class Wrapper(object):
@classmethod @classmethod
def ensure_superuser(cls): def ensure_superuser(cls):
if os.getuid() != 0: if os.getuid() != 0:
print 'Relaunching with sudo...' print('Relaunching with sudo...')
os.execv('/usr/bin/sudo', ['/usr/bin/sudo'] + sys.argv) os.execv('/usr/bin/sudo', ['/usr/bin/sudo'] + sys.argv)
@classmethod @classmethod

4
examples/nonblocking.py
View File

@ -4,6 +4,6 @@ from libmproxy.script import concurrent
@concurrent # Remove this and see what happens @concurrent # Remove this and see what happens
def request(context, flow): def request(context, flow):
print "handle request: %s%s" % (flow.request.host, flow.request.path) print("handle request: %s%s" % (flow.request.host, flow.request.path))
time.sleep(5) time.sleep(5)
print "start request: %s%s" % (flow.request.host, flow.request.path) print("start request: %s%s" % (flow.request.host, flow.request.path))

4
examples/read_dumpfile
View File

@ -13,6 +13,6 @@ with open("logfile", "rb") as logfile:
print(f) print(f)
print(f.request.host) print(f.request.host)
json.dump(f.get_state(), sys.stdout, indent=4) json.dump(f.get_state(), sys.stdout, indent=4)
print "" print("")
except flow.FlowReadError, v: except flow.FlowReadError, v:
print "Flow file corrupted. Stopped loading." print("Flow file corrupted. Stopped loading.")

2
libmproxy/contrib/jsbeautifier/__init__.py
View File

@ -216,7 +216,7 @@ class Beautifier:
parser_pos = 0 parser_pos = 0
while True: while True:
token_text, token_type = self.get_next_token() token_text, token_type = self.get_next_token()
#print (token_text, token_type, self.flags.mode) #print(token_text, token_type, self.flags.mode)
if token_type == 'TK_EOF': if token_type == 'TK_EOF':
break break

40
libmproxy/contrib/pyparsing.py
View File

@ -40,7 +40,7 @@ Here is a program to parse "Hello, World!" (or any greeting of the form "<saluta
greet = Word( alphas ) + "," + Word( alphas ) + "!" greet = Word( alphas ) + "," + Word( alphas ) + "!"
hello = "Hello, World!" hello = "Hello, World!"
print hello, "->", greet.parseString( hello ) print(hello, "->", greet.parseString( hello ))
The program outputs the following:: The program outputs the following::
@ -651,13 +651,13 @@ def line( loc, strg ):
return strg[lastCR+1:] return strg[lastCR+1:]
def _defaultStartDebugAction( instring, loc, expr ): def _defaultStartDebugAction( instring, loc, expr ):
print ("Match " + _ustr(expr) + " at loc " + _ustr(loc) + "(%d,%d)" % ( lineno(loc,instring), col(loc,instring) )) print("Match " + _ustr(expr) + " at loc " + _ustr(loc) + "(%d,%d)" % ( lineno(loc,instring), col(loc,instring) ))
def _defaultSuccessDebugAction( instring, startloc, endloc, expr, toks ): def _defaultSuccessDebugAction( instring, startloc, endloc, expr, toks ):
print ("Matched " + _ustr(expr) + " -> " + str(toks.asList())) print("Matched " + _ustr(expr) + " -> " + str(toks.asList()))
def _defaultExceptionDebugAction( instring, loc, expr, exc ): def _defaultExceptionDebugAction( instring, loc, expr, exc ):
print ("Exception raised:" + _ustr(exc)) print("Exception raised:" + _ustr(exc))
def nullDebugAction(*args): def nullDebugAction(*args):
"""'Do-nothing' debug action, to suppress debugging output during parsing.""" """'Do-nothing' debug action, to suppress debugging output during parsing."""
@ -804,7 +804,7 @@ class ParserElement(object):
numargs -= 1 numargs -= 1
#~ print ("adding function %s with %d args" % (f.func_name,numargs)) #~ print("adding function %s with %d args" % (f.func_name,numargs))
if numargs == 3: if numargs == 3:
return f return f
else: else:
@ -914,7 +914,7 @@ class ParserElement(object):
debugging = ( self.debug ) #and doActions ) debugging = ( self.debug ) #and doActions )
if debugging or self.failAction: if debugging or self.failAction:
#~ print ("Match",self,"at loc",loc,"(%d,%d)" % ( lineno(loc,instring), col(loc,instring) )) #~ print("Match",self,"at loc",loc,"(%d,%d)" % ( lineno(loc,instring), col(loc,instring) ))
if (self.debugActions[0] ): if (self.debugActions[0] ):
self.debugActions[0]( instring, loc, self ) self.debugActions[0]( instring, loc, self )
if callPreParse and self.callPreparse: if callPreParse and self.callPreparse:
@ -928,7 +928,7 @@ class ParserElement(object):
except IndexError: except IndexError:
raise ParseException( instring, len(instring), self.errmsg, self ) raise ParseException( instring, len(instring), self.errmsg, self )
except ParseBaseException, err: except ParseBaseException, err:
#~ print ("Exception raised:", err) #~ print("Exception raised:", err)
if self.debugActions[2]: if self.debugActions[2]:
self.debugActions[2]( instring, tokensStart, self, err ) self.debugActions[2]( instring, tokensStart, self, err )
if self.failAction: if self.failAction:
@ -962,7 +962,7 @@ class ParserElement(object):
asList=self.saveAsList and isinstance(tokens,(ParseResults,list)), asList=self.saveAsList and isinstance(tokens,(ParseResults,list)),
modal=self.modalResults ) modal=self.modalResults )
except ParseBaseException, err: except ParseBaseException, err:
#~ print "Exception raised in user parse action:", err #~ print("Exception raised in user parse action:", err)
if (self.debugActions[2] ): if (self.debugActions[2] ):
self.debugActions[2]( instring, tokensStart, self, err ) self.debugActions[2]( instring, tokensStart, self, err )
raise raise
@ -976,7 +976,7 @@ class ParserElement(object):
modal=self.modalResults ) modal=self.modalResults )
if debugging: if debugging:
#~ print ("Matched",self,"->",retTokens.asList()) #~ print("Matched",self,"->",retTokens.asList())
if (self.debugActions[1] ): if (self.debugActions[1] ):
self.debugActions[1]( instring, tokensStart, loc, self, retTokens ) self.debugActions[1]( instring, tokensStart, loc, self, retTokens )
@ -2861,7 +2861,7 @@ class SkipTo(ParseElementEnhance):
while 1: while 1:
try: try:
loc = self.ignoreExpr.tryParse(instring,loc) loc = self.ignoreExpr.tryParse(instring,loc)
print "found ignoreExpr, advance to", loc print("found ignoreExpr, advance to", loc)
except ParseBaseException: except ParseBaseException:
break break
expr._parse( instring, loc, doActions=False, callPreParse=False ) expr._parse( instring, loc, doActions=False, callPreParse=False )
@ -3239,7 +3239,7 @@ def oneOf( strs, caseless=False, useRegex=True ):
i += 1 i += 1
if not caseless and useRegex: if not caseless and useRegex:
#~ print (strs,"->", "|".join( [ _escapeRegexChars(sym) for sym in symbols] )) #~print(strs,"->", "|".join( [ _escapeRegexChars(sym) for sym in symbols] ))
try: try:
if len(symbols)==len("".join(symbols)): if len(symbols)==len("".join(symbols)):
return Regex( "[%s]" % "".join( [ _escapeRegexRangeChars(sym) for sym in symbols] ) ) return Regex( "[%s]" % "".join( [ _escapeRegexRangeChars(sym) for sym in symbols] ) )
@ -3669,16 +3669,16 @@ if __name__ == "__main__":
try: try:
tokens = simpleSQL.parseString( teststring ) tokens = simpleSQL.parseString( teststring )
tokenlist = tokens.asList() tokenlist = tokens.asList()
print (teststring + "->" + str(tokenlist)) print(teststring + "->" + str(tokenlist))
print ("tokens = " + str(tokens)) print("tokens = " + str(tokens))
print ("tokens.columns = " + str(tokens.columns)) print("tokens.columns = " + str(tokens.columns))
print ("tokens.tables = " + str(tokens.tables)) print("tokens.tables = " + str(tokens.tables))
print (tokens.asXML("SQL",True)) print(tokens.asXML("SQL",True))
except ParseBaseException,err: except ParseBaseException,err:
print (teststring + "->") print(teststring + "->")
print (err.line) print(err.line)
print (" "*(err.column-1) + "^") print(" "*(err.column-1) + "^")
print (err) print(err)
print() print()
selectToken = CaselessLiteral( "select" ) selectToken = CaselessLiteral( "select" )

4
libmproxy/platform/windows.py
View File

@ -354,7 +354,7 @@ class TransparentProxy(object):
if server: if server:
packet.src_addr, packet.src_port = server packet.src_addr, packet.src_port = server
else: else:
print "Warning: Previously unseen connection from proxy to %s:%s." % client print("Warning: Previously unseen connection from proxy to %s:%s." % client)
packet = self.driver.update_packet_checksums(packet) packet = self.driver.update_packet_checksums(packet)
self.response_handle.send((packet.raw, metadata)) self.response_handle.send((packet.raw, metadata))
@ -391,4 +391,4 @@ if __name__ == "__main__":
except KeyboardInterrupt: except KeyboardInterrupt:
print(" * Shutting down...") print(" * Shutting down...")
proxy.shutdown() proxy.shutdown()
print(" * Shut down.") print(" * Shut down.")

4
libmproxy/tnetstring.py
View File

@ -60,10 +60,10 @@ By default tnetstrings work only with byte strings, not unicode. If you want
unicode strings then pass an optional encoding to the various functions, unicode strings then pass an optional encoding to the various functions,
like so:: like so::
>>> print repr(tnetstring.loads("2:\\xce\\xb1,")) >>> print(repr(tnetstring.loads("2:\\xce\\xb1,")))
'\\xce\\xb1' '\\xce\\xb1'
>>> >>>
>>> print repr(tnetstring.loads("2:\\xce\\xb1,","utf8")) >>> print(repr(tnetstring.loads("2:\\xce\\xb1,","utf8")))
u'\u03b1' u'\u03b1'
""" """

6
libmproxy/web/app.py
View File

@ -180,7 +180,7 @@ class Settings(RequestHandler):
update = {} update = {}
for k, v in self.request.arguments.iteritems(): for k, v in self.request.arguments.iteritems():
if len(v) != 1: if len(v) != 1:
print "Warning: Unknown length for setting {}: {}".format(k, v) print("Warning: Unknown length for setting {}: {}".format(k, v))
continue continue
if k == "_xsrf": if k == "_xsrf":
@ -189,7 +189,7 @@ class Settings(RequestHandler):
self.state.set_intercept(v[0]) self.state.set_intercept(v[0])
update[k] = v[0] update[k] = v[0]
else: else:
print "Warning: Unknown setting {}: {}".format(k, v) print("Warning: Unknown setting {}: {}".format(k, v))
ClientConnection.broadcast( ClientConnection.broadcast(
type="settings", type="settings",
@ -224,4 +224,4 @@ class Application(tornado.web.Application):
cookie_secret=os.urandom(256), cookie_secret=os.urandom(256),
debug=debug, debug=debug,
) )
super(Application, self).__init__(handlers, **settings) super(Application, self).__init__(handlers, **settings)