eric: comparison eric7/DebugClients/Python/coverage/cmdline.py

-:d856023fbeb0
+:fcca2fa618bf
 import coverage
 from coverage import Coverage
 from coverage import env
 from coverage.collector import CTracer
-from coverage.data import line_counts
+from coverage.config import CoverageConfig
+from coverage.data import combinable_files, debug_data_file
 from coverage.debug import info_formatter, info_header, short_stack
-from coverage.exceptions import BaseCoverageException, ExceptionDuringRun, NoSource
+from coverage.exceptions import _BaseCoverageException, _ExceptionDuringRun, NoSource
 from coverage.execfile import PyRunner
-from coverage.misc import human_sorted
 from coverage.results import Numbers, should_fail_under
 class Opts:
 """A namespace class for individual options we'll build parsers from."""
 )
 branch = optparse.make_option(
 '', '--branch', action='store_true',
 help="Measure branch coverage in addition to statement coverage.",
 )
-CONCURRENCY_CHOICES = [
-"thread", "gevent", "greenlet", "eventlet", "multiprocessing",
-]
 concurrency = optparse.make_option(
-'', '--concurrency', action='store', metavar="LIB",
+'', '--concurrency', action='store', metavar="LIBS",
-choices=CONCURRENCY_CHOICES,
 help=(
 "Properly measure code using a concurrency library. " +
-"Valid values are: {}."
+"Valid values are: {}, or a comma-list of them."
-).format(", ".join(CONCURRENCY_CHOICES)),
+).format(", ".join(sorted(CoverageConfig.CONCURRENCY_CHOICES))),
 )
 context = optparse.make_option(
 '', '--context', action='store', metavar="LABEL",
 help="The context label to record for this coverage run.",
 )
 omit = unshell_list(options.omit)
 include = unshell_list(options.include)
 debug = unshell_list(options.debug)
 contexts = unshell_list(options.contexts)
+if options.concurrency is not None:
+concurrency = options.concurrency.split(",")
+else:
+concurrency = None
 # Do something.
 self.coverage = Coverage(
 data_suffix=options.parallel_mode,
 cover_pylib=options.pylib,
 timid=options.timid,
 config_file=options.rcfile,
 source=source,
 omit=omit,
 include=include,
 debug=debug,
-concurrency=options.concurrency,
+concurrency=concurrency,
 check_preimported=True,
 context=options.context,
 messages=not options.quiet,
 )
 return self.do_run(options, args)
 elif options.action == "combine":
 if options.append:
 self.coverage.load()
-data_dirs = args or None
+data_paths = args or None
-self.coverage.combine(data_dirs, strict=True, keep=bool(options.keep))
+self.coverage.combine(data_paths, strict=True, keep=bool(options.keep))
 self.coverage.save()
 return OK
 # Remaining actions are reporting, with some common options.
 report_args = dict(
 """Implementation of 'coverage debug'."""
 if not args:
 show_help("What information would you like: config, data, sys, premain?")
 return ERR
+if args[1:]:
-for info in args:
+show_help("Only one topic at a time, please")
-if info == 'sys':
+return ERR
-sys_info = self.coverage.sys_info()
-print(info_header("sys"))
+if args[0] == 'sys':
-for line in info_formatter(sys_info):
+sys_info = self.coverage.sys_info()
-print(f" {line}")
+print(info_header("sys"))
-elif info == 'data':
+for line in info_formatter(sys_info):
-self.coverage.load()
+print(f" {line}")
-data = self.coverage.get_data()
+elif args[0] == 'data':
 print(info_header("data"))
-print(f"path: {data.data_filename()}")
+data_file = self.coverage.config.data_file
-if data:
+debug_data_file(data_file)
-print(f"has_arcs: {data.has_arcs()!r}")
+for filename in combinable_files(data_file):
-summary = line_counts(data, fullpath=True)
+print("-----")
-filenames = human_sorted(summary.keys())
+debug_data_file(filename)
-print(f"\n{len(filenames)} files:")
+elif args[0] == 'config':
-for f in filenames:
+print(info_header("config"))
-line = f"{f}: {summary[f]} lines"
+config_info = sorted(self.coverage.config.__dict__.items())
-plugin = data.file_tracer(f)
+for line in info_formatter(config_info):
-if plugin:
+print(f" {line}")
-line += f" [{plugin}]"
+elif args[0] == "premain":
-print(line)
+print(info_header("premain"))
-else:
+print(short_stack())
-print("No data collected")
+else:
-elif info == 'config':
+show_help(f"Don't know what you mean by {args[0]!r}")
-print(info_header("config"))
+return ERR
-config_info = self.coverage.config.__dict__.items()
-for line in info_formatter(config_info):
-print(f" {line}")
-elif info == "premain":
-print(info_header("premain"))
-print(short_stack())
-else:
-show_help(f"Don't know what you mean by {info!r}")
-return ERR
 return OK
 def unshell_list(s):
 """
 if argv is None:
 argv = sys.argv[1:]
 try:
 status = CoverageScript().command_line(argv)
-except ExceptionDuringRun as err:
+except _ExceptionDuringRun as err:
 # An exception was caught while running the product code.  The
-# sys.exc_info() return tuple is packed into an ExceptionDuringRun
+# sys.exc_info() return tuple is packed into an _ExceptionDuringRun
 # exception.
 traceback.print_exception(*err.args)    # pylint: disable=no-value-for-parameter
 status = ERR
-except BaseCoverageException as err:
+except _BaseCoverageException as err:
 # A controlled error inside coverage.py: print the message to the user.
 msg = err.args[0]
 print(msg)
 status = ERR
 except SystemExit as err:

Mercurial Repositories > eric / file comparison

comparison: eric7/DebugClients/Python/coverage/cmdline.py

eric7/DebugClients/Python/coverage/cmdline.py