Merged revisions 78600-78601 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78600 | benjamin.peterson | 2010-03-02 16:58:01 -0600 (Tue, 02 Mar 2010) | 1 line
remove code to avoid BaseException.message bug
........
r78601 | benjamin.peterson | 2010-03-02 17:02:02 -0600 (Tue, 02 Mar 2010) | 1 line
remove cross-version compatibility code
........
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
index 849facb..9e1efa8 100644
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -22,30 +22,10 @@
import warnings
import argparse
+from io import StringIO
+
from test import support
-try:
- from StringIO import StringIO
-except ImportError:
- from io import StringIO
-
-try:
- set
-except NameError:
- from sets import Set as set
-
-try:
- sorted
-except NameError:
-
- def sorted(iterable, reverse=False):
- result = list(iterable)
- result.sort()
- if reverse:
- result.reverse()
- return result
-
-
class TestCase(unittest.TestCase):
def assertEqual(self, obj1, obj2):
@@ -4183,12 +4163,6 @@
def test_main():
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
warnings.filterwarnings(
action='ignore',