Merge pull request #3598 from cclauss/docker_hack

Fix absolute import and bytes for Python 3

Author: cdrini

openlibrary/catalog/utils/query.py

@@ -70,7 +70,7 @@ def query(q):
     for i in range(20):
         try:
             ret = urlread(url)
-            while ret.startswith('canceling statement due to statement timeout'):
+            while ret.startswith(b'canceling statement due to statement timeout'):
                 ret = urlread(url)
             if not ret:
                 print('ret == None')

openlibrary/core/ia.py

@@ -16,7 +16,9 @@
 
 logger = logging.getLogger('openlibrary.ia')
 
-IA_BASE_URL = config.get('ia_base_url')
+# FIXME: We can't reference `config` in module scope like this; it will always be undefined!
+# See lending.py for an example of how to do it correctly.
+IA_BASE_URL = config.get('ia_base_url', 'https://archive.org')
 VALID_READY_REPUB_STATES = ['4', '19', '20', '22']
 
 

openlibrary/core/middleware.py

@@ -1,7 +1,7 @@
 """WSGI middleware used in Open Library.
 """
 import web
-from six import StringIO
+from six import BytesIO
 import gzip
 
 class GZipMiddleware:
@@ -23,7 +23,7 @@ def get_response_header(name, default=None):
             return default
 
         def compress(text, level=9):
-            f = StringIO()
+            f = BytesIO()
             gz = gzip.GzipFile(None, 'wb', level, fileobj=f)
             gz.write(text)
             gz.close()
@@ -41,6 +41,6 @@ def new_start_response(status, headers):
 
         data = self.app(environ, new_start_response)
         if response.compress:
-            return [compress("".join(data), 9)]
+            return [compress(b"".join(data), 9)]
         else:
             return data

openlibrary/plugins/upstream/code.py

@@ -1,19 +1,22 @@
 """Upstream customizations."""
 
+import datetime
+import hashlib
+import io
 import os.path
-import web
 import random
-import hashlib
-import datetime
+
+from six import PY3
+
+import web
 
 from infogami import config
 from infogami.infobase import client
 from infogami.utils import delegate, app, types
 from infogami.utils.view import public, safeint, render
+from infogami.utils.view import render_template  # noqa: F401 used for its side effects
 from infogami.utils.context import context
 
-from utils import render_template  # noqa: F401  render_template used for side effects
-
 from openlibrary import accounts
 
 from openlibrary.plugins.upstream import addbook, covers, merge_authors, models, utils
@@ -68,7 +71,8 @@ def static_url(path):
     """
     pardir = os.path.pardir
     fullpath = os.path.abspath(os.path.join(__file__, pardir, pardir, pardir, pardir, "static", path))
-    digest = hashlib.md5(open(fullpath).read()).hexdigest()
+    with io.open(fullpath, 'rb') as in_file:
+        digest = hashlib.md5(in_file.read()).hexdigest()
     return "/static/%s?v=%s" % (path, digest)
 
 class DynamicDocument:

openlibrary/plugins/upstream/utils.py

@@ -713,7 +713,7 @@ def get_donation_include(include):
     html = ''
     if include == 'true' and "dev" in web.ctx.features:
         try:
-            html += opener.open(url_banner_source + param, timeout=3).read()
+            html += opener.open(url_banner_source + param, timeout=3).read().decode("utf-8")
             # Donation banner is temporarily (Jan 2020) disabled on prod, but available on dev (so that it can be used
             # for testing). To avoid it appearing like it's working, display a warning if it loads correctly that it's
             # disabled on prod.

openlibrary/plugins/worksearch/subjects.py

@@ -16,8 +16,10 @@
 
 from openlibrary.core.models import Subject
 from openlibrary.core.lending import add_availability
+from openlibrary.plugins.worksearch.search import work_search
 from openlibrary.utils import str_to_key, finddict
 
+
 __all__ = [
     "SubjectEngine", "get_subject"
 ]
@@ -219,7 +221,6 @@ def get_subject(self, key, details=False, offset=0, limit=DEFAULT_RESULTS, sort=
         else:
             kw = {}
 
-        from search import work_search
         result = work_search(
             q, offset=offset, limit=limit, sort=sort, **kw)
         if not result:

openlibrary/solr/solrwriter.py

@@ -1,6 +1,5 @@
 """Interface to update solr.
 """
-import httplib
 import logging
 import re
 
@@ -28,7 +27,7 @@ def __init__(self, host, core=None):
 
     def get_conn(self):
         if self.conn is None:
-            self.conn = httplib.HTTPConnection(self.host)
+            self.conn = six.moves.http_client.HTTPConnection(self.host)
         return self.conn
 
     def request(self, xml):

scripts/new-solr-updater.py

@@ -175,7 +175,7 @@ def update_keys(keys):
     logger.debug("Args: %s" % str(args))
     update_work.load_configs(args.ol_url, args.config, 'default')
 
-    keys = (k for k in keys if k.count("/") == 2 and k.split("/")[1] in ["books", "authors", "works"])
+    keys = [k for k in keys if k.count("/") == 2 and k.split("/")[1] in ("books", "authors", "works")]
 
     count = 0
     for chunk in web.group(keys, 100):