diff options
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/contrib/jsbeautifier/__init__.py | 2 | ||||
| -rw-r--r-- | libmproxy/contrib/pyparsing.py | 40 | ||||
| -rw-r--r-- | libmproxy/platform/windows.py | 4 | ||||
| -rw-r--r-- | libmproxy/tnetstring.py | 4 | ||||
| -rw-r--r-- | libmproxy/web/app.py | 6 |
5 files changed, 28 insertions, 28 deletions
diff --git a/libmproxy/contrib/jsbeautifier/__init__.py b/libmproxy/contrib/jsbeautifier/__init__.py index e319e8dd..b43d41ce 100644 --- a/libmproxy/contrib/jsbeautifier/__init__.py +++ b/libmproxy/contrib/jsbeautifier/__init__.py @@ -216,7 +216,7 @@ class Beautifier: parser_pos = 0 while True: 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': break diff --git a/libmproxy/contrib/pyparsing.py b/libmproxy/contrib/pyparsing.py index 06b11d98..4d26324c 100644 --- a/libmproxy/contrib/pyparsing.py +++ b/libmproxy/contrib/pyparsing.py @@ -40,7 +40,7 @@ Here is a program to parse "Hello, World!" (or any greeting of the form "<saluta greet = Word( alphas ) + "," + Word( alphas ) + "!"
hello = "Hello, World!"
- print hello, "->", greet.parseString( hello )
+ print(hello, "->", greet.parseString( hello ))
The program outputs the following::
@@ -651,13 +651,13 @@ def line( loc, strg ): return strg[lastCR+1:]
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 ):
- print ("Matched " + _ustr(expr) + " -> " + str(toks.asList()))
+ print("Matched " + _ustr(expr) + " -> " + str(toks.asList()))
def _defaultExceptionDebugAction( instring, loc, expr, exc ):
- print ("Exception raised:" + _ustr(exc))
+ print("Exception raised:" + _ustr(exc))
def nullDebugAction(*args):
"""'Do-nothing' debug action, to suppress debugging output during parsing."""
@@ -804,7 +804,7 @@ class ParserElement(object): 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:
return f
else:
@@ -914,7 +914,7 @@ class ParserElement(object): debugging = ( self.debug ) #and doActions )
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] ):
self.debugActions[0]( instring, loc, self )
if callPreParse and self.callPreparse:
@@ -928,7 +928,7 @@ class ParserElement(object): except IndexError:
raise ParseException( instring, len(instring), self.errmsg, self )
except ParseBaseException, err:
- #~ print ("Exception raised:", err)
+ #~ print("Exception raised:", err)
if self.debugActions[2]:
self.debugActions[2]( instring, tokensStart, self, err )
if self.failAction:
@@ -962,7 +962,7 @@ class ParserElement(object): asList=self.saveAsList and isinstance(tokens,(ParseResults,list)),
modal=self.modalResults )
except ParseBaseException, err:
- #~ print "Exception raised in user parse action:", err
+ #~ print("Exception raised in user parse action:", err)
if (self.debugActions[2] ):
self.debugActions[2]( instring, tokensStart, self, err )
raise
@@ -976,7 +976,7 @@ class ParserElement(object): modal=self.modalResults )
if debugging:
- #~ print ("Matched",self,"->",retTokens.asList())
+ #~ print("Matched",self,"->",retTokens.asList())
if (self.debugActions[1] ):
self.debugActions[1]( instring, tokensStart, loc, self, retTokens )
@@ -2861,7 +2861,7 @@ class SkipTo(ParseElementEnhance): while 1:
try:
loc = self.ignoreExpr.tryParse(instring,loc)
- print "found ignoreExpr, advance to", loc
+ print("found ignoreExpr, advance to", loc)
except ParseBaseException:
break
expr._parse( instring, loc, doActions=False, callPreParse=False )
@@ -3239,7 +3239,7 @@ def oneOf( strs, caseless=False, useRegex=True ): i += 1
if not caseless and useRegex:
- #~ print (strs,"->", "|".join( [ _escapeRegexChars(sym) for sym in symbols] ))
+ #~print(strs,"->", "|".join( [ _escapeRegexChars(sym) for sym in symbols] ))
try:
if len(symbols)==len("".join(symbols)):
return Regex( "[%s]" % "".join( [ _escapeRegexRangeChars(sym) for sym in symbols] ) )
@@ -3669,16 +3669,16 @@ if __name__ == "__main__": try:
tokens = simpleSQL.parseString( teststring )
tokenlist = tokens.asList()
- print (teststring + "->" + str(tokenlist))
- print ("tokens = " + str(tokens))
- print ("tokens.columns = " + str(tokens.columns))
- print ("tokens.tables = " + str(tokens.tables))
- print (tokens.asXML("SQL",True))
+ print(teststring + "->" + str(tokenlist))
+ print("tokens = " + str(tokens))
+ print("tokens.columns = " + str(tokens.columns))
+ print("tokens.tables = " + str(tokens.tables))
+ print(tokens.asXML("SQL",True))
except ParseBaseException,err:
- print (teststring + "->")
- print (err.line)
- print (" "*(err.column-1) + "^")
- print (err)
+ print(teststring + "->")
+ print(err.line)
+ print(" "*(err.column-1) + "^")
+ print(err)
print()
selectToken = CaselessLiteral( "select" )
diff --git a/libmproxy/platform/windows.py b/libmproxy/platform/windows.py index 066a377d..98bfebcf 100644 --- a/libmproxy/platform/windows.py +++ b/libmproxy/platform/windows.py @@ -354,7 +354,7 @@ class TransparentProxy(object): if server: packet.src_addr, packet.src_port = server 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) self.response_handle.send((packet.raw, metadata)) @@ -391,4 +391,4 @@ if __name__ == "__main__": except KeyboardInterrupt: print(" * Shutting down...") proxy.shutdown() - print(" * Shut down.")
\ No newline at end of file + print(" * Shut down.") diff --git a/libmproxy/tnetstring.py b/libmproxy/tnetstring.py index 58519675..91b3ba2a 100644 --- a/libmproxy/tnetstring.py +++ b/libmproxy/tnetstring.py @@ -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, like so:: - >>> print repr(tnetstring.loads("2:\\xce\\xb1,")) + >>> print(repr(tnetstring.loads("2:\\xce\\xb1,"))) '\\xce\\xb1' >>> - >>> print repr(tnetstring.loads("2:\\xce\\xb1,","utf8")) + >>> print(repr(tnetstring.loads("2:\\xce\\xb1,","utf8"))) u'\u03b1' """ diff --git a/libmproxy/web/app.py b/libmproxy/web/app.py index 8598acf5..2fc849f9 100644 --- a/libmproxy/web/app.py +++ b/libmproxy/web/app.py @@ -180,7 +180,7 @@ class Settings(RequestHandler): update = {} for k, v in self.request.arguments.iteritems(): if len(v) != 1: - print "Warning: Unknown length for setting {}: {}".format(k, v) + print("Warning: Unknown length for setting {}: {}".format(k, v)) continue if k == "_xsrf": @@ -189,7 +189,7 @@ class Settings(RequestHandler): self.state.set_intercept(v[0]) update[k] = v[0] else: - print "Warning: Unknown setting {}: {}".format(k, v) + print("Warning: Unknown setting {}: {}".format(k, v)) ClientConnection.broadcast( type="settings", @@ -224,4 +224,4 @@ class Application(tornado.web.Application): cookie_secret=os.urandom(256), debug=debug, ) - super(Application, self).__init__(handlers, **settings)
\ No newline at end of file + super(Application, self).__init__(handlers, **settings) |