[Python-Dev] [Python-checkins] cpython: Move test___all__ over to unittest.main() and use ModuleNotFoundError
Brett Cannon
brett at python.org
Thu Jun 13 02:13:49 CEST 2013
Obviously the commit message is a little misleading since changes I was
about to stage accidentally went in on this change. Sorry about that. Same
basic concept of the changes, just to more modules.
On Wed, Jun 12, 2013 at 8:12 PM, brett.cannon <python-checkins at python.org>wrote:
> http://hg.python.org/cpython/rev/c4d7228421df
> changeset: 84106:c4d7228421df
> user: Brett Cannon <brett at python.org>
> date: Wed Jun 12 20:12:30 2013 -0400
> summary:
> Move test___all__ over to unittest.main() and use ModuleNotFoundError
>
> files:
> Lib/test/regrtest.py | 16 ++++++++--------
> Lib/test/support.py | 14 +++++++-------
> Lib/test/test___all__.py | 7 ++-----
> Lib/xmlrpc/server.py | 2 +-
> Lib/zipfile.py | 6 +++---
> 5 files changed, 21 insertions(+), 24 deletions(-)
>
>
> diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
> --- a/Lib/test/regrtest.py
> +++ b/Lib/test/regrtest.py
> @@ -146,11 +146,11 @@
>
> try:
> import threading
> -except ImportError:
> +except ModuleNotFoundError:
> threading = None
> try:
> import multiprocessing.process
> -except ImportError:
> +except ModuleNotFoundError:
> multiprocessing = None
>
>
> @@ -180,7 +180,7 @@
> if sys.platform == 'darwin':
> try:
> import resource
> - except ImportError:
> + except ModuleNotFoundError:
> pass
> else:
> soft, hard = resource.getrlimit(resource.RLIMIT_STACK)
> @@ -571,7 +571,7 @@
> if findleaks:
> try:
> import gc
> - except ImportError:
> + except ModuleNotFoundError:
> print('No GC available, disabling findleaks.')
> findleaks = False
> else:
> @@ -692,7 +692,7 @@
> if use_mp:
> try:
> from threading import Thread
> - except ImportError:
> + except ModuleNotFoundError:
> print("Multiprocess option requires thread support")
> sys.exit(2)
> from queue import Queue
> @@ -1396,7 +1396,7 @@
> pic = sys.path_importer_cache.copy()
> try:
> import zipimport
> - except ImportError:
> + except ModuleNotFoundError:
> zdc = None # Run unmodified on platforms without zipimport support
> else:
> zdc = zipimport._zip_directory_cache.copy()
> @@ -1473,7 +1473,7 @@
> sys.path_importer_cache.update(pic)
> try:
> import zipimport
> - except ImportError:
> + except ModuleNotFoundError:
> pass # Run unmodified on platforms without zipimport support
> else:
> zipimport._zip_directory_cache.clear()
> @@ -1510,7 +1510,7 @@
> doctest.master = None
> try:
> import ctypes
> - except ImportError:
> + except ModuleNotFoundError:
> # Don't worry about resetting the cache if ctypes is not supported
> pass
> else:
> diff --git a/Lib/test/support.py b/Lib/test/support.py
> --- a/Lib/test/support.py
> +++ b/Lib/test/support.py
> @@ -29,27 +29,27 @@
>
> try:
> import _thread, threading
> -except ImportError:
> +except ModuleNotFoundError:
> _thread = None
> threading = None
> try:
> import multiprocessing.process
> -except ImportError:
> +except ModuleNotFoundError:
> multiprocessing = None
>
> try:
> import zlib
> -except ImportError:
> +except ModuleNotFoundError:
> zlib = None
>
> try:
> import bz2
> -except ImportError:
> +except ModuleNotFoundError:
> bz2 = None
>
> try:
> import lzma
> -except ImportError:
> +except ModuleNotFoundError:
> lzma = None
>
> __all__ = [
> @@ -116,7 +116,7 @@
> with _ignore_deprecated_imports(deprecated):
> try:
> return importlib.import_module(name)
> - except ImportError as msg:
> + except ModuleNotFoundError as msg:
> if sys.platform.startswith(tuple(required_on)):
> raise
> raise unittest.SkipTest(str(msg))
> @@ -188,7 +188,7 @@
> if not _save_and_block_module(blocked_name, orig_modules):
> names_to_remove.append(blocked_name)
> fresh_module = importlib.import_module(name)
> - except ImportError:
> + except ModuleNotFoundError:
> fresh_module = None
> finally:
> for orig_name, module in orig_modules.items():
> diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py
> --- a/Lib/test/test___all__.py
> +++ b/Lib/test/test___all__.py
> @@ -75,7 +75,7 @@
> try:
> import rlcompleter
> import locale
> - except ImportError:
> + except ModuleNotFoundError:
> pass
> else:
> locale.setlocale(locale.LC_CTYPE, 'C')
> @@ -113,8 +113,5 @@
> print('Following modules failed to be imported:',
> failed_imports)
>
>
> -def test_main():
> - support.run_unittest(AllTest)
> -
> if __name__ == "__main__":
> - test_main()
> + unittest.main()
> diff --git a/Lib/xmlrpc/server.py b/Lib/xmlrpc/server.py
> --- a/Lib/xmlrpc/server.py
> +++ b/Lib/xmlrpc/server.py
> @@ -116,7 +116,7 @@
> import traceback
> try:
> import fcntl
> -except ImportError:
> +except ModuleNotFoundError:
> fcntl = None
>
> def resolve_dotted_attribute(obj, attr, allow_dotted_names=True):
> diff --git a/Lib/zipfile.py b/Lib/zipfile.py
> --- a/Lib/zipfile.py
> +++ b/Lib/zipfile.py
> @@ -18,18 +18,18 @@
> try:
> import zlib # We may need its compression method
> crc32 = zlib.crc32
> -except ImportError:
> +except ModuleNotFoundError:
> zlib = None
> crc32 = binascii.crc32
>
> try:
> import bz2 # We may need its compression method
> -except ImportError:
> +except ModuleNotFoundError:
> bz2 = None
>
> try:
> import lzma # We may need its compression method
> -except ImportError:
> +except ModuleNotFoundError:
> lzma = None
>
> __all__ = ["BadZipFile", "BadZipfile", "error",
>
> --
> Repository URL: http://hg.python.org/cpython
>
> _______________________________________________
> Python-checkins mailing list
> Python-checkins at python.org
> http://mail.python.org/mailman/listinfo/python-checkins
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/python-dev/attachments/20130612/28ccaba8/attachment.html>
More information about the Python-Dev
mailing list