changeset: 84448:de947db308ba
user: Brett Cannon <brett@python.org>
date: Thu Jul 04 18:16:15 2013 -0400
files: Lib/stat.py Lib/test/regrtest.py Lib/test/support.py Lib/test/test___all__.py Lib/test/test_tarfile.py Lib/test/test_xmlrpc.py Lib/xmlrpc/server.py Lib/zipfile.py
description:
Issue #15767: Excise the remaining instances of ModuleNotFoundError
diff -r 6a8ba235542a -r de947db308ba Lib/stat.py
--- a/Lib/stat.py	Thu Jul 04 18:04:20 2013 -0400
+++ b/Lib/stat.py	Thu Jul 04 18:16:15 2013 -0400
@@ -151,5 +151,5 @@
 # If available, use C implementation
 try:
 from _stat import *
-except ModuleNotFoundError:
+except ImportError:
 pass
diff -r 6a8ba235542a -r de947db308ba Lib/test/regrtest.py
--- a/Lib/test/regrtest.py	Thu Jul 04 18:04:20 2013 -0400
+++ b/Lib/test/regrtest.py	Thu Jul 04 18:16:15 2013 -0400
@@ -146,11 +146,11 @@
 
 try:
 import threading
-except ModuleNotFoundError:
+except ImportError:
 threading = None
 try:
 import multiprocessing.process
-except ModuleNotFoundError:
+except ImportError:
 multiprocessing = None
 
 
@@ -180,7 +180,7 @@
 if sys.platform == 'darwin':
 try:
 import resource
- except ModuleNotFoundError:
+ except ImportError:
 pass
 else:
 soft, hard = resource.getrlimit(resource.RLIMIT_STACK)
@@ -567,7 +567,7 @@
 if findleaks:
 try:
 import gc
- except ModuleNotFoundError:
+ except ImportError:
 print('No GC available, disabling findleaks.')
 findleaks = False
 else:
@@ -688,7 +688,7 @@
 if use_mp:
 try:
 from threading import Thread
- except ModuleNotFoundError:
+ except ImportError:
 print("Multiprocess option requires thread support")
 sys.exit(2)
 from queue import Queue
@@ -1399,7 +1399,7 @@
 pic = sys.path_importer_cache.copy()
 try:
 import zipimport
- except ModuleNotFoundError:
+ except ImportError:
 zdc = None # Run unmodified on platforms without zipimport support
 else:
 zdc = zipimport._zip_directory_cache.copy()
@@ -1476,7 +1476,7 @@
 sys.path_importer_cache.update(pic)
 try:
 import zipimport
- except ModuleNotFoundError:
+ except ImportError:
 pass # Run unmodified on platforms without zipimport support
 else:
 zipimport._zip_directory_cache.clear()
@@ -1513,7 +1513,7 @@
 doctest.master = None
 try:
 import ctypes
- except ModuleNotFoundError:
+ except ImportError:
 # Don't worry about resetting the cache if ctypes is not supported
 pass
 else:
diff -r 6a8ba235542a -r de947db308ba Lib/test/support.py
--- a/Lib/test/support.py	Thu Jul 04 18:04:20 2013 -0400
+++ b/Lib/test/support.py	Thu Jul 04 18:16:15 2013 -0400
@@ -29,32 +29,32 @@
 
 try:
 import _thread, threading
-except ModuleNotFoundError:
+except ImportError:
 _thread = None
 threading = None
 try:
 import multiprocessing.process
-except ModuleNotFoundError:
+except ImportError:
 multiprocessing = None
 
 try:
 import zlib
-except ModuleNotFoundError:
+except ImportError:
 zlib = None
 
 try:
 import gzip
-except ModuleNotFoundError:
+except ImportError:
 gzip = None
 
 try:
 import bz2
-except ModuleNotFoundError:
+except ImportError:
 bz2 = None
 
 try:
 import lzma
-except ModuleNotFoundError:
+except ImportError:
 lzma = None
 
 __all__ = [
@@ -121,7 +121,7 @@
 with _ignore_deprecated_imports(deprecated):
 try:
 return importlib.import_module(name)
- except ModuleNotFoundError as msg:
+ except ImportError as msg:
 if sys.platform.startswith(tuple(required_on)):
 raise
 raise unittest.SkipTest(str(msg))
@@ -193,7 +193,7 @@
 if not _save_and_block_module(blocked_name, orig_modules):
 names_to_remove.append(blocked_name)
 fresh_module = importlib.import_module(name)
- except ModuleNotFoundError:
+ except ImportError:
 fresh_module = None
 finally:
 for orig_name, module in orig_modules.items():
diff -r 6a8ba235542a -r de947db308ba Lib/test/test___all__.py
--- a/Lib/test/test___all__.py	Thu Jul 04 18:04:20 2013 -0400
+++ b/Lib/test/test___all__.py	Thu Jul 04 18:16:15 2013 -0400
@@ -75,7 +75,7 @@
 try:
 import rlcompleter
 import locale
- except ModuleNotFoundError:
+ except ImportError:
 pass
 else:
 locale.setlocale(locale.LC_CTYPE, 'C')
diff -r 6a8ba235542a -r de947db308ba Lib/test/test_tarfile.py
--- a/Lib/test/test_tarfile.py	Thu Jul 04 18:04:20 2013 -0400
+++ b/Lib/test/test_tarfile.py	Thu Jul 04 18:16:15 2013 -0400
@@ -12,15 +12,15 @@
 # Check for our compression modules.
 try:
 import gzip
-except ModuleNotFoundError:
+except ImportError:
 gzip = None
 try:
 import bz2
-except ModuleNotFoundError:
+except ImportError:
 bz2 = None
 try:
 import lzma
-except ModuleNotFoundError:
+except ImportError:
 lzma = None
 
 def md5sum(data):
diff -r 6a8ba235542a -r de947db308ba Lib/test/test_xmlrpc.py
--- a/Lib/test/test_xmlrpc.py	Thu Jul 04 18:04:20 2013 -0400
+++ b/Lib/test/test_xmlrpc.py	Thu Jul 04 18:16:15 2013 -0400
@@ -15,11 +15,11 @@
 
 try:
 import gzip
-except ModuleNotFoundError:
+except ImportError:
 gzip = None
 try:
 import threading
-except ModuleNotFoundError:
+except ImportError:
 threading = None
 
 alist = [{'astring': 'foo@bar.baz.spam',
diff -r 6a8ba235542a -r de947db308ba Lib/xmlrpc/server.py
--- a/Lib/xmlrpc/server.py	Thu Jul 04 18:04:20 2013 -0400
+++ b/Lib/xmlrpc/server.py	Thu Jul 04 18:16:15 2013 -0400
@@ -116,7 +116,7 @@
 import traceback
 try:
 import fcntl
-except ModuleNotFoundError:
+except ImportError:
 fcntl = None
 
 def resolve_dotted_attribute(obj, attr, allow_dotted_names=True):
diff -r 6a8ba235542a -r de947db308ba Lib/zipfile.py
--- a/Lib/zipfile.py	Thu Jul 04 18:04:20 2013 -0400
+++ b/Lib/zipfile.py	Thu Jul 04 18:16:15 2013 -0400
@@ -18,18 +18,18 @@
 try:
 import zlib # We may need its compression method
 crc32 = zlib.crc32
-except ModuleNotFoundError:
+except ImportError:
 zlib = None
 crc32 = binascii.crc32
 
 try:
 import bz2 # We may need its compression method
-except ModuleNotFoundError:
+except ImportError:
 bz2 = None
 
 try:
 import lzma # We may need its compression method
-except ModuleNotFoundError:
+except ImportError:
 lzma = None
 
 __all__ = ["BadZipFile", "BadZipfile", "error",
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://hg.python.org/cpython/rev/de947db308ba">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/de947db308ba" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>