From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sun, 20 Mar 2011 13:34:28 +0000 (+0200)
Subject: Merge with 3.2.
X-Git-Tag: v3.3.0a1~2844
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=45763d0d12c22fdfc61ea130af5757bc71a96519;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.2.
---

45763d0d12c22fdfc61ea130af5757bc71a96519
diff --cc Lib/test/regrtest.py
index 62677023b947,440c09c3ae8c..a7a7de3fb796
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@@ -827,7 -827,8 +827,8 @@@ class saved_test_environment
      resources = ('sys.argv', 'cwd', 'sys.stdin', 'sys.stdout', 'sys.stderr',
                   'os.environ', 'sys.path', 'sys.path_hooks', '__import__',
                   'warnings.filters', 'asyncore.socket_map',
-                  'logging._handlers', 'logging._handlerList', 'sys.gettrace')
 -                 'logging._handlers', 'logging._handlerList',
++                 'logging._handlers', 'logging._handlerList', 'sys.gettrace',
+                  'sys.warnoptions')
  
      def get_sys_argv(self):
          return id(sys.argv), sys.argv, sys.argv[:]