Merge with 3.2.

diff --cc Lib/test/regrtest.py
index 62677023b947e0825b6036fb8288b912f5a5b36e,440c09c3ae8c6094777fdd4cd2ccb996247cf516..a7a7de3fb796b52c7de839b350f4723312d4ade5
--- 1/Lib/test/regrtest.py
--- 2/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[:]