#533 - AbcTK now uses requests library for all http request

chinyeungli · chinyeungli · commit 0c54f5c04ba9 · 2023-09-05T07:27:49.000+08:00
Signed-off-by: Chin Yeung Li &lt;tli@nexb.com&gt;
diff --git a/src/attributecode/api.py b/src/attributecode/api.py
@@ -54,9 +54,6 @@ def request_license_data(api_url, api_key, license_key):
     license_data = {}
     errors = []
     try:
-        # request = Request(quoted_url, headers=headers)
-        # response = urlopen(request)
-        # response_content = response.read().decode('utf-8')
         response = get(quoted_url, headers=headers)
         response_content = response.text
         # FIXME: this should be an ordered dict
diff --git a/src/attributecode/model.py b/src/attributecode/model.py
@@ -31,12 +31,8 @@
 import traceback
 from itertools import zip_longest
 
-import urllib
 from urllib.parse import urljoin
 from urllib.parse import urlparse
-from urllib.request import urlopen
-from urllib.request import Request
-from urllib.error import HTTPError
 
 from license_expression import Licensing
 from packageurl import PackageURL
@@ -1828,15 +1824,14 @@ def pre_process_and_fetch_license_dict(abouts, from_check=False, api_url=None, a
                             license_url = url + lic_key + '.json'
                             license_text_url = url + lic_key + '.LICENSE'
                             try:
-                                json_url = urlopen(license_url)
-                                # We don't want to actually get the license information from the
-                                # check utility
+                                json_url_content = get(license_url).text
+                                # We don't want to actually get the license
+                                # information from the check utility
                                 if from_check:
                                     continue
-                                data = json.loads(json_url.read())
+                                data = json.loads(json_url_content)
                                 license_name = data['short_name']
-                                license_text = urllib.request.urlopen(
-                                    license_text_url).read().decode('utf-8')
+                                license_text = get(license_text_url).text
                                 license_filename = data['key'] + '.LICENSE'
                                 lic_url = url + license_filename
                                 spdx_license_key = data['spdx_license_key']
diff --git a/tests/test_api.py b/tests/test_api.py
@@ -75,7 +75,7 @@ def test_api_request_license_data_without_result(self, mock_data):
         expected = ({}, [Error(ERROR, "Invalid 'license': apache-2.0")])
         assert expected == license_data
 
-    @mock.patch.object(api, 'urlopen')
+    @mock.patch.object(api, 'get')
     def test_api_request_license_data_with_incorrect_url(self, mock_data):
         # Some URL that is accessible but not a correct API URL
         response_content = b'<html></html>'
