chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0e07674
)
handle Queue
author
NeroBurner
<pyro4hell@gmail.com>
Thu, 17 Sep 2015 11:33:19 +0000
(13:33 +0200)
committer
Daniel MartÃ
<mvdan@mvdan.cc>
Tue, 29 Dec 2015 19:11:47 +0000
(20:11 +0100)
fdroidserver/common.py
patch
|
blob
|
history
diff --git
a/fdroidserver/common.py
b/fdroidserver/common.py
index 272284cf37312d7cc1a86541c7d4392d6eae777f..7666a1adf41225c9783f70e5c2c4acf7d122a769 100644
(file)
--- a/
fdroidserver/common.py
+++ b/
fdroidserver/common.py
@@
-29,12
+29,18
@@
import stat
import subprocess
import time
import operator
import subprocess
import time
import operator
-import Queue
import logging
import hashlib
import socket
import xml.etree.ElementTree as XMLElementTree
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
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))
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)
stdout_reader = AsynchronousFileReader(p.stdout, stdout_queue)
# Check the queue for output (until there is no more to get)