Merge pull request #1392 from yuvipanda/no-urlopen

Author: minrk

repo2docker/contentproviders/doi.py

@@ -29,19 +29,6 @@ def _request(self, url, **kwargs):
 
     urlopen = _request
 
-    def _urlopen(self, req, headers=None):
-        """A urlopen() helper"""
-        # someone passed a string, not a request
-        if not isinstance(req, request.Request):
-            req = request.Request(req)
-
-        req.add_header("User-Agent", f"repo2docker {__version__}")
-        if headers is not None:
-            for key, value in headers.items():
-                req.add_header(key, value)
-
-        return request.urlopen(req)
-
     def doi2url(self, doi):
         # Transform a DOI to a URL
         # If not a doi, assume we have a URL and return

tests/unit/contentproviders/test_figshare.py

@@ -129,7 +129,6 @@ def test_fetch_zip(requests_mock):
         )
         requests_mock.get(f"file://{fig_path}", content=open(fig_path, "rb").read())
 
-        # with patch.object(Figshare, "urlopen", new=mock_urlopen):
         with TemporaryDirectory() as d:
             output = []
             for l in test_fig.fetch(test_spec, d):

tests/unit/contentproviders/test_swhid.py

@@ -56,11 +56,6 @@ def test_detect(swhid, expected):
     assert provider.detect(swhid) == expected
 
 
-def fake_urlopen(req):
-    print(req)
-    return req.headers
-
-
 def test_unresolving_swhid():
     provider = Swhid()