From f01d695ccdf47855aa9b5f2185a8ce349ed004aa Mon Sep 17 00:00:00 2001 From: Jesus Cea Date: Fri, 5 Oct 2012 03:36:11 +0200 Subject: Closes #16135: Removal of OS/2 support --- Lib/test/regrtest.py | 14 --- Lib/test/test_bz2.py | 2 +- Lib/test/test_mailbox.py | 2 +- Lib/test/test_select.py | 3 +- Lib/test/test_signal.py | 2 +- Lib/test/test_site.py | 2 +- Lib/test/test_sundry.py | 1 - Lib/test/test_sys.py | 2 +- Lib/test/test_sysconfig.py | 2 +- Lib/test/test_thread.py | 2 +- Lib/test/test_threadsignals.py | 2 +- Python/importlib.h | 210 ++++++++++++++++++++--------------------- 12 files changed, 111 insertions(+), 133 deletions(-) diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py index e977e42..1d1a695 100755 --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -1621,20 +1621,6 @@ _expectations = ( test_ossaudiodev test_socketserver """), - ('os2emx', - """ - test_audioop - test_curses - test_epoll - test_kqueue - test_largefile - test_mmap - test_openpty - test_ossaudiodev - test_pty - test_resource - test_signal - """), ('freebsd', """ test_devpoll diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py index 257b144..92548f4 100644 --- a/Lib/test/test_bz2.py +++ b/Lib/test/test_bz2.py @@ -18,7 +18,7 @@ except ImportError: bz2 = support.import_module('bz2') from bz2 import BZ2File, BZ2Compressor, BZ2Decompressor -has_cmdline_bunzip2 = sys.platform not in ("win32", "os2emx") +has_cmdline_bunzip2 = (sys.platform != "win32") class BaseTest(unittest.TestCase): "Base for other testcases." diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py index 6b1e933..d1cc92e 100644 --- a/Lib/test/test_mailbox.py +++ b/Lib/test/test_mailbox.py @@ -596,7 +596,7 @@ class TestMaildir(TestMailbox, unittest.TestCase): def setUp(self): TestMailbox.setUp(self) - if os.name in ('nt', 'os2') or sys.platform == 'cygwin': + if (os.name == 'nt') or (sys.platform == 'cygwin'): self._box.colon = '!' def assertMailboxEmpty(self): diff --git a/Lib/test/test_select.py b/Lib/test/test_select.py index 8d910ed..6a810c6 100644 --- a/Lib/test/test_select.py +++ b/Lib/test/test_select.py @@ -5,8 +5,7 @@ import sys import unittest from test import support -@unittest.skipIf(sys.platform[:3] in ('win', 'os2') or \ - sys.platform=='riscos'), +@unittest.skipIf((sys.platform[:3]=='win') or (sys.platform=='riscos'), "can't easily test on this system") class SelectTestCase(unittest.TestCase): diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py index 6be259b..1b73634 100644 --- a/Lib/test/test_signal.py +++ b/Lib/test/test_signal.py @@ -15,7 +15,7 @@ try: except ImportError: threading = None -if sys.platform in ('os2', 'riscos'): +if sys.platform == 'riscos': raise unittest.SkipTest("Can't test signal on %s" % sys.platform) diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py index 29286c7..5090239 100644 --- a/Lib/test/test_site.py +++ b/Lib/test/test_site.py @@ -222,7 +222,7 @@ class HelperFunctionsTests(unittest.TestCase): site.PREFIXES = ['xoxo'] dirs = site.getsitepackages() - if sys.platform in ('os2emx', 'riscos'): + if sys.platform == 'riscos': self.assertEqual(len(dirs), 1) wanted = os.path.join('xoxo', 'Lib', 'site-packages') self.assertEqual(dirs[0], wanted) diff --git a/Lib/test/test_sundry.py b/Lib/test/test_sundry.py index fcccdf7..48abc24 100644 --- a/Lib/test/test_sundry.py +++ b/Lib/test/test_sundry.py @@ -48,7 +48,6 @@ class TestUntestedModules(unittest.TestCase): import macurl2path import mailcap import nturl2path - import os2emxpath import pstats import py_compile import sndhdr diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py index 6e0c6ee..349b1ac 100644 --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -482,7 +482,7 @@ class SysModuleTest(unittest.TestCase): def test_thread_info(self): info = sys.thread_info self.assertEqual(len(info), 3) - self.assertIn(info.name, ('nt', 'os2', 'pthread', 'solaris', None)) + self.assertIn(info.name, ('nt', 'pthread', 'solaris', None)) self.assertIn(info.lock, ('semaphore', 'mutex+cond', None)) def test_43581(self): diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py index c44e192..5293649 100644 --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py @@ -234,7 +234,7 @@ class TestSysConfig(unittest.TestCase): self.assertTrue(os.path.isfile(config_h), config_h) def test_get_scheme_names(self): - wanted = ('nt', 'nt_user', 'os2', 'os2_home', 'osx_framework_user', + wanted = ('nt', 'nt_user', 'osx_framework_user', 'posix_home', 'posix_prefix', 'posix_user') self.assertEqual(get_scheme_names(), wanted) diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py index a191e15..f9a721b 100644 --- a/Lib/test/test_thread.py +++ b/Lib/test/test_thread.py @@ -68,7 +68,7 @@ class ThreadRunningTests(BasicThreadTest): thread.stack_size(0) self.assertEqual(thread.stack_size(), 0, "stack_size not reset to default") - if os.name not in ("nt", "os2", "posix"): + if os.name not in ("nt", "posix"): return tss_supported = True diff --git a/Lib/test/test_threadsignals.py b/Lib/test/test_threadsignals.py index f975a75..3a0a493 100644 --- a/Lib/test/test_threadsignals.py +++ b/Lib/test/test_threadsignals.py @@ -8,7 +8,7 @@ from test.support import run_unittest, import_module thread = import_module('_thread') import time -if sys.platform[:3] in ('win', 'os2') or sys.platform=='riscos': +if (sys.platform[:3] == 'win') or (sys.platform=='riscos'): raise unittest.SkipTest("Can't test signal on %s" % sys.platform) process_pid = os.getpid() diff --git a/Python/importlib.h b/Python/importlib.h index 9d3b4dc..59486d6 100644 --- a/Python/importlib.h +++ b/Python/importlib.h @@ -4102,87 +4102,82 @@ unsigned char _Py_M__importlib[] = { 12,1,23,1,6,1,4,4,35,3,40,2,117,10,0,0, 0,95,95,105,109,112,111,114,116,95,95,99,2,0,0,0, 0,0,0,0,14,0,0,0,13,0,0,0,67,0,0,0, - 115,196,2,0,0,124,1,0,97,0,0,124,0,0,97,1, + 115,141,2,0,0,124,1,0,97,0,0,124,0,0,97,1, 0,116,1,0,106,2,0,106,3,0,114,33,0,116,4,0, 97,5,0,110,6,0,116,6,0,97,5,0,120,47,0,116, 0,0,116,1,0,102,2,0,68,93,33,0,125,2,0,116, 7,0,124,2,0,100,1,0,131,2,0,115,52,0,116,8, 0,124,2,0,95,9,0,113,52,0,113,52,0,87,116,1, - 0,106,10,0,116,11,0,25,125,3,0,120,76,0,100,28, + 0,106,10,0,116,11,0,25,125,3,0,120,76,0,100,25, 0,68,93,68,0,125,4,0,124,4,0,116,1,0,106,10, 0,107,7,0,114,148,0,116,8,0,106,12,0,124,4,0, 131,1,0,125,5,0,110,13,0,116,1,0,106,10,0,124, 4,0,25,125,5,0,116,13,0,124,3,0,124,4,0,124, 5,0,131,3,0,1,113,109,0,87,100,6,0,100,7,0, 103,1,0,102,2,0,100,8,0,100,9,0,100,7,0,103, - 2,0,102,2,0,100,10,0,100,9,0,100,7,0,103,2, - 0,102,2,0,102,3,0,125,6,0,120,189,0,124,6,0, - 68,93,169,0,92,2,0,125,7,0,125,8,0,116,14,0, - 100,11,0,100,12,0,132,0,0,124,8,0,68,131,1,0, - 131,1,0,115,23,1,116,15,0,130,1,0,124,8,0,100, - 13,0,25,125,9,0,124,7,0,116,1,0,106,10,0,107, - 6,0,114,65,1,116,1,0,106,10,0,124,7,0,25,125, - 10,0,80,113,236,0,121,60,0,116,8,0,106,12,0,124, - 7,0,131,1,0,125,10,0,124,7,0,100,10,0,107,2, - 0,114,123,1,100,14,0,116,1,0,106,16,0,107,6,0, - 114,123,1,124,8,0,100,15,0,25,125,9,0,110,0,0, - 80,87,113,236,0,4,116,17,0,107,10,0,114,148,1,1, - 1,1,119,236,0,89,113,236,0,88,113,236,0,87,116,17, - 0,100,16,0,131,1,0,130,1,0,121,19,0,116,8,0, - 106,12,0,100,17,0,131,1,0,125,11,0,87,110,24,0, - 4,116,17,0,107,10,0,114,210,1,1,1,1,100,27,0, - 125,11,0,89,110,1,0,88,116,8,0,106,12,0,100,18, - 0,131,1,0,125,12,0,124,7,0,100,8,0,107,2,0, - 114,16,2,116,8,0,106,12,0,100,19,0,131,1,0,125, - 13,0,116,13,0,124,3,0,100,20,0,124,13,0,131,3, - 0,1,110,0,0,116,13,0,124,3,0,100,21,0,124,10, - 0,131,3,0,1,116,13,0,124,3,0,100,17,0,124,11, - 0,131,3,0,1,116,13,0,124,3,0,100,18,0,124,12, - 0,131,3,0,1,116,13,0,124,3,0,100,22,0,124,9, - 0,131,3,0,1,116,13,0,124,3,0,100,23,0,116,19, - 0,124,8,0,131,1,0,131,3,0,1,116,13,0,124,3, - 0,100,24,0,116,20,0,131,0,0,131,3,0,1,116,21, - 0,106,22,0,116,0,0,106,23,0,131,0,0,131,1,0, - 1,124,7,0,100,8,0,107,2,0,114,192,2,116,24,0, - 106,25,0,100,25,0,131,1,0,1,100,26,0,116,21,0, - 107,6,0,114,192,2,100,29,0,116,27,0,95,28,0,113, - 192,2,110,0,0,100,27,0,83,40,30,0,0,0,117,250, - 0,0,0,83,101,116,117,112,32,105,109,112,111,114,116,108, - 105,98,32,98,121,32,105,109,112,111,114,116,105,110,103,32, - 110,101,101,100,101,100,32,98,117,105,108,116,45,105,110,32, - 109,111,100,117,108,101,115,32,97,110,100,32,105,110,106,101, - 99,116,105,110,103,32,116,104,101,109,10,32,32,32,32,105, - 110,116,111,32,116,104,101,32,103,108,111,98,97,108,32,110, - 97,109,101,115,112,97,99,101,46,10,10,32,32,32,32,65, - 115,32,115,121,115,32,105,115,32,110,101,101,100,101,100,32, - 102,111,114,32,115,121,115,46,109,111,100,117,108,101,115,32, - 97,99,99,101,115,115,32,97,110,100,32,95,105,109,112,32, - 105,115,32,110,101,101,100,101,100,32,116,111,32,108,111,97, - 100,32,98,117,105,108,116,45,105,110,10,32,32,32,32,109, - 111,100,117,108,101,115,44,32,116,104,111,115,101,32,116,119, - 111,32,109,111,100,117,108,101,115,32,109,117,115,116,32,98, - 101,32,101,120,112,108,105,99,105,116,108,121,32,112,97,115, - 115,101,100,32,105,110,46,10,10,32,32,32,32,117,10,0, - 0,0,95,95,108,111,97,100,101,114,95,95,117,3,0,0, - 0,95,105,111,117,9,0,0,0,95,119,97,114,110,105,110, - 103,115,117,8,0,0,0,98,117,105,108,116,105,110,115,117, - 7,0,0,0,109,97,114,115,104,97,108,117,5,0,0,0, - 112,111,115,105,120,117,1,0,0,0,47,117,2,0,0,0, - 110,116,117,1,0,0,0,92,117,3,0,0,0,111,115,50, - 99,1,0,0,0,0,0,0,0,2,0,0,0,3,0,0, - 0,115,0,0,0,115,33,0,0,0,124,0,0,93,23,0, - 125,1,0,116,0,0,124,1,0,131,1,0,100,0,0,107, - 2,0,86,1,113,3,0,100,1,0,83,40,2,0,0,0, - 105,1,0,0,0,78,40,1,0,0,0,117,3,0,0,0, - 108,101,110,40,2,0,0,0,117,2,0,0,0,46,48,117, - 3,0,0,0,115,101,112,40,0,0,0,0,40,0,0,0, - 0,117,29,0,0,0,60,102,114,111,122,101,110,32,105,109, - 112,111,114,116,108,105,98,46,95,98,111,111,116,115,116,114, - 97,112,62,117,9,0,0,0,60,103,101,110,101,120,112,114, - 62,179,6,0,0,115,2,0,0,0,6,0,117,25,0,0, - 0,95,115,101,116,117,112,46,60,108,111,99,97,108,115,62, - 46,60,103,101,110,101,120,112,114,62,105,0,0,0,0,117, - 7,0,0,0,69,77,88,32,71,67,67,105,1,0,0,0, + 2,0,102,2,0,102,2,0,125,6,0,120,149,0,124,6, + 0,68,93,129,0,92,2,0,125,7,0,125,8,0,116,14, + 0,100,10,0,100,11,0,132,0,0,124,8,0,68,131,1, + 0,131,1,0,115,8,1,116,15,0,130,1,0,124,8,0, + 100,12,0,25,125,9,0,124,7,0,116,1,0,106,10,0, + 107,6,0,114,50,1,116,1,0,106,10,0,124,7,0,25, + 125,10,0,80,113,221,0,121,20,0,116,8,0,106,12,0, + 124,7,0,131,1,0,125,10,0,80,87,113,221,0,4,116, + 16,0,107,10,0,114,93,1,1,1,1,119,221,0,89,113, + 221,0,88,113,221,0,87,116,16,0,100,13,0,131,1,0, + 130,1,0,121,19,0,116,8,0,106,12,0,100,14,0,131, + 1,0,125,11,0,87,110,24,0,4,116,16,0,107,10,0, + 114,155,1,1,1,1,100,24,0,125,11,0,89,110,1,0, + 88,116,8,0,106,12,0,100,15,0,131,1,0,125,12,0, + 124,7,0,100,8,0,107,2,0,114,217,1,116,8,0,106, + 12,0,100,16,0,131,1,0,125,13,0,116,13,0,124,3, + 0,100,17,0,124,13,0,131,3,0,1,110,0,0,116,13, + 0,124,3,0,100,18,0,124,10,0,131,3,0,1,116,13, + 0,124,3,0,100,14,0,124,11,0,131,3,0,1,116,13, + 0,124,3,0,100,15,0,124,12,0,131,3,0,1,116,13, + 0,124,3,0,100,19,0,124,9,0,131,3,0,1,116,13, + 0,124,3,0,100,20,0,116,18,0,124,8,0,131,1,0, + 131,3,0,1,116,13,0,124,3,0,100,21,0,116,19,0, + 131,0,0,131,3,0,1,116,20,0,106,21,0,116,0,0, + 106,22,0,131,0,0,131,1,0,1,124,7,0,100,8,0, + 107,2,0,114,137,2,116,23,0,106,24,0,100,22,0,131, + 1,0,1,100,23,0,116,20,0,107,6,0,114,137,2,100, + 26,0,116,26,0,95,27,0,113,137,2,110,0,0,100,24, + 0,83,40,27,0,0,0,117,250,0,0,0,83,101,116,117, + 112,32,105,109,112,111,114,116,108,105,98,32,98,121,32,105, + 109,112,111,114,116,105,110,103,32,110,101,101,100,101,100,32, + 98,117,105,108,116,45,105,110,32,109,111,100,117,108,101,115, + 32,97,110,100,32,105,110,106,101,99,116,105,110,103,32,116, + 104,101,109,10,32,32,32,32,105,110,116,111,32,116,104,101, + 32,103,108,111,98,97,108,32,110,97,109,101,115,112,97,99, + 101,46,10,10,32,32,32,32,65,115,32,115,121,115,32,105, + 115,32,110,101,101,100,101,100,32,102,111,114,32,115,121,115, + 46,109,111,100,117,108,101,115,32,97,99,99,101,115,115,32, + 97,110,100,32,95,105,109,112,32,105,115,32,110,101,101,100, + 101,100,32,116,111,32,108,111,97,100,32,98,117,105,108,116, + 45,105,110,10,32,32,32,32,109,111,100,117,108,101,115,44, + 32,116,104,111,115,101,32,116,119,111,32,109,111,100,117,108, + 101,115,32,109,117,115,116,32,98,101,32,101,120,112,108,105, + 99,105,116,108,121,32,112,97,115,115,101,100,32,105,110,46, + 10,10,32,32,32,32,117,10,0,0,0,95,95,108,111,97, + 100,101,114,95,95,117,3,0,0,0,95,105,111,117,9,0, + 0,0,95,119,97,114,110,105,110,103,115,117,8,0,0,0, + 98,117,105,108,116,105,110,115,117,7,0,0,0,109,97,114, + 115,104,97,108,117,5,0,0,0,112,111,115,105,120,117,1, + 0,0,0,47,117,2,0,0,0,110,116,117,1,0,0,0, + 92,99,1,0,0,0,0,0,0,0,2,0,0,0,3,0, + 0,0,115,0,0,0,115,33,0,0,0,124,0,0,93,23, + 0,125,1,0,116,0,0,124,1,0,131,1,0,100,0,0, + 107,2,0,86,1,113,3,0,100,1,0,83,40,2,0,0, + 0,105,1,0,0,0,78,40,1,0,0,0,117,3,0,0, + 0,108,101,110,40,2,0,0,0,117,2,0,0,0,46,48, + 117,3,0,0,0,115,101,112,40,0,0,0,0,40,0,0, + 0,0,117,29,0,0,0,60,102,114,111,122,101,110,32,105, + 109,112,111,114,116,108,105,98,46,95,98,111,111,116,115,116, + 114,97,112,62,117,9,0,0,0,60,103,101,110,101,120,112, + 114,62,179,6,0,0,115,2,0,0,0,6,0,117,25,0, + 0,0,95,115,101,116,117,112,46,60,108,111,99,97,108,115, + 62,46,60,103,101,110,101,120,112,114,62,105,0,0,0,0, 117,30,0,0,0,105,109,112,111,114,116,108,105,98,32,114, 101,113,117,105,114,101,115,32,112,111,115,105,120,32,111,114, 32,110,116,117,7,0,0,0,95,116,104,114,101,97,100,117, @@ -4196,7 +4191,7 @@ unsigned char _Py_M__importlib[] = { 78,40,4,0,0,0,117,3,0,0,0,95,105,111,117,9, 0,0,0,95,119,97,114,110,105,110,103,115,117,8,0,0, 0,98,117,105,108,116,105,110,115,117,7,0,0,0,109,97, - 114,115,104,97,108,84,40,29,0,0,0,117,4,0,0,0, + 114,115,104,97,108,84,40,28,0,0,0,117,4,0,0,0, 95,105,109,112,117,3,0,0,0,115,121,115,117,5,0,0, 0,102,108,97,103,115,117,8,0,0,0,111,112,116,105,109, 105,122,101,117,27,0,0,0,79,80,84,73,77,73,90,69, @@ -4212,41 +4207,40 @@ unsigned char _Py_M__importlib[] = { 0,0,108,111,97,100,95,109,111,100,117,108,101,117,7,0, 0,0,115,101,116,97,116,116,114,117,3,0,0,0,97,108, 108,117,14,0,0,0,65,115,115,101,114,116,105,111,110,69, - 114,114,111,114,117,7,0,0,0,118,101,114,115,105,111,110, - 117,11,0,0,0,73,109,112,111,114,116,69,114,114,111,114, - 117,4,0,0,0,78,111,110,101,117,3,0,0,0,115,101, - 116,117,16,0,0,0,95,109,97,107,101,95,114,101,108,97, - 120,95,99,97,115,101,117,18,0,0,0,69,88,84,69,78, - 83,73,79,78,95,83,85,70,70,73,88,69,83,117,6,0, - 0,0,101,120,116,101,110,100,117,18,0,0,0,101,120,116, - 101,110,115,105,111,110,95,115,117,102,102,105,120,101,115,117, - 15,0,0,0,83,79,85,82,67,69,95,83,85,70,70,73, - 88,69,83,117,6,0,0,0,97,112,112,101,110,100,117,4, - 0,0,0,84,114,117,101,117,21,0,0,0,87,105,110,100, - 111,119,115,82,101,103,105,115,116,114,121,70,105,110,100,101, - 114,117,11,0,0,0,68,69,66,85,71,95,66,85,73,76, - 68,40,14,0,0,0,117,10,0,0,0,115,121,115,95,109, - 111,100,117,108,101,117,11,0,0,0,95,105,109,112,95,109, - 111,100,117,108,101,117,6,0,0,0,109,111,100,117,108,101, - 117,11,0,0,0,115,101,108,102,95,109,111,100,117,108,101, - 117,12,0,0,0,98,117,105,108,116,105,110,95,110,97,109, - 101,117,14,0,0,0,98,117,105,108,116,105,110,95,109,111, - 100,117,108,101,117,10,0,0,0,111,115,95,100,101,116,97, - 105,108,115,117,10,0,0,0,98,117,105,108,116,105,110,95, - 111,115,117,15,0,0,0,112,97,116,104,95,115,101,112,97, - 114,97,116,111,114,115,117,8,0,0,0,112,97,116,104,95, - 115,101,112,117,9,0,0,0,111,115,95,109,111,100,117,108, - 101,117,13,0,0,0,116,104,114,101,97,100,95,109,111,100, - 117,108,101,117,14,0,0,0,119,101,97,107,114,101,102,95, - 109,111,100,117,108,101,117,13,0,0,0,119,105,110,114,101, - 103,95,109,111,100,117,108,101,40,0,0,0,0,40,0,0, - 0,0,117,29,0,0,0,60,102,114,111,122,101,110,32,105, - 109,112,111,114,116,108,105,98,46,95,98,111,111,116,115,116, - 114,97,112,62,117,6,0,0,0,95,115,101,116,117,112,147, - 6,0,0,115,96,0,0,0,0,9,6,1,6,2,12,1, - 9,2,6,2,19,1,15,1,16,2,13,1,13,1,15,1, - 18,2,13,1,20,2,48,1,19,2,31,1,10,1,15,1, - 13,1,4,2,3,1,15,2,27,1,13,1,5,1,13,1, + 114,114,111,114,117,11,0,0,0,73,109,112,111,114,116,69, + 114,114,111,114,117,4,0,0,0,78,111,110,101,117,3,0, + 0,0,115,101,116,117,16,0,0,0,95,109,97,107,101,95, + 114,101,108,97,120,95,99,97,115,101,117,18,0,0,0,69, + 88,84,69,78,83,73,79,78,95,83,85,70,70,73,88,69, + 83,117,6,0,0,0,101,120,116,101,110,100,117,18,0,0, + 0,101,120,116,101,110,115,105,111,110,95,115,117,102,102,105, + 120,101,115,117,15,0,0,0,83,79,85,82,67,69,95,83, + 85,70,70,73,88,69,83,117,6,0,0,0,97,112,112,101, + 110,100,117,4,0,0,0,84,114,117,101,117,21,0,0,0, + 87,105,110,100,111,119,115,82,101,103,105,115,116,114,121,70, + 105,110,100,101,114,117,11,0,0,0,68,69,66,85,71,95, + 66,85,73,76,68,40,14,0,0,0,117,10,0,0,0,115, + 121,115,95,109,111,100,117,108,101,117,11,0,0,0,95,105, + 109,112,95,109,111,100,117,108,101,117,6,0,0,0,109,111, + 100,117,108,101,117,11,0,0,0,115,101,108,102,95,109,111, + 100,117,108,101,117,12,0,0,0,98,117,105,108,116,105,110, + 95,110,97,109,101,117,14,0,0,0,98,117,105,108,116,105, + 110,95,109,111,100,117,108,101,117,10,0,0,0,111,115,95, + 100,101,116,97,105,108,115,117,10,0,0,0,98,117,105,108, + 116,105,110,95,111,115,117,15,0,0,0,112,97,116,104,95, + 115,101,112,97,114,97,116,111,114,115,117,8,0,0,0,112, + 97,116,104,95,115,101,112,117,9,0,0,0,111,115,95,109, + 111,100,117,108,101,117,13,0,0,0,116,104,114,101,97,100, + 95,109,111,100,117,108,101,117,14,0,0,0,119,101,97,107, + 114,101,102,95,109,111,100,117,108,101,117,13,0,0,0,119, + 105,110,114,101,103,95,109,111,100,117,108,101,40,0,0,0, + 0,40,0,0,0,0,117,29,0,0,0,60,102,114,111,122, + 101,110,32,105,109,112,111,114,116,108,105,98,46,95,98,111, + 111,116,115,116,114,97,112,62,117,6,0,0,0,95,115,101, + 116,117,112,147,6,0,0,115,92,0,0,0,0,9,6,1, + 6,2,12,1,9,2,6,2,19,1,15,1,16,2,13,1, + 13,1,15,1,18,2,13,1,20,2,33,1,19,2,31,1, + 10,1,15,1,13,1,4,2,3,1,15,1,5,1,13,1, 12,2,12,2,3,1,19,1,13,2,11,1,15,2,12,1, 15,1,19,2,16,1,16,1,16,1,16,1,22,2,19,1, 19,1,12,1,13,1,12,1,117,6,0,0,0,95,115,101, @@ -4286,7 +4280,7 @@ unsigned char _Py_M__importlib[] = { 40,0,0,0,0,40,0,0,0,0,117,29,0,0,0,60, 102,114,111,122,101,110,32,105,109,112,111,114,116,108,105,98, 46,95,98,111,111,116,115,116,114,97,112,62,117,8,0,0, - 0,95,105,110,115,116,97,108,108,221,6,0,0,115,16,0, + 0,95,105,110,115,116,97,108,108,218,6,0,0,115,16,0, 0,0,0,2,13,1,9,1,28,1,16,1,16,1,15,1, 19,1,117,8,0,0,0,95,105,110,115,116,97,108,108,78, 40,3,0,0,0,117,3,0,0,0,119,105,110,117,6,0, @@ -4389,5 +4383,5 @@ unsigned char _Py_M__importlib[] = { 18,12,11,12,11,12,17,19,57,19,54,19,50,19,82,22, 134,19,29,25,46,25,25,6,3,19,45,19,55,19,18,19, 89,19,125,19,13,12,9,12,17,12,17,6,2,12,50,12, - 13,18,24,12,34,12,15,12,11,24,36,12,74, + 13,18,24,12,34,12,15,12,11,24,36,12,71, }; -- cgit v0.12