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:
f1f5836
)
Remove import workarounds for Python2
author
Daniel Martí
<mvdan@mvdan.cc>
Mon, 4 Jan 2016 16:19:28 +0000
(17:19 +0100)
committer
Daniel Martí
<mvdan@mvdan.cc>
Thu, 10 Mar 2016 16:43:37 +0000
(16:43 +0000)
fdroidserver/common.py
patch
|
blob
|
history
diff --git
a/fdroidserver/common.py
b/fdroidserver/common.py
index 46baf560faf9d180424013a95c2881b40640260f..623d1ab28c02e5e71b9b4e6a8c14b84a46517c81 100644
(file)
--- a/
fdroidserver/common.py
+++ b/
fdroidserver/common.py
@@
-35,12
+35,7
@@
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 queue import Queue
from zipfile import ZipFile