From e98e7529d420c610daf3fde54be7180df4f6de19 Mon Sep 17 00:00:00 2001 From: jxltom Date: Tue, 6 Nov 2018 22:38:21 +0800 Subject: [PATCH 1/2] Remove u'' or '' in output of pipenv uninstall and clean --- pipenv/core.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pipenv/core.py b/pipenv/core.py index fb68fcb1..6f7812bd 100644 --- a/pipenv/core.py +++ b/pipenv/core.py @@ -2087,7 +2087,7 @@ def do_uninstall( normalized_bad_pkg = canonicalize_name(bad_package) if normalized_bad_pkg in package_map: if environments.is_verbose(): - click.echo("Ignoring {0}.".format(repr(bad_package)), err=True) + click.echo("Ignoring {0}.".format(bad_package), err=True) pkg_name_index = package_names.index(package_map[normalized_bad_pkg]) del package_names[pkg_name_index] used_packages = develop | default & installed_package_names @@ -2126,7 +2126,7 @@ def do_uninstall( for normalized, package_name in selected_pkg_map.items(): click.echo( crayons.white( - fix_utf8("Uninstalling {0}…".format(repr(package_name))), bold=True + fix_utf8("Uninstalling {0}…".format(package_name)), bold=True ) ) # Uninstall the package. @@ -2643,7 +2643,7 @@ def do_clean(ctx, three=None, python=None, dry_run=False, bare=False, pypi_mirro for bad_package in BAD_PACKAGES: if canonicalize_name(bad_package) in installed_package_names: if environments.is_verbose(): - click.echo("Ignoring {0}.".format(repr(bad_package)), err=True) + click.echo("Ignoring {0}.".format(bad_package), err=True) del installed_package_names[installed_package_names.index( canonicalize_name(bad_package) )] @@ -2663,7 +2663,7 @@ def do_clean(ctx, three=None, python=None, dry_run=False, bare=False, pypi_mirro if not bare: click.echo( crayons.white( - fix_utf8("Uninstalling {0}…".format(repr(apparent_bad_package))), bold=True + fix_utf8("Uninstalling {0}…".format(apparent_bad_package)), bold=True ) ) # Uninstall the package. From 5d57ec738a55ed791626c9096a0e43db0a822b07 Mon Sep 17 00:00:00 2001 From: jxltom Date: Tue, 6 Nov 2018 22:44:48 +0800 Subject: [PATCH 2/2] Add trivial news for issue 3179 --- news/3179.trivial | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/3179.trivial diff --git a/news/3179.trivial b/news/3179.trivial new file mode 100644 index 00000000..4b9059f7 --- /dev/null +++ b/news/3179.trivial @@ -0,0 +1 @@ +Better output of pipenv uninstall and clean