From a1912454b8eb3bbbc3347089da59543b700165a7 Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Fri, 22 Jun 2018 09:31:34 +0530 Subject: [PATCH] Rename variable for clarity It doesn't represent warnings.showwarning's current state so, the name shouldn't suggest that. --- src/pip/_internal/utils/deprecation.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pip/_internal/utils/deprecation.py b/src/pip/_internal/utils/deprecation.py index 271e6d9fc..94b3caa0a 100644 --- a/src/pip/_internal/utils/deprecation.py +++ b/src/pip/_internal/utils/deprecation.py @@ -20,14 +20,14 @@ class PipPendingDeprecationWarning(PipDeprecationWarning): pass -_warnings_showwarning = None # type: Any +_original_showwarning = None # type: Any # Warnings <-> Logging Integration def _showwarning(message, category, filename, lineno, file=None, line=None): if file is not None: - if _warnings_showwarning is not None: - _warnings_showwarning( + if _original_showwarning is not None: + _original_showwarning( message, category, filename, lineno, file, line, ) elif issubclass(category, PipDeprecationWarning): @@ -50,7 +50,7 @@ def _showwarning(message, category, filename, lineno, file=None, line=None): else: logger.error(log_message) else: - _warnings_showwarning( + _original_showwarning( message, category, filename, lineno, file, line, ) @@ -59,10 +59,10 @@ def install_warning_logger(): # Enable our Deprecation Warnings warnings.simplefilter("default", PipDeprecationWarning, append=True) - global _warnings_showwarning + global _original_showwarning - if _warnings_showwarning is None: - _warnings_showwarning = warnings.showwarning + if _original_showwarning is None: + _original_showwarning = warnings.showwarning warnings.showwarning = _showwarning