alanorth/dspace-statistics-api
1
0
Fork 0
mirror of https://github.com/ilri/dspace-statistics-api.git synced 2025-05-08 22:26:04 +02: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
Download Patch File Download Diff File Expand all files Collapse all files

12
dspace_statistics_api/indexer.py
View File

@ -70,13 +70,13 @@ def get_statistics_shards():
if len(statistics_core_years) > 0:
# 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:
# Create a comma-separated list of shards to pass to our Solr query
#
# 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
# 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:
# "pages" are zero based, but one based is more human readable
print(
"Indexing item views (page {} of {})".format(
results_current_page + 1, results_num_pages + 1
)
f"Indexing item views (page {results_current_page + 1} of {results_num_pages + 1})"
)
solr_query_params = {
@ -219,9 +217,7 @@ def index_downloads():
while results_current_page <= results_num_pages:
# "pages" are zero based, but one based is more human readable
print(
"Indexing item downloads (page {} of {})".format(
results_current_page + 1, results_num_pages + 1
)
f"Indexing item downloads (page {results_current_page + 1} of {results_num_pages + 1})"
)
solr_query_params = {