From 96f4c4c3a2050b162e6c30fc0fcfd9d46aefe6b4 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 1 Apr 2019 15:20:08 +0530
Subject: [PATCH] py3: Port Queue in metadata sources

---
 src/calibre/ebooks/metadata/sources/amazon.py        | 5 ++++-
 src/calibre/ebooks/metadata/sources/covers.py        | 6 +-----
 src/calibre/ebooks/metadata/sources/douban.py        | 5 ++++-
 src/calibre/ebooks/metadata/sources/edelweiss.py     | 5 ++++-
 src/calibre/ebooks/metadata/sources/google_images.py | 5 ++++-
 src/calibre/ebooks/metadata/sources/identify.py      | 2 +-
 src/calibre/ebooks/metadata/sources/overdrive.py     | 5 ++++-
 src/calibre/ebooks/metadata/sources/ozon.py          | 5 ++++-
 8 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/calibre/ebooks/metadata/sources/amazon.py b/src/calibre/ebooks/metadata/sources/amazon.py
index 4b238d1f50..d89db95a56 100644
--- a/src/calibre/ebooks/metadata/sources/amazon.py
+++ b/src/calibre/ebooks/metadata/sources/amazon.py
@@ -7,7 +7,10 @@ import re
 import socket
 import time
 from functools import partial
-from Queue import Empty, Queue
+try:
+    from queue import Empty, Queue
+except ImportError:
+    from Queue import Empty, Queue
 from threading import Thread
 from urlparse import urlparse
 
diff --git a/src/calibre/ebooks/metadata/sources/covers.py b/src/calibre/ebooks/metadata/sources/covers.py
index d59ddf454c..b3e2e38d7c 100644
--- a/src/calibre/ebooks/metadata/sources/covers.py
+++ b/src/calibre/ebooks/metadata/sources/covers.py
@@ -8,7 +8,6 @@ __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
 import time
-from Queue import Queue, Empty
 from threading import Thread, Event
 from io import BytesIO
 
@@ -17,6 +16,7 @@ from calibre.ebooks.metadata.sources.base import create_log
 from calibre.ebooks.metadata.sources.prefs import msprefs
 from calibre.utils.img import save_cover_data_to, remove_borders_from_image, image_to_data, image_from_data
 from calibre.utils.imghdr import identify
+from polyglot.queue import Queue, Empty
 
 
 class Worker(Thread):
@@ -192,7 +192,3 @@ def download_cover(log,
     results.sort(key=keygen)
 
     return results[0] if results else None
-
-
-
-
diff --git a/src/calibre/ebooks/metadata/sources/douban.py b/src/calibre/ebooks/metadata/sources/douban.py
index 5248565b47..b358b17695 100644
--- a/src/calibre/ebooks/metadata/sources/douban.py
+++ b/src/calibre/ebooks/metadata/sources/douban.py
@@ -9,7 +9,10 @@ __docformat__ = 'restructuredtext en'
 
 import time
 from functools import partial
-from Queue import Queue, Empty
+try:
+    from queue import Empty, Queue
+except ImportError:
+    from Queue import Empty, Queue
 
 
 from calibre.ebooks.metadata import check_isbn
diff --git a/src/calibre/ebooks/metadata/sources/edelweiss.py b/src/calibre/ebooks/metadata/sources/edelweiss.py
index 79867ddcb7..5bc40a67d6 100644
--- a/src/calibre/ebooks/metadata/sources/edelweiss.py
+++ b/src/calibre/ebooks/metadata/sources/edelweiss.py
@@ -9,7 +9,10 @@ __docformat__ = 'restructuredtext en'
 
 import time, re
 from threading import Thread
-from Queue import Queue, Empty
+try:
+    from queue import Empty, Queue
+except ImportError:
+    from Queue import Empty, Queue
 
 from calibre import as_unicode, random_user_agent
 from calibre.ebooks.metadata import check_isbn
diff --git a/src/calibre/ebooks/metadata/sources/google_images.py b/src/calibre/ebooks/metadata/sources/google_images.py
index 39cd9d2197..93f53096f8 100644
--- a/src/calibre/ebooks/metadata/sources/google_images.py
+++ b/src/calibre/ebooks/metadata/sources/google_images.py
@@ -95,7 +95,10 @@ class GoogleImages(Source):
 
 
 def test():
-    from Queue import Queue
+    try:
+        from queue import Queue
+    except ImportError:
+        from Queue import Queue
     from threading import Event
     from calibre.utils.logging import default_log
     p = GoogleImages(None)
diff --git a/src/calibre/ebooks/metadata/sources/identify.py b/src/calibre/ebooks/metadata/sources/identify.py
index ca3f5b606e..4c9cd572c8 100644
--- a/src/calibre/ebooks/metadata/sources/identify.py
+++ b/src/calibre/ebooks/metadata/sources/identify.py
@@ -9,7 +9,6 @@ __docformat__ = 'restructuredtext en'
 
 import time, re
 from datetime import datetime
-from Queue import Queue, Empty
 from threading import Thread
 from io import BytesIO
 from operator import attrgetter
@@ -28,6 +27,7 @@ from calibre.utils.icu import lower
 from calibre.utils.date import UNDEFINED_DATE
 from calibre.utils.formatter import EvalFormatter
 from polyglot.builtins import iteritems, itervalues, unicode_type
+from polyglot.queue import Queue, Empty
 
 # Download worker {{{
 
diff --git a/src/calibre/ebooks/metadata/sources/overdrive.py b/src/calibre/ebooks/metadata/sources/overdrive.py
index 8b93f6c78b..5006d5fa3c 100755
--- a/src/calibre/ebooks/metadata/sources/overdrive.py
+++ b/src/calibre/ebooks/metadata/sources/overdrive.py
@@ -11,7 +11,10 @@ Fetch metadata using Overdrive Content Reserve
 '''
 import re, random, copy, json
 from threading import RLock
-from Queue import Queue, Empty
+try:
+    from queue import Empty, Queue
+except ImportError:
+    from Queue import Empty, Queue
 
 
 from calibre.ebooks.metadata import check_isbn
diff --git a/src/calibre/ebooks/metadata/sources/ozon.py b/src/calibre/ebooks/metadata/sources/ozon.py
index 0c167d90ac..9f33bd5e56 100644
--- a/src/calibre/ebooks/metadata/sources/ozon.py
+++ b/src/calibre/ebooks/metadata/sources/ozon.py
@@ -12,7 +12,10 @@ __docformat__ = 'restructuredtext en'
 # bitcoins to 1E6CRSLY1uNstcZjLYZBHRVs1CPKbdi4ep
 
 import re
-from Queue import Queue, Empty
+try:
+    from queue import Empty, Queue
+except ImportError:
+    from Queue import Empty, Queue
 
 from calibre import as_unicode, replace_entities
 from calibre.ebooks.metadata import check_isbn