From: Daniel Martí Date: Mon, 4 Jan 2016 16:19:28 +0000 (+0100) Subject: Remove import workarounds for Python2 X-Git-Tag: 0.7.0~86^2~38 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=099b45fcca79cc4677f6f4c0bfb05b79072420f8;p=fdroidserver.git Remove import workarounds for Python2 --- diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 46baf560..623d1ab2 100644 --- 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