McSinyx
/
pip
mirror of https://github.com/pypa/pip
1
1
Fork 0
Code Issues Releases Activity

Rename variable for clarity 

It doesn't represent warnings.showwarning's current state so,
the name shouldn't suggest that.
This commit is contained in:
Pradyun Gedam 2018-06-22 09:31:34 +05:30
parent a8eaf1e0ff
commit a1912454b8
No known key found for this signature in database
GPG Key ID: DA17C4B29CB32E4B
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pip/_internal/utils/deprecation.py
View File

@ -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