Fix parsing of git urls with egg before subdirectory (#518)

python-poetry · Jan 7, 2023 · 78f57f7 · 78f57f7
1 parent b22837e
commit 78f57f7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/src/poetry/core/vcs/git.py b/src/poetry/core/vcs/git.py
@@ -29,11 +29,11 @@
         rf"(?P<pathname>[:/\\]({PATH}[/\\])?"
         rf"((?P<name>{NAME}?)(\.git|[/\\])?)?)"
         r"(?:"
-        r"#egg=?.+"
-        r"|"
         rf"#(?:egg=.+?&subdirectory=|subdirectory=)(?P<subdirectory>{SUBDIR})"
         r"|"
-        rf"[@#](?P<rev>{REV})(?:[&#](?:egg=.+?|(?:egg=.+?&subdirectory=|subdirectory=)(?P<rev_subdirectory>{SUBDIR})))?"
+        r"#egg=?.+"
+        r"|"
+        rf"[@#](?P<rev>{REV})(?:[&#](?:(?:egg=.+?&subdirectory=|subdirectory=)(?P<rev_subdirectory>{SUBDIR})|egg=.+?))?"
         r")?"
         r"$"
     ),
@@ -46,11 +46,11 @@
         rf"(?P<pathname>({PATH})"
         rf"(?P<name>{NAME})(\.git|/)?)"
         r"(?:"
-        r"#egg=?.+"
-        r"|"
         rf"#(?:egg=.+?&subdirectory=|subdirectory=)(?P<subdirectory>{SUBDIR})"
         r"|"
-        rf"[@#](?P<rev>{REV})(?:[&#](?:egg=.+?|(?:egg=.+?&subdirectory=|subdirectory=)(?P<rev_subdirectory>{SUBDIR})))?"
+        r"#egg=?.+"
+        r"|"
+        rf"[@#](?P<rev>{REV})(?:[&#](?:(?:egg=.+?&subdirectory=|subdirectory=)(?P<rev_subdirectory>{SUBDIR})|egg=.+?))?"
         r")?"
         r"$"
     ),
@@ -61,11 +61,11 @@
         rf"(?P<pathname>([:/]{PATH}/)"
         rf"(?P<name>{NAME})(\.git|/)?)"
         r"(?:"
-        r"#egg=.+?"
-        r"|"
         rf"#(?:egg=.+?&subdirectory=|subdirectory=)(?P<subdirectory>{SUBDIR})"
         r"|"
-        rf"[@#](?P<rev>{REV})(?:[&#](?:egg=.+?&subdirectory=|subdirectory=)(?P<rev_subdirectory>{SUBDIR}))?"
+        r"#egg=?.+"
+        r"|"
+        rf"[@#](?P<rev>{REV})(?:[&#](?:(?:egg=.+?&subdirectory=|subdirectory=)(?P<rev_subdirectory>{SUBDIR})|egg=.+?))?"
         r")?"
         r"$"
     ),
@@ -76,11 +76,11 @@
         rf"(?P<pathname>({PATH})"
         rf"(?P<name>{NAME})(\.git|/)?)"
         r"(?:"
-        r"#egg=?.+"
-        r"|"
         rf"#(?:egg=.+?&subdirectory=|subdirectory=)(?P<subdirectory>{SUBDIR})"
         r"|"
-        rf"[@#](?P<rev>{REV})(?:[&#](?:egg=.+?|(?:egg=.+?&subdirectory=|subdirectory=)(?P<rev_subdirectory>{SUBDIR})))?"
+        r"#egg=?.+"
+        r"|"
+        rf"[@#](?P<rev>{REV})(?:[&#](?:(?:egg=.+?&subdirectory=|subdirectory=)(?P<rev_subdirectory>{SUBDIR})|egg=.+?))?"
         r")?"
         r"$"
     ),

diff --git a/tests/vcs/test_vcs.py b/tests/vcs/test_vcs.py
@@ -404,6 +404,7 @@ def test_parse_url(url: str, parsed: ParsedUrl) -> None:
     assert result.rev == parsed.rev
     assert result.url == parsed.url
     assert result.user == parsed.user
+    assert result.subdirectory == parsed.subdirectory
 
 
 def test_parse_url_should_fail() -> None: