mirror of https://github.com/pypa/pip
Revert "Redact auth from URL in UpdatingDefaultsHelpFormatter"
This commit is contained in:
parent
dce6b34abb
commit
395817ee3b
|
@ -17,7 +17,6 @@ from pip._vendor.six import string_types
|
|||
from pip._internal.cli.status_codes import UNKNOWN_ERROR
|
||||
from pip._internal.configuration import Configuration, ConfigurationError
|
||||
from pip._internal.utils.compat import get_terminal_size
|
||||
from pip._internal.utils.misc import redact_auth_from_url
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
@ -107,22 +106,12 @@ class UpdatingDefaultsHelpFormatter(PrettyHelpFormatter):
|
|||
|
||||
This is updates the defaults before expanding them, allowing
|
||||
them to show up correctly in the help listing.
|
||||
|
||||
Also redact auth from url type options
|
||||
"""
|
||||
|
||||
def expand_default(self, option):
|
||||
default_value = None
|
||||
if self.parser is not None:
|
||||
self.parser._update_defaults(self.parser.defaults)
|
||||
default_value = self.parser.defaults.get(option.dest)
|
||||
help_text = optparse.IndentedHelpFormatter.expand_default(self, option)
|
||||
|
||||
if default_value and option.metavar == 'URL':
|
||||
help_text = help_text.replace(
|
||||
default_value, redact_auth_from_url(default_value))
|
||||
|
||||
return help_text
|
||||
return optparse.IndentedHelpFormatter.expand_default(self, option)
|
||||
|
||||
|
||||
class CustomOptionParser(optparse.OptionParser):
|
||||
|
|
|
@ -64,16 +64,6 @@ def test_help_command_should_exit_status_error_when_cmd_does_not_exist(script):
|
|||
assert result.returncode == ERROR
|
||||
|
||||
|
||||
def test_help_command_redact_auth_from_url(script):
|
||||
"""
|
||||
Test `help` on various subcommands redact auth from url
|
||||
"""
|
||||
script.environ['PIP_INDEX_URL'] = 'https://user:secret@example.com'
|
||||
result = script.pip('install', '--help')
|
||||
assert result.returncode == SUCCESS
|
||||
assert 'secret' not in result.stdout
|
||||
|
||||
|
||||
def test_help_commands_equally_functional(in_memory_pip):
|
||||
"""
|
||||
Test if `pip help` and 'pip --help' behave the same way.
|
||||
|
|
Loading…
Reference in New Issue