From 1683df0cf8c0b75267a2cb3761a06f095551f4d0 Mon Sep 17 00:00:00 2001 From: NeroBurner Date: Thu, 17 Sep 2015 13:33:19 +0200 Subject: [PATCH] handle Queue --- fdroidserver/common.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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) -- 2.30.2