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

Remove code for issue #4008

Browse source
This commit is contained in:
Luo Jiebin 2017-04-03 09:08:18 +08:00
parent 6d4d186acc
commit 7917036d3f
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pip/basecommand.py
View file

@ -105,12 +105,6 @@ class Command(object):
def main(self, args):
options, args = self.parse_args(args)
if options.quiet and options.verbose:
warnings.warn(
"--verbose and --quiet options used simultaneously."
"Ignoring --verbose."
)
if options.quiet:
if options.quiet == 1:
level = "WARNING"

10
pip/commands/list.py
View file

@ -210,7 +210,7 @@ class ListCommand(Command):
yield dist
def output_legacy(self, dist, options):
if options.count == 1 or dist_is_editable(dist):
if options.verbose == 1 or dist_is_editable(dist):
return '%s (%s, %s)' % (
dist.project_name,
dist.version,
@ -236,7 +236,7 @@ class ListCommand(Command):
self.output_package_listing_columns(data, header)
elif options.list_format == 'freeze':
for dist in packages:
if options.count == 1:
if options.verbose == 1:
logger.info("%s==%s (%s)", dist.project_name,
dist.version, dist.location)
else:
@ -296,7 +296,7 @@ def format_for_columns(pkgs, options):
header = ["Package", "Version"]
data = []
if options.count == 1 or any(dist_is_editable(x) for x in pkgs):
if options.verbose == 1 or any(dist_is_editable(x) for x in pkgs):
header.append("Location")
for proj in pkgs:
@ -308,7 +308,7 @@ def format_for_columns(pkgs, options):
row.append(proj.latest_version)
row.append(proj.latest_filetype)
if options.count == 1 or dist_is_editable(proj):
if options.verbose == 1 or dist_is_editable(proj):
row.append(proj.location)
data.append(row)
@ -323,7 +323,7 @@ def format_for_json(packages, options):
'name': dist.project_name,
'version': six.text_type(dist.version),
}
if options.count == 1:
if options.verbose == 1:
info['location'] = dist.location
if options.outdated:
info['latest_version'] = six.text_type(dist.latest_version)