[Python-checkins] r78602 - in python/branches/py3k: Lib/argparse.py Lib/test/test_argparse.py

Wed Mar 3 00:09:39 CET 2010

Author: benjamin.peterson
Date: Wed Mar 3 00:09:38 2010
New Revision: 78602
Log:
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 (2010年3月02日) | 1 line
 
 remove code to avoid BaseException.message bug
........
 r78601 | benjamin.peterson | 2010年03月02日 17:02:02 -0600 (2010年3月02日) | 1 line
 
 remove cross-version compatibility code
........
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Lib/argparse.py
 python/branches/py3k/Lib/test/test_argparse.py
Modified: python/branches/py3k/Lib/argparse.py
==============================================================================

--- python/branches/py3k/Lib/argparse.py	(original)
+++ python/branches/py3k/Lib/argparse.py	Wed Mar 3 00:09:38 2010
@@ -95,40 +95,10 @@
 
 from gettext import gettext as _
 
-try:
- _set = set
-except NameError:
- from sets import Set as _set
-
-try:
- _basestring = basestring
-except NameError:
- _basestring = str
-
-try:
- _sorted = sorted
-except NameError:
-
- def _sorted(iterable, reverse=False):
- result = list(iterable)
- result.sort()
- if reverse:
- result.reverse()
- return result
-
 
 def _callable(obj):
 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=='
 
@@ -161,7 +131,7 @@
 return '%s(%s)' % (type_name, ', '.join(arg_strings))
 
 def _get_kwargs(self):
- return _sorted(self.__dict__.items())
+ return sorted(self.__dict__.items())
 
 def _get_args(self):
 return []
@@ -414,7 +384,7 @@
 
 def _format_actions_usage(self, actions, groups):
 # find group indices and identify actions in groups
- group_actions = _set()
+ group_actions = set()
 inserts = {}
 for group in groups:
 try:
@@ -484,7 +454,7 @@
 parts.append(part)
 
 # insert things at the necessary indices
- for i in _sorted(inserts, reverse=True):
+ for i in sorted(inserts, reverse=True):
 parts[i:i] = [inserts[i]]
 
 # join all the action items with spaces
@@ -1714,7 +1684,7 @@
 if not hasattr(namespace, action.dest):
 if action.default is not SUPPRESS:
 default = action.default
- if isinstance(action.default, _basestring):
+ if isinstance(action.default, str):
 default = self._get_value(action, default)
 setattr(namespace, action.dest, default)
 
@@ -1774,8 +1744,8 @@
 arg_strings_pattern = ''.join(arg_string_pattern_parts)
 
 # converts arg strings to the appropriate and then takes the action
- seen_actions = _set()
- seen_non_default_actions = _set()
+ seen_actions = set()
+ seen_non_default_actions = set()
 
 def take_action(action, argument_strings, option_string=None):
 seen_actions.add(action)
@@ -2188,7 +2158,7 @@
 value = action.const
 else:
 value = action.default
- if isinstance(value, _basestring):
+ if isinstance(value, str):
 value = self._get_value(action, value)
 self._check_value(action, value)
 
Modified: python/branches/py3k/Lib/test/test_argparse.py
==============================================================================
--- python/branches/py3k/Lib/test/test_argparse.py	(original)
+++ python/branches/py3k/Lib/test/test_argparse.py	Wed Mar 3 00:09:38 2010
@@ -22,29 +22,9 @@
 import warnings
 import argparse
 
-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
+from io import StringIO
 
+from test import support
 
 class TestCase(unittest.TestCase):
 
@@ -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',
