alanorth/dspace-statistics-api
1
0
Fork 0
mirror of https://github.com/ilri/dspace-statistics-api.git synced 2024-11-22 14:25:01 +01:00
Code Releases Activity

dspace_statistics_api: Use f-strings instead of format()

Browse Source 
We had previously been avoiding the f-strings because we needed to
run on Python 3.5 and they were only available in Python 3.6+, but
now the black formatter requires Python 3.6 and all our systems are
running Python 3.6+ anyways.
This commit is contained in:
Alan Orth 2020-03-02 11:24:29 +02:00
parent 9e7dd28156
commit 0ef071a91d
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dspace_statistics_api/app.py
View File

@ -77,9 +77,7 @@ class ItemResource:
if cursor.rowcount == 0: if cursor.rowcount == 0:
raise falcon.HTTPNotFound( raise falcon.HTTPNotFound(
title="Item not found", title="Item not found",
description='The item with id "{}" was not found.'.format( description=f'The item with id "{str(item_id)}" was not found.',
str(item_id)
),
) )
else: else:
results = cursor.fetchone() results = cursor.fetchone()

4
dspace_statistics_api/database.py
View File

@ -15,9 +15,7 @@ class DatabaseManager:
"""Manage database connection.""" """Manage database connection."""
def __init__(self): def __init__(self):
self._connection_uri = "dbname={} user={} password={} host={} port={}".format( self._connection_uri = f"dbname={DATABASE_NAME} user={DATABASE_USER} password={DATABASE_PASS} host={DATABASE_HOST} port={DATABASE_PORT}"
DATABASE_NAME, DATABASE_USER, DATABASE_PASS, DATABASE_HOST, DATABASE_PORT
)
def __enter__(self): def __enter__(self):
try: try:

12
dspace_statistics_api/indexer.py
View File

@ -70,13 +70,13 @@ def get_statistics_shards():
if len(statistics_core_years) > 0: if len(statistics_core_years) > 0:
# Begin building a string of shards starting with the default one # Begin building a string of shards starting with the default one
shards = "{}/statistics".format(SOLR_SERVER) shards = f"{SOLR_SERVER}/statistics"
for core in statistics_core_years: for core in statistics_core_years:
# Create a comma-separated list of shards to pass to our Solr query # Create a comma-separated list of shards to pass to our Solr query
# #
# See: https://wiki.apache.org/solr/DistributedSearch # See: https://wiki.apache.org/solr/DistributedSearch
shards += ",{}/{}".format(SOLR_SERVER, core) shards += f",{SOLR_SERVER}/{core}"
# Return the string of shards, which may actually be empty. Solr doesn't # Return the string of shards, which may actually be empty. Solr doesn't
# seem to mind if the shards query parameter is empty and I haven't seen # seem to mind if the shards query parameter is empty and I haven't seen
@ -134,9 +134,7 @@ def index_views():
while results_current_page <= results_num_pages: while results_current_page <= results_num_pages:
# "pages" are zero based, but one based is more human readable # "pages" are zero based, but one based is more human readable
print( print(
"Indexing item views (page {} of {})".format( f"Indexing item views (page {results_current_page + 1} of {results_num_pages + 1})"
results_current_page + 1, results_num_pages + 1
)
) )
solr_query_params = { solr_query_params = {
@ -219,9 +217,7 @@ def index_downloads():
while results_current_page <= results_num_pages: while results_current_page <= results_num_pages:
# "pages" are zero based, but one based is more human readable # "pages" are zero based, but one based is more human readable
print( print(
"Indexing item downloads (page {} of {})".format( f"Indexing item downloads (page {results_current_page + 1} of {results_num_pages + 1})"
results_current_page + 1, results_num_pages + 1
)
) )
solr_query_params = { solr_query_params = {