Skip to content

Commit 84d3e24

Browse files
committed
conflicts resolved
1 parent 162c67c commit 84d3e24

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

google_custom_search/google_scratcher.py

-2
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,7 @@ def get_license_list():
6565
"""
6666
# Read license data from file
6767
cc_license_data = pd.read_csv(
68-
6968
f"{PATH_REPO_ROOT}/legal-tool-paths.txt", header=None
70-
7169
)
7270
# Define regex pattern to extract license types
7371
license_pattern = r"((?:[^/]+/){2}(?:[^/]+)).*"

wikipedia/wikipedia_scratcher.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def get_response_elems(language="en"):
101101
search_data_dict = search_data["query"]["statistics"]
102102
search_data_dict["language"] = language
103103
return search_data_dict
104-
104+
105105
except requests.HTTPError as e:
106106
LOGGER.error(f"HTTP Error: {e}")
107107
raise

0 commit comments

Comments
 (0)