summaryrefslogtreecommitdiffstats
path: root/Lib/importlib
diff options
context:
space:
mode:
authorJesus Cea <jcea@jcea.es>2012-10-05 01:15:39 (GMT)
committerJesus Cea <jcea@jcea.es>2012-10-05 01:15:39 (GMT)
commit4791a242688167ffc4abb3b9f42d6cd9e877652e (patch)
tree62a566c811ae808f9dd7a7aa10e655d4d3aad56b /Lib/importlib
parentf1af7057208da7b3d15703645688fea971a4fb5e (diff)
downloadcpython-4791a242688167ffc4abb3b9f42d6cd9e877652e.zip
cpython-4791a242688167ffc4abb3b9f42d6cd9e877652e.tar.gz
cpython-4791a242688167ffc4abb3b9f42d6cd9e877652e.tar.bz2
#16135: Removal of OS/2 support (Python code partial cleanup)
Diffstat (limited to 'Lib/importlib')
-rw-r--r--Lib/importlib/_bootstrap.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
index 98361a7..fd86737 100644
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -1709,7 +1709,7 @@ def _setup(sys_module, _imp_module):
builtin_module = sys.modules[builtin_name]
setattr(self_module, builtin_name, builtin_module)
- os_details = ('posix', ['/']), ('nt', ['\\', '/']), ('os2', ['\\', '/'])
+ os_details = ('posix', ['/']), ('nt', ['\\', '/'])
for builtin_os, path_separators in os_details:
# Assumption made in _path_join()
assert all(len(sep) == 1 for sep in path_separators)
@@ -1720,9 +1720,6 @@ def _setup(sys_module, _imp_module):
else:
try:
os_module = BuiltinImporter.load_module(builtin_os)
- # TODO: rip out os2 code after 3.3 is released as per PEP 11
- if builtin_os == 'os2' and 'EMX GCC' in sys.version:
- path_sep = path_separators[1]
break
except ImportError:
continue