Rename deprecation warnings to not be versioned
@@ -16,28 +16,21 @@ class PipDeprecationWarning(Warning):
pass
-class Pending(object):
+class PipPendingDeprecationWarning(PipDeprecationWarning):
pass
-class RemovedInPip12Warning(PipDeprecationWarning, Pending):
- pass
-
-
-# Warnings <-> Logging Integration
-
-
_warnings_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(
message, category, filename, lineno, file, line,
)
- else:
- if issubclass(category, PipDeprecationWarning):
+ elif issubclass(category, PipDeprecationWarning):
# We use a specially named logger which will handle all of the
# deprecation messages for pip.
logger = logging.getLogger("pip._internal.deprecations")
@@ -47,12 +40,12 @@ def _showwarning(message, category, filename, lineno, file=None, line=None):
# want it to appear as if someone typed this entire message out.
log_message = "DEPRECATION: %s" % message
- # PipDeprecationWarnings that are Pending still have at least 2
+ # PipPendingDeprecationWarnings still have at least 2
# versions to go until they are removed so they can just be
# warnings. Otherwise, they will be removed in the very next
# version of pip. We want these to be more obvious so we use the
# ERROR logging level.
- if issubclass(category, Pending):
+ if issubclass(category, PipPendingDeprecationWarning):
logger.warning(log_message)
else:
logger.error(log_message)
