Merge pull request #2062 from thomasgoirand/master

Python 3 compat

Author: xrmx

contrib/spoolqueue/tasks.py

@@ -1,11 +1,13 @@
+from __future__ import print_function
+
 from tasksconsumer import queueconsumer
 
 
 @queueconsumer('fast', 4)
 def fast_queue(arguments):
-    print "fast", arguments
+    print("fast", arguments)
 
 
 @queueconsumer('slow')
 def slow_queue(arguments):
-    print "foobar", arguments
+    print("foobar", arguments)

contrib/spoolqueue/tasksconsumer.py

@@ -1,7 +1,8 @@
 from uwsgidecorators import spool
-import Queue
 from threading import Thread
 
+from six.moves import queue
+
 queues = {}
 
 
@@ -10,7 +11,7 @@ class queueconsumer(object):
     def __init__(self, name, num=1, **kwargs):
         self.name = name
         self.num = num
-        self.queue = Queue.Queue()
+        self.queue = queue.Queue()
         self.threads = []
         self.func = None
         queues[self.name] = self
@@ -19,7 +20,7 @@ def __init__(self, name, num=1, **kwargs):
     def consumer(self):
         while True:
             req = self.queue.get()
-            print req
+            print(req)
             self.func(req)
             self.queue.task_done()
 

contrib/uwsgi-cache-monitor.py

@@ -1,3 +1,5 @@
+from __future__ import print_function
+
 import mmap
 import os
 import struct

examples/bootstrap5.py

@@ -1,3 +1,3 @@
 import uwsgi
 
-print uwsgi.extract("data://0")
+print(uwsgi.extract("data://0"))

examples/mjpeg_stream.py

@@ -17,7 +17,7 @@ def application(env, start_response):
 
     while 1:
         yield "Content-Type: image/jpeg\r\n\r\n"
-        print subprocess.call('screencapture -t jpg -m -T 1 screenshot.jpg', shell=True)
+        print(subprocess.call('screencapture -t jpg -m -T 1 screenshot.jpg', shell=True))
         f = open('screenshot.jpg')
         yield env['wsgi.file_wrapper'](f)
         yield "\r\n--%s\r\n" % boundary

examples/simple_app.py

@@ -10,14 +10,14 @@ def ciao():
 
 def ciao2():
     print("nuovo uwsgi_server")
-    print os.getpid()
+    print(os.getpid())
 
 counter = 0
 
 #if uwsgi.load_plugin(0, 'plugins/example/example_plugin.so', 'ciao'):
-#    print "example plugin loaded"
+#    print("example plugin loaded")
 #else:
-#    print "unable to load example plugin"
+#    print("unable to load example plugin")
 
 #uwsgi.event_add(uwsgi.EVENT_FILE, "/tmp", ciao)
 #uwsgi.event_add(uwsgi.EVENT_DNSSD, "_uwsgi._tcp", ciao2)

examples/simple_app_wsgi2.py

@@ -1,6 +1,7 @@
+from six.moves import range
 
 def mygen(uri):
-    for i in xrange(1, 100):
+    for i in range(1, 100):
         yield "ciao %s<br/>" % uri
 
 

examples/taskqueue.py

@@ -1,7 +1,9 @@
-import Queue
 from threading import Thread
 import uwsgi
 
+from six.moves import queue
+
+
 CONSUMERS = 4
 
 
@@ -15,7 +17,7 @@ def consumer(q):
 
 def spawn_consumers():
     global q
-    q = Queue.Queue()
+    q = queue.Queue()
     for i in range(CONSUMERS):
         t = Thread(target=consumer, args=(q,))
         t.daemon = True

examples/uwsgirouter.py

@@ -11,13 +11,13 @@ def application(env, start_response):
 
     # has timed out ?
     if env['x-wsgiorg.fdevent.timeout']:
-        print "connection timed out !!!"
+        print("connection timed out !!!")
         uwsgi.close(fd)
         raise StopIteration
 
     # connection refused ?
     if not uwsgi.is_connected(fd):
-        print "unable to connect"
+        print("unable to connect")
         uwsgi.close(fd)
         raise StopIteration
 
@@ -42,7 +42,7 @@ def application(env, start_response):
             bufsize = min(cl, 4096)
             yield uwsgi.wait_fd_read(input, 30)
             if env['x-wsgiorg.fdevent.timeout']:
-                print "connection timed out !!!"
+                print("connection timed out !!!")
                 uwsgi.close(fd)
                 raise StopIteration
             body = uwsgi.recv(input, bufsize)
@@ -57,7 +57,7 @@ def application(env, start_response):
 
     # has timed out ?
     if env['x-wsgiorg.fdevent.timeout']:
-        print "connection timed out !!!"
+        print("connection timed out !!!")
         uwsgi.close(fd)
         raise StopIteration
 
@@ -68,7 +68,7 @@ def application(env, start_response):
         # wait for response
         yield uwsgi.wait_fd_read(fd, 30)
         if env['x-wsgiorg.fdevent.timeout']:
-            print "connection timed out !!!"
+            print("connection timed out !!!")
             uwsgi.close(fd)
             raise StopIteration
         data = uwsgi.recv(fd)

examples/uwsgirouter3.py

@@ -9,10 +9,10 @@ def application(e, s):
     global current_node
 
     nodes = uwsgi.cluster_nodes()
-    print nodes
+    print(nodes)
 
     if len(nodes) == 0:
-        print "no cluster node available"
+        print("no cluster node available")
         raise StopIteration
 
     if current_node >= len(nodes):