More rename, more -python2

jellypy/lock.py

@@ -14,19 +14,11 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with Tautulli.  If not, see <http://www.gnu.org/licenses/>.
-
-from __future__ import unicode_literals
-from future.builtins import object
-
-import future.moves.queue as queue
-import time
+import queue
 import threading
+import time
 
-import jellypy
-if jellypy.PYTHON2:
-    import logger
-else:
-    from jellypy import logger
+from jellypy import logger
 
 
 class TimedLock(object):