From: NeroBurner <pyro4hell@gmail.com>
Date: Thu, 17 Sep 2015 11:33:19 +0000 (+0200)
Subject: handle Queue
X-Git-Tag: 0.6.0~41
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=1683df0cf8c0b75267a2cb3761a06f095551f4d0;p=fdroidserver.git

handle Queue
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 272284cf..7666a1ad 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -29,12 +29,18 @@ import stat
 import subprocess
 import time
 import operator
-import Queue
 import logging
 import hashlib
 import socket
 import xml.etree.ElementTree as XMLElementTree
 
+try:
+    # Python 2
+    from Queue import Queue
+except ImportError:
+    # Python 3
+    from queue import Queue
+
 from zipfile import ZipFile
 
 import metadata
@@ -1606,7 +1612,7 @@ def FDroidPopen(commands, cwd=None, output=True):
         raise BuildException("OSError while trying to execute " +
                              ' '.join(commands) + ': ' + str(e))
 
-    stdout_queue = Queue.Queue()
+    stdout_queue = Queue()
     stdout_reader = AsynchronousFileReader(p.stdout, stdout_queue)
 
     # Check the queue for output (until there is no more to get)