McSinyx/pip
1
1
Fork 0
mirror of https://github.com/pypa/pip synced 2023-12-13 21:30:23 +01:00
Code Issues Releases Activity

Revert back to using options=None and fix loose ends

Browse source
This commit is contained in:
Georgi Valkov 2015-03-19 02:34:56 +01:00
parent 7e1bcf5b85
commit 00dc7559e0
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pip/req/req_install.py
View file

@ -73,7 +73,7 @@ class InstallRequirement(object):
def __init__(self, req, comes_from, source_dir=None, editable=False,
link=None, as_egg=False, update=True, editable_options=None,
pycompile=True, markers=None, isolated=False, options={}):
pycompile=True, markers=None, isolated=False, options=None):
self.extras = ()
if isinstance(req, six.string_types):
req = pkg_resources.Requirement.parse(req)
@ -111,15 +111,14 @@ class InstallRequirement(object):
self.uninstalled = None
self.use_user_site = False
self.target_dir = None
self.options = options
self.options = options if options else {}
self.pycompile = pycompile
self.isolated = isolated
@classmethod
def from_editable(cls, editable_req, comes_from=None, default_vcs=None,
isolated=False):
isolated=False, options=None):
from pip.index import Link
name, url, extras_override, editable_options = parse_editable(
@ -133,7 +132,8 @@ class InstallRequirement(object):
editable=True,
link=Link(url),
editable_options=editable_options,
isolated=isolated)
isolated=isolated,
options=options if options else {})
if extras_override is not None:
res.extras = extras_override
@ -206,6 +206,7 @@ class InstallRequirement(object):
else:
req = name
options = options if options else {}
return cls(req, comes_from, link=link, markers=markers,
isolated=isolated, options=options)