mirror of
https://github.com/python/cpython.git
synced 2025-11-03 19:34:08 +00:00
remove code to avoid BaseException.message bug
This commit is contained in:
parent
3f75cc5cb5
commit
bd56722a27
2 changed files with 0 additions and 15 deletions
|
|
@ -120,15 +120,6 @@ except NameError:
|
||||||
def _callable(obj):
|
def _callable(obj):
|
||||||
return hasattr(obj, '__call__') or hasattr(obj, '__bases__')
|
return hasattr(obj, '__call__') or hasattr(obj, '__bases__')
|
||||||
|
|
||||||
# silence Python 2.6 buggy warnings about Exception.message
|
|
||||||
if _sys.version_info[:2] == (2, 6):
|
|
||||||
import warnings
|
|
||||||
warnings.filterwarnings(
|
|
||||||
action='ignore',
|
|
||||||
message='BaseException.message has been deprecated as of Python 2.6',
|
|
||||||
category=DeprecationWarning,
|
|
||||||
module='argparse')
|
|
||||||
|
|
||||||
|
|
||||||
SUPPRESS = '==SUPPRESS=='
|
SUPPRESS = '==SUPPRESS=='
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4183,12 +4183,6 @@ class TestImportStar(TestCase):
|
||||||
|
|
||||||
def test_main():
|
def test_main():
|
||||||
with warnings.catch_warnings():
|
with warnings.catch_warnings():
|
||||||
# silence Python 2.6 buggy warnings about Exception.message
|
|
||||||
warnings.filterwarnings(
|
|
||||||
action='ignore',
|
|
||||||
message='BaseException.message has been deprecated as of'
|
|
||||||
'Python 2.6',
|
|
||||||
category=DeprecationWarning)
|
|
||||||
# silence warnings about version argument - these are expected
|
# silence warnings about version argument - these are expected
|
||||||
warnings.filterwarnings(
|
warnings.filterwarnings(
|
||||||
action='ignore',
|
action='ignore',
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue