##// END OF EJS Templates
run-tests: fix a crash when using the coverage options...
Matt Harbison -
r51183:ada9a024 stable
parent child Browse files
Show More
@@ -232,6 +232,7 b' def list_stdlib_modules():'
232 yield 'importlib.abc' # python3 only
232 yield 'importlib.abc' # python3 only
233 yield 'importlib.machinery' # python3 only
233 yield 'importlib.machinery' # python3 only
234 yield 'importlib.util' # python3 only
234 yield 'importlib.util' # python3 only
235 yield 'packaging.version'
235 for m in 'fcntl', 'grp', 'pwd', 'termios': # Unix only
236 for m in 'fcntl', 'grp', 'pwd', 'termios': # Unix only
236 yield m
237 yield m
237 for m in 'cPickle', 'datetime': # in Python (not C) on PyPy
238 for m in 'cPickle', 'datetime': # in Python (not C) on PyPy
@@ -54,6 +54,7 b' import functools'
54 import json
54 import json
55 import multiprocessing
55 import multiprocessing
56 import os
56 import os
57 import packaging.version as version
57 import platform
58 import platform
58 import queue
59 import queue
59 import random
60 import random
@@ -72,12 +73,6 b' import unittest'
72 import uuid
73 import uuid
73 import xml.dom.minidom as minidom
74 import xml.dom.minidom as minidom
74
75
75 try:
76 # PEP 632 recommend the use of `packaging.version` to replace the
77 # deprecated `distutil.version`. So lets do it.
78 import packaging.version as version
79 except ImportError:
80 import distutils.version as version
81
76
82 if sys.version_info < (3, 5, 0):
77 if sys.version_info < (3, 5, 0):
83 print(
78 print(
@@ -799,8 +794,8 b' def parseargs(args, parser):'
799 try:
794 try:
800 import coverage
795 import coverage
801
796
802 covver = version.StrictVersion(coverage.__version__).version
797 covver = version.Version(coverage.__version__)
803 if covver < (3, 3):
798 if covver < version.Version("3.3"):
804 parser.error('coverage options require coverage 3.3 or later')
799 parser.error('coverage options require coverage 3.3 or later')
805 except ImportError:
800 except ImportError:
806 parser.error('coverage options now require the coverage package')
801 parser.error('coverage options now require the coverage package')
General Comments 0
You need to be logged in to leave comments. Login now