jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/402771 )
Change subject: [FIX] Remove py2.6 warning detection from context manager ......................................................................
[FIX] Remove py2.6 warning detection from context manager
This warning detection has never triggered because warn_msg never becomes a DeprecationWarning because it is a warnings.WarningMessage instance
Bug: T184396 Change-Id: I7326bf30c0ca35e6f3497c7b7650a8841ee1a855 --- M tests/utils.py 1 file changed, 1 insertion(+), 8 deletions(-)
Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified
diff --git a/tests/utils.py b/tests/utils.py index 240cda8..4350448 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Test utilities.""" # -# (C) Pywikibot team, 2013-2017 +# (C) Pywikibot team, 2013-2018 # # Distributed under the terms of the MIT license. # @@ -254,13 +254,6 @@ break else: skip_frames -= 1 - - # Avoid failures because cryptography is mentioning Python 2.6 - # is outdated - if PYTHON_VERSION < (2, 7): - if (isinstance(warn_msg, DeprecationWarning) and - str(warn_msg.message) == PYTHON_26_CRYPTO_WARN): - return
log.append(warn_msg)
pywikibot-commits@lists.wikimedia.org