Skip to content

Commit

Permalink
Cleanup parse_editable (#4173)
Browse files Browse the repository at this point in the history
* parse_editable: merge duplicate code

* parse_editable: use _strip_extras
  • Loading branch information
xavfernandez committed Dec 11, 2016
1 parent b867c78 commit 0999d91
Showing 1 changed file with 3 additions and 13 deletions.
16 changes: 3 additions & 13 deletions pip/req/req_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -989,15 +989,9 @@ def parse_editable(editable_req, default_vcs=None):
from pip.index import Link

url = editable_req
extras = None

# If a file path is specified with extras, strip off the extras.
m = re.match(r'^(.+)(\[[^\]]+\])$', url)
if m:
url_no_extras = m.group(1)
extras = m.group(2)
else:
url_no_extras = url
url_no_extras, extras = _strip_extras(url)

if os.path.isdir(url_no_extras):
if not os.path.exists(os.path.join(url_no_extras, 'setup.py')):
Expand Down Expand Up @@ -1050,11 +1044,7 @@ def parse_editable(editable_req, default_vcs=None):
package_name = Link(url).egg_fragment
if not package_name:
raise InstallationError(
"Could not detect requirement name, please specify one with #egg="
)
if not package_name:
raise InstallationError(
'--editable=%s is not the right format; it must have '
'#egg=Package' % editable_req
"Could not detect requirement name for '%s', please specify one "
"with #egg=your_package_name" % editable_req
)
return _strip_postfix(package_name), url, None

0 comments on commit 0999d91

Please sign in to comment.