From 95c2d3953ebc6c64cbe4ff243704ea7855338508 Mon Sep 17 00:00:00 2001 From: waaagh Date: Thu, 27 Jul 2023 12:18:25 +0000 Subject: [PATCH] fix bad require format Signed-off-by: waaagh --- pyporter/utils.py | 6 +++--- tests/test_transform_module_name.py | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pyporter/utils.py b/pyporter/utils.py index 0fa2346..7db69e1 100644 --- a/pyporter/utils.py +++ b/pyporter/utils.py @@ -23,11 +23,11 @@ import re # else: # return ns[0] - +# TODO: this should be more compatible for https://peps.python.org/pep-0508/ def transform_module_name(input_str): # Extracting the module name from the input string - module_name = re.match(r"([a-zA-Z0-9_-]+)", input_str).group(1) - version_names = input_str[len(module_name):] + module_name = re.match(r"([a-zA-Z0-9_-]+)", input_str).group(1).strip() + version_names = input_str[len(module_name):].strip() # Extracting the version constraint from the input string version_constraint = version_names.split(",") package_name = "python3-" + module_name diff --git a/tests/test_transform_module_name.py b/tests/test_transform_module_name.py index 765946e..c292b7d 100644 --- a/tests/test_transform_module_name.py +++ b/tests/test_transform_module_name.py @@ -14,6 +14,11 @@ class TestTransofrmModuleName(unittest.TestCase): expected_output = "(python3-pysocks<2.0 with python3-pysocks>=1.5.6)" self.assertEqual(transform_module_name(input_str), expected_output) + def test_transform_module_name_strip_whitespace(self): + input_str = "pyjwkest (>=1.3.6)" + expected_output = "(python3-pyjwkest(>=1.3.6))" + self.assertEqual(transform_module_name(input_str), expected_output) + if __name__ == '__main__': unittest.main() -- Gitee