diff --git a/.gitignore b/.gitignore index 339dca50..c814d0a9 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,6 @@ tcl # Ignore Jupyter Notebook related temp files .ipynb_checkpoints/ + +# Env Files +.env \ No newline at end of file diff --git a/minecode/debutils.py b/minecode/debutils.py index 64c50ab5..8493f2d4 100644 --- a/minecode/debutils.py +++ b/minecode/debutils.py @@ -8,7 +8,6 @@ # - def parse_email(text): """ Return a tuple of (name, email) extracted from a `text` string. @@ -17,12 +16,10 @@ def parse_email(text): if not text: return None, None name, _, email = text.partition('<') + email = email.strip('>') name = name.strip() email = email.strip() - if not email: - return name, email - email.strip('>') - return name, email + return name or None, email or None def comma_separated(text): diff --git a/minecode/mappers/debian.py b/minecode/mappers/debian.py index 10bcfa88..8947e458 100644 --- a/minecode/mappers/debian.py +++ b/minecode/mappers/debian.py @@ -21,14 +21,14 @@ from minecode import map_router from minecode.mappers import Mapper from minecode.utils import form_vcs_url -# from minecode import debutils - +from minecode import debutils logger = logging.getLogger(__name__) handler = logging.StreamHandler() logger.addHandler(handler) logger.setLevel(logging.INFO) + # FIXME: We are not returning download URLs. Returned information is incorrect @@ -346,6 +346,7 @@ def parse_packages(metadata, purl=None): package.set_purl(purl) yield package + ################################################################################# # FIXME: this cannot work since we do not fetch these yet AND what are the zip jar and gz in this??? ################################################################################# diff --git a/minecode/tests/test_debian.py b/minecode/tests/test_debian.py index 54c3a117..f9142640 100644 --- a/minecode/tests/test_debian.py +++ b/minecode/tests/test_debian.py @@ -102,22 +102,29 @@ def test_parse_deb822_dsc(self): result = debcon.get_paragraph_data_from_file(dsc_file) expected_loc = self.get_test_loc('debian/debutils/3dldf_2.0.3+dfsg-2.dsc-expected') self.check_expected_deb822(result, expected_loc, regen=False) + ################################################################# - @expectedFailure def test_parse_email(self): content = 'Debian TeX Maintainers ' name, email = debutils.parse_email(content) self.assertEquals('Debian TeX Maintainers', name) self.assertEquals('debian-tex-maint@lists.debian.org', email) - @expectedFailure def test_parse_email_2(self): - content = 'Debian TeX Maintainers ' + # Space left Purposefully + content = ' Debian TeX Maintainers ' name, email = debutils.parse_email(content) self.assertEquals('Debian TeX Maintainers', name) self.assertEquals(None, email) + def test_parse_email_3(self): + # Space left Purposefully + content = '< debian-tex-maint@lists.debian.org >' + name, email = debutils.parse_email(content) + self.assertEquals(None, name) + self.assertEquals("debian-tex-maint@lists.debian.org", email) + def test_comma_separated(self): tags = 'implemented-in::perl, role::program, use::converting, works-with::pim' result = list(debutils.comma_separated(tags))