start UP031 by fixing simple %s strings

Author: RayBB

openlibrary/accounts/__init__.py

@@ -16,7 +16,7 @@ def get_group(name):
     """
     Returns the group named 'name'.
     """
-    return web.ctx.site.get("/usergroup/%s" % name)
+    return web.ctx.site.get(f"/usergroup/{name}")
 
 
 class RunAs:

openlibrary/accounts/model.py

@@ -102,7 +102,7 @@ def generate_uuid():
 
 def send_verification_email(username, email):
     """Sends account verification email."""
-    key = "account/%s/verify" % username
+    key = f"account/{username}/verify"
 
     doc = create_link_doc(key, username, email)
     web.ctx.site.store[key] = doc
@@ -288,14 +288,14 @@ def get_creation_info(self):
         return doc.get_creation_info()
 
     def get_activation_link(self):
-        key = "account/%s/verify" % self.username
+        key = f"account/{self.username}/verify"
         if doc := web.ctx.site.store.get(key):
             return Link(doc)
         else:
             return False
 
     def get_password_reset_link(self):
-        key = "account/%s/password" % self.username
+        key = f"account/{self.username}/password"
         if doc := web.ctx.site.store.get(key):
             return Link(doc)
         else:
@@ -466,7 +466,7 @@ def create(
             raise ValueError('something_went_wrong')
 
         if verified:
-            key = "account/%s/verify" % username
+            key = f"account/{username}/verify"
             doc = create_link_doc(key, username, email)
             web.ctx.site.store[key] = doc
             web.ctx.site.activate_account(username=username)
@@ -583,7 +583,7 @@ def link(self, itemname):
         """Careful, this will save any other changes to the ol user object as
         well
         """
-        itemname = itemname if itemname.startswith('@') else '@%s' % itemname
+        itemname = itemname if itemname.startswith('@') else f'@{itemname}'
 
         _ol_account = web.ctx.site.store.get(self._key)
         _ol_account['internetarchive_itemname'] = itemname

openlibrary/admin/numbers.py

@@ -37,12 +37,12 @@ class NoStats(TypeError):
 def query_single_thing(db, typ, start, end):
     "Query the counts a single type from the things table"
     q1 = "SELECT id as id from thing where key=$typ"
-    typ = '/type/%s' % typ
+    typ = f'/type/{typ}'
     result = db.query(q1, vars=locals())
     try:
         kid = result[0].id
     except IndexError:
-        raise InvalidType("No id for type '/type/%s in the database" % typ)
+        raise InvalidType(f"No id for type '/type/{typ} in the database")
     q2 = (
         "select count(*) as count from thing where type=%d and created >= '%s' and created < '%s'"
         % (kid, start, end)
@@ -77,11 +77,8 @@ def admin_range__human_edits(**kargs):
         end = kargs['end'].strftime("%Y-%m-%d %H:%M:%S")
         db = kargs['thingdb']
     except KeyError as k:
-        raise TypeError("%s is a required argument for admin_range__human_edits" % k)
-    q1 = (
-        "SELECT count(*) AS count FROM transaction WHERE created >= '%s' and created < '%s'"
-        % (start, end)
-    )
+        raise TypeError(f"{k} is a required argument for admin_range__human_edits")
+    q1 = f"SELECT count(*) AS count FROM transaction WHERE created >= '{start}' and created < '{end}'"
     result = db.query(q1)
     total_edits = result[0].count
     q1 = (
@@ -103,7 +100,7 @@ def admin_range__bot_edits(**kargs):
         end = kargs['end'].strftime("%Y-%m-%d %H:%M:%S")
         db = kargs['thingdb']
     except KeyError as k:
-        raise TypeError("%s is a required argument for admin_range__bot_edits" % k)
+        raise TypeError(f"{k} is a required argument for admin_range__bot_edits")
     q1 = (
         "SELECT count(*) AS count FROM transaction t, version v WHERE "
         f"v.transaction_id=t.id AND t.created >= '{start}' and t.created < '{end}' AND "
@@ -121,11 +118,8 @@ def admin_range__covers(**kargs):
         end = kargs['end'].strftime("%Y-%m-%d %H:%M:%S")
         db = kargs['coverdb']
     except KeyError as k:
-        raise TypeError("%s is a required argument for admin_range__covers" % k)
-    q1 = (
-        "SELECT count(*) as count from cover where created>= '%s' and created < '%s'"
-        % (start, end)
-    )
+        raise TypeError(f"{k} is a required argument for admin_range__covers")
+    q1 = f"SELECT count(*) as count from cover where created>= '{start}' and created < '{end}'"
     result = db.query(q1)
     count = result[0].count
     return count
@@ -151,7 +145,7 @@ def admin_range__loans(**kargs):
         start = kargs['start']
         end = kargs['end']
     except KeyError as k:
-        raise TypeError("%s is a required argument for admin_total__ebooks" % k)
+        raise TypeError(f"{k} is a required argument for admin_total__ebooks")
     result = db.query(
         "SELECT count(*) as count FROM stats"
         " WHERE type='loan'"
@@ -177,7 +171,7 @@ def admin_total__lists(**kargs):
     try:
         db = kargs['thingdb']
     except KeyError as k:
-        raise TypeError("%s is a required argument for admin_total__lists" % k)
+        raise TypeError(f"{k} is a required argument for admin_total__lists")
     # Computing total number of lists
     q1 = "SELECT id as id from thing where key='/type/list'"
     result = db.query(q1)

openlibrary/catalog/add_book/__init__.py

@@ -87,7 +87,7 @@ def __init__(self, f):
         self.f = f
 
     def __str__(self):
-        return "coverstore responded with: '%s'" % self.f
+        return f"coverstore responded with: '{self.f}'"
 
 
 class RequiredField(Exception):
@@ -380,7 +380,7 @@ def create_ol_subjects_for_ocaid(ocaid, subjects):
     if r.status_code != 200:
         return f'{item.identifier} failed: {r.content}'
     else:
-        return "success for %s" % item.identifier
+        return f"success for {item.identifier}"
 
 
 def update_ia_metadata_for_ol_edition(edition_id):
@@ -395,7 +395,7 @@ def update_ia_metadata_for_ol_edition(edition_id):
 
     data = {'error': 'No qualifying edition'}
     if edition_id:
-        ed = web.ctx.site.get('/books/%s' % edition_id)
+        ed = web.ctx.site.get(f'/books/{edition_id}')
         if ed.ocaid:
             work = ed.works[0] if ed.get('works') else None
             if work and work.key:

openlibrary/code.py

@@ -31,7 +31,7 @@ def setup():
 
     for p in old_plugins:
         logger.info("loading plugin %s", p)
-        modname = "openlibrary.plugins.%s.code" % p
+        modname = f"openlibrary.plugins.{p}.code"
         path = "openlibrary/plugins/" + p
         template.load_templates(path, lazy=True)
         macro.load_macros(path, lazy=True)

openlibrary/core/ia.py

@@ -35,7 +35,7 @@ def get_api_response(url: str, params: dict | None = None) -> dict:
         else:
             logger.info(f'{r.status_code} response received from {url}')
     except Exception as e:
-        logger.exception('Exception occurred accessing %s.' % url)
+        logger.exception(f'Exception occurred accessing {url}.')
     stats.end()
     return api_response
 
@@ -124,7 +124,7 @@ def get_cover_url(item_id):
 
 
 def get_item_manifest(item_id, item_server, item_path):
-    url = 'https://%s/BookReader/BookReaderJSON.php' % item_server
+    url = f'https://{item_server}/BookReader/BookReaderJSON.php'
     url += f'?itemPath={item_path}&itemId={item_id}&server={item_server}'
     return get_api_response(url)
 

openlibrary/core/lending.py

@@ -176,7 +176,7 @@ def compose_ia_url(
         sorts = ['']
     for sort in sorts:
         params.append(('sort[]', sort))
-    base_url = "http://%s/advancedsearch.php" % config_bookreader_host
+    base_url = f"http://{config_bookreader_host}/advancedsearch.php"
     return base_url + '?' + urlencode(params)
 
 
@@ -286,11 +286,11 @@ def get_available(
         for item in items:
             if item.get('openlibrary_work'):
                 results[item['openlibrary_work']] = item['openlibrary_edition']
-        books = web.ctx.site.get_many(['/books/%s' % olid for olid in results.values()])
+        books = web.ctx.site.get_many([f'/books/{olid}' for olid in results.values()])
         books = add_availability(books)
         return books
     except Exception:  # TODO: Narrow exception scope
-        logger.exception("get_available(%s)" % url)
+        logger.exception(f"get_available({url})")
         return {'error': 'request_timeout'}
 
 
@@ -566,12 +566,12 @@ def is_loaned_out_on_acs4(identifier: str) -> bool:
 
 def is_loaned_out_on_ia(identifier: str) -> bool | None:
     """Returns True if the item is checked out on Internet Archive."""
-    url = "https://archive.org/services/borrow/%s?action=status" % identifier
+    url = f"https://archive.org/services/borrow/{identifier}?action=status"
     try:
         response = requests.get(url).json()
         return response and response.get('checkedout')
     except Exception:  # TODO: Narrow exception scope
-        logger.exception("is_loaned_out_on_ia(%s)" % identifier)
+        logger.exception(f"is_loaned_out_on_ia({identifier})")
         return None
 
 
@@ -607,12 +607,12 @@ def get_loan(identifier, user_key=None):
     try:
         _loan = _get_ia_loan(identifier, account and userkey2userid(account.username))
     except Exception:  # TODO: Narrow exception scope
-        logger.exception("get_loan(%s) 1 of 2" % identifier)
+        logger.exception(f"get_loan({identifier}) 1 of 2")
 
     try:
         _loan = _get_ia_loan(identifier, account and account.itemname)
     except Exception:  # TODO: Narrow exception scope
-        logger.exception("get_loan(%s) 2 of 2" % identifier)
+        logger.exception(f"get_loan({identifier}) 2 of 2")
 
     return _loan
 

openlibrary/core/models.py

@@ -295,7 +295,7 @@ def get_ebook_info(self):
                 d['borrowed'] = doc.get("borrowed") == "true"
                 d['daisy_only'] = False
             elif 'printdisabled' not in collections:
-                d['read_url'] = "https://archive.org/stream/%s" % self.ocaid
+                d['read_url'] = f"https://archive.org/stream/{self.ocaid}"
                 d['daisy_only'] = False
         return d
 
@@ -415,7 +415,7 @@ def from_isbn(
             if book_id == asin:
                 query = {"type": "/type/edition", 'identifiers': {'amazon': asin}}
             else:
-                query = {"type": "/type/edition", 'isbn_%s' % len(book_id): book_id}
+                query = {"type": "/type/edition", f'isbn_{len(book_id)}': book_id}
 
             if matches := web.ctx.site.things(query):
                 return web.ctx.site.get(matches[0])
@@ -841,12 +841,12 @@ def get_username(self):
         return self.key.split("/")[-1]
 
     def preferences(self):
-        key = "%s/preferences" % self.key
+        key = f"{self.key}/preferences"
         prefs = web.ctx.site.get(key)
         return (prefs and prefs.dict().get('notifications')) or self.DEFAULT_PREFERENCES
 
     def save_preferences(self, new_prefs, msg='updating user preferences'):
-        key = '%s/preferences' % self.key
+        key = f'{self.key}/preferences'
         old_prefs = web.ctx.site.get(key)
         prefs = (old_prefs and old_prefs.dict()) or {
             'key': key,
@@ -859,7 +859,7 @@ def save_preferences(self, new_prefs, msg='updating user preferences'):
 
     def is_usergroup_member(self, usergroup):
         if not usergroup.startswith('/usergroup/'):
-            usergroup = '/usergroup/%s' % usergroup
+            usergroup = f'/usergroup/{usergroup}'
         return usergroup in [g.key for g in self.usergroups]
 
     def is_subscribed_user(self, username):
@@ -914,7 +914,7 @@ def get_lists(self, seed=None, limit=100, offset=0, sort=True):
     # @cache.memoize(engine="memcache", key="user-avatar")
     def get_avatar_url(cls, username):
         username = username.split('/people/')[-1]
-        user = web.ctx.site.get('/people/%s' % username)
+        user = web.ctx.site.get(f'/people/{username}')
         itemname = user.get_account().get('internetarchive_itemname')
 
         return f'https://archive.org/services/img/{itemname}'
@@ -1041,7 +1041,7 @@ def render_link(self, cls=None):
         """
         extra_attrs = ''
         if cls:
-            extra_attrs += 'class="%s" ' % cls
+            extra_attrs += f'class="{cls}" '
         # Why nofollow?
         return f'<a rel="nofollow" href="{self.key}" {extra_attrs}>{web.net.htmlquote(self.displayname)}</a>'
 
@@ -1058,7 +1058,7 @@ def from_key(cls, key: str):
         :rtype: UserGroup | None
         """
         if not key.startswith('/usergroup/'):
-            key = "/usergroup/%s" % key
+            key = f"/usergroup/{key}"
         return web.ctx.site.get(key)
 
     def add_user(self, userkey: str) -> None:

openlibrary/core/stats.py

@@ -48,7 +48,7 @@ def increment(key, n=1, rate=1.0):
     "Increments the value of ``key`` by ``n``"
     global client
     if client:
-        pystats_logger.debug("Incrementing %s" % key)
+        pystats_logger.debug(f"Incrementing {key}")
         for i in range(n):
             try:
                 client.increment(key, sample_rate=rate)

openlibrary/core/vendors.py

@@ -247,7 +247,7 @@ def serialize(product: Any) -> dict:
             'url': "https://www.amazon.com/dp/{}/?tag={}".format(
                 product.asin, h.affiliate_id('amazon')
             ),
-            'source_records': ['amazon:%s' % product.asin],
+            'source_records': [f'amazon:{product.asin}'],
             'isbn_10': [product.asin] if asin_is_isbn10 else [],
             'isbn_13': [isbn_13] if isbn_13 else [],
             'price': price and price.display_amount,