Skip to content

Commit 486be44

Browse files
committed
Remove cocoapods try/except blocks and update code and tests #143
Reference: #143 Signed-off-by: John M. Horan <johnmhoran@gmail.com>
1 parent aee327c commit 486be44

2 files changed

Lines changed: 4 additions & 25 deletions

File tree

src/packageurl/contrib/purl2url.py

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2222
# SOFTWARE.
2323

24-
# Visit https://github.com/package-url/packageurl-python for support and
25-
# download.
26-
2724

2825
from packageurl import PackageURL
2926
from packageurl.contrib.route import NoRouteAvailable
@@ -76,12 +73,7 @@ def get_download_url(purl):
7673
return download_url
7774

7875
# Fallback on the `download_url` qualifier when available.
79-
purl_data = None
80-
try:
81-
purl_data = PackageURL.from_string(purl)
82-
except Exception as e:
83-
print(f"An error occurred in get_download_url(): {e}")
84-
return
76+
purl_data = PackageURL.from_string(purl)
8577
return purl_data.qualifiers.get("download_url", None)
8678

8779

@@ -315,18 +307,9 @@ def build_cocoapods_repo_url(purl):
315307
"""
316308
Return a CocoaPods repo URL from the `purl` string.
317309
"""
318-
purl_data = None
319-
name = None
320-
try:
321-
purl_data = PackageURL.from_string(purl)
322-
name = purl_data.name
323-
except Exception as e:
324-
print(f"An error occurred in build_cocoapods_repo_url(): {e}")
325-
return
326-
327-
if not name:
328-
return
329-
return f"https://cocoapods.org/pods/{name}"
310+
purl_data = PackageURL.from_string(purl)
311+
name = purl_data.name
312+
return name and f"https://cocoapods.org/pods/{name}"
330313

331314

332315
# Download URLs:

tests/contrib/test_purl2url.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2222
# SOFTWARE.
2323

24-
# Visit https://github.com/package-url/packageurl-python for support and
25-
# download.
2624

2725
import pytest
2826

@@ -66,7 +64,6 @@ def test_purl2url_get_repo_url():
6664
"pkg:golang/gopkg.in/ldap.v3@v3.1.0": "https://pkg.go.dev/gopkg.in/ldap.v3@v3.1.0",
6765
"pkg:cocoapods/AFNetworking@4.0.1": "https://cocoapods.org/pods/AFNetworking",
6866
"pkg:cocoapods/MapsIndoors@3.24.0": "https://cocoapods.org/pods/MapsIndoors",
69-
"pkg:cocoapods/": None,
7067
}
7168

7269
for purl, url in purls_url.items():
@@ -141,7 +138,6 @@ def test_purl2url_get_inferred_urls():
141138
"https://pypi.org/project/sortedcontainers/2.4.0/"
142139
],
143140
"pkg:cocoapods/AFNetworking@4.0.1": ["https://cocoapods.org/pods/AFNetworking"],
144-
"pkg:cocoapods/": [],
145141
"pkg:composer/psr/log@1.1.3": ["https://packagist.org/packages/psr/log#1.1.3"],
146142
"pkg:rubygems/package-name": ["https://rubygems.org/gems/package-name"],
147143
"pkg:bitbucket/birkenfeld": [],

0 commit comments

Comments
 (0)