git.fiddlerwoaroof.com
Browse code

ran 2to3 on some of the files, committing backwards compatible changes

Ed L authored on 13/07/2011 20:59:52
Showing 3 changed files
... ...
@@ -48,7 +48,7 @@ def iterate(iter_):
48 48
 			if rollback != []:
49 49
 				to_yield = rollback.pop(0)
50 50
 			else:
51
-				to_yield = iter_.next()
51
+				to_yield = next(iter_)
52 52
 
53 53
 
54 54
 			result = (yield to_yield)
... ...
@@ -64,5 +64,5 @@ if __name__ == '__main__':
64 64
 	parser.add_argument('host', metavar='HOST')
65 65
 	args = parser.parse_args(sys.argv[1:])
66 66
 
67
-	print args
67
+	print(args)
68 68
 	server = main(args.host, args.path)
... ...
@@ -1,3 +1,4 @@
1
+from __future__ import print_function
1 2
 #
2 3
 #  Copyright (c) 2011 Edward Langley
3 4
 #  All rights reserved.
... ...
@@ -40,14 +41,14 @@ from jsonrpc.server import ServerEvents, JSON_RPC
40 41
 class ExampleServer(ServerEvents):
41 42
 	# inherited hooks
42 43
 	def log(self, responses, txrequest, error):
43
-		print txrequest.code,
44
+		print(txrequest.code, end=' ')
44 45
 		if isinstance(responses, list):
45 46
 			for response in responses:
46 47
 				msg = self._get_msg(response)
47
-				print txrequest, msg
48
+				print(txrequest, msg)
48 49
 		else:
49 50
 			msg = self._get_msg(responses)
50
-			print txrequest, msg
51
+			print(txrequest, msg)
51 52
 
52 53
 	def findmethod(self, method):
53 54
 		if method in self.methods:
... ...
@@ -72,6 +73,6 @@ site = server.Site(root)
72 73
 
73 74
 # 8007 is the port you want to run under. Choose something >1024
74 75
 PORT = 8007
75
-print 'Listening on port %d...' % PORT
76
+print('Listening on port %d...' % PORT)
76 77
 reactor.listenTCP(PORT, site)
77 78
 reactor.run()
... ...
@@ -1,3 +1,4 @@
1
+from __future__ import print_function
1 2
 #  
2 3
 #  Copyright (c) 2011 Edward Langley
3 4
 #  All rights reserved.