Fix parsing lines using -e and end of line comments

madpah · Aug 19, 2016 · 95006a3 · 95006a3
1 parent 4a43544
commit 95006a3
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 0 deletions.
diff --git a/requirements/requirement.py b/requirements/requirement.py
@@ -94,6 +94,10 @@ def parse_editable(cls, line):
 
         req = cls('-e {0}'.format(line))
         req.editable = True
+
+        if ' #' in line:
+            line = line[:line.find(' #')]
+
         vcs_match = VCS_REGEX.match(line)
         local_match = LOCAL_REGEX.match(line)
 

diff --git a/tests/reqfiles/editable_2.expected b/tests/reqfiles/editable_2.expected
@@ -0,0 +1,54 @@
+[
+ {
+  "specifier": false,
+  "local_file": false,
+  "name": "MyProject",
+  "editable": true,
+  "uri": "svn+svn://svn.myproject.org/svn/MyProject",
+  "extras": [],
+  "vcs": "svn",
+  "path": null,
+  "line": "-e svn+svn://svn.myproject.org/svn/MyProject#egg=MyProject # Test comment",
+  "specs": [],
+  "revision": null
+ },
+ {
+  "specifier": false,
+  "local_file": false,
+  "name": "MyProject",
+  "editable": true,
+  "uri": "git://git.myproject.org/MyProject.git",
+  "extras": [],
+  "vcs": "git",
+  "path": null,
+  "line": "-e git://git.myproject.org/MyProject.git@da39a3ee5e6b4b0d3255bfef95601890afd80709#egg=MyProject # Test comment",
+  "specs": [],
+  "revision": "da39a3ee5e6b4b0d3255bfef95601890afd80709"
+ },
+ {
+  "specifier": false,
+  "local_file": false,
+  "name": "MyProject",
+  "editable": true,
+  "uri": "hg+http://hg.myproject.org/MyProject/",
+  "extras": [],
+  "vcs": "hg",
+  "path": null,
+  "line": "-e hg+http://hg.myproject.org/MyProject/@special_feature#egg=MyProject # Test comment",
+  "specs": [],
+  "revision": "special_feature"
+ },
+ {
+  "specifier": false,
+  "local_file": false,
+  "name": "MyProject",
+  "editable": true,
+  "uri": "bzr+lp://MyProject",
+  "extras": [],
+  "vcs": "bzr",
+  "path": null,
+  "line": "-e bzr+lp://MyProject#egg=MyProject # Test comment",
+  "specs": [],
+  "revision": null
+ }
+]
diff --git a/tests/reqfiles/editable_2.txt b/tests/reqfiles/editable_2.txt
@@ -0,0 +1,4 @@
+-e svn+svn://svn.myproject.org/svn/MyProject#egg=MyProject # Test comment
+--editable git://git.myproject.org/MyProject.git@da39a3ee5e6b4b0d3255bfef95601890afd80709#egg=MyProject # Test comment
+--editable hg+http://hg.myproject.org/MyProject/@special_feature#egg=MyProject # Test comment
+-e bzr+lp://MyProject#egg=MyProject # Test comment