Skip to content

Commit 78444f4

Browse files
nedbatnedbat
committed
style: use good style for annotated defaults parameters
1 parent d4339ee commit 78444f4

32 files changed

+240
-240
lines changed

‎coverage/annotate.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def __init__(self, coverage: Coverage) -> None:
5353
blank_re = re.compile(r"\s*(#|$)")
5454
else_re = re.compile(r"\s*else\s*:\s*(#|$)")
5555

56-
def report(self, morfs: Optional[Iterable[TMorf]], directory: Optional[str]=None) -> None:
56+
def report(self, morfs: Optional[Iterable[TMorf]], directory: Optional[str] = None) -> None:
5757
"""Run the report.
5858
5959
See `coverage.report()` for arguments.

‎coverage/cmdline.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ def __init__(
321321
action: str,
322322
options: List[optparse.Option],
323323
description: str,
324-
usage: Optional[str]=None,
324+
usage: Optional[str] = None,
325325
):
326326
"""Create an OptionParser for a coverage.py command.
327327
@@ -551,9 +551,9 @@ def get_prog_name(self) -> str:
551551

552552

553553
def show_help(
554-
error: Optional[str]=None,
555-
topic: Optional[str]=None,
556-
parser: Optional[optparse.OptionParser]=None,
554+
error: Optional[str] = None,
555+
topic: Optional[str] = None,
556+
parser: Optional[optparse.OptionParser] = None,
557557
) -> None:
558558
"""Display an error message, or the named topic."""
559559
assert error or topic or parser
@@ -960,7 +960,7 @@ def unglob_args(args: List[str]) -> List[str]:
960960
}
961961

962962

963-
def main(argv: Optional[List[str]]=None) -> Optional[int]:
963+
def main(argv: Optional[List[str]] = None) -> Optional[int]:
964964
"""The main entry point to coverage.py.
965965
966966
This is installed as the script entry point.
@@ -999,7 +999,7 @@ def main(argv: Optional[List[str]]=None) -> Optional[int]:
999999
original_main = main
10001000

10011001
def main( # pylint: disable=function-redefined
1002-
argv: Optional[List[str]]=None,
1002+
argv: Optional[List[str]] = None,
10031003
) -> Optional[int]:
10041004
"""A wrapper around main that profiles."""
10051005
profiler = SimpleLauncher.launch()

‎coverage/config.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def __init__(self, our_file: bool) -> None:
4545
def read( # type: ignore[override]
4646
self,
4747
filenames: Iterable[str],
48-
encoding_unused: Optional[str]=None,
48+
encoding_unused: Optional[str] = None,
4949
) -> List[str]:
5050
"""Read a file name as UTF-8 configuration data."""
5151
return super().read(filenames, encoding="utf-8")
@@ -430,7 +430,7 @@ def _set_attr_from_config_option(
430430
cp: TConfigParser,
431431
attr: str,
432432
where: str,
433-
type_: str='',
433+
type_: str = '',
434434
) -> bool:
435435
"""Set an attribute on self if it exists in the ConfigParser.
436436

‎coverage/control.py

+76-76
Original file line numberDiff line numberDiff line change
@@ -114,22 +114,22 @@ def current(cls) -> Optional[Coverage]:
114114

115115
def __init__( # pylint: disable=too-many-arguments
116116
self,
117-
data_file: Optional[Union[str, DefaultValue]]=DEFAULT_DATAFILE,
118-
data_suffix: Optional[Union[str, bool]]=None,
119-
cover_pylib: Optional[bool]=None,
120-
auto_data: bool=False,
121-
timid: Optional[bool]=None,
122-
branch: Optional[bool]=None,
123-
config_file: Union[str, bool]=True,
124-
source: Optional[Iterable[str]]=None,
125-
source_pkgs: Optional[Iterable[str]]=None,
126-
omit: Optional[Union[str, Iterable[str]]]=None,
127-
include: Optional[Union[str, Iterable[str]]]=None,
128-
debug: Optional[Iterable[str]]=None,
129-
concurrency: Optional[Union[str, Iterable[str]]]=None,
130-
check_preimported: bool=False,
131-
context: Optional[str]=None,
132-
messages: bool=False,
117+
data_file: Optional[Union[str, DefaultValue]] = DEFAULT_DATAFILE,
118+
data_suffix: Optional[Union[str, bool]] = None,
119+
cover_pylib: Optional[bool] = None,
120+
auto_data: bool = False,
121+
timid: Optional[bool] = None,
122+
branch: Optional[bool] = None,
123+
config_file: Union[str, bool] = True,
124+
source: Optional[Iterable[str]] = None,
125+
source_pkgs: Optional[Iterable[str]] = None,
126+
omit: Optional[Union[str, Iterable[str]]] = None,
127+
include: Optional[Union[str, Iterable[str]]] = None,
128+
debug: Optional[Iterable[str]] = None,
129+
concurrency: Optional[Union[str, Iterable[str]]] = None,
130+
check_preimported: bool = False,
131+
context: Optional[str] = None,
132+
messages: bool = False,
133133
) -> None:
134134
"""
135135
Many of these arguments duplicate and override values that can be
@@ -392,7 +392,7 @@ def _check_include_omit_etc(self, filename: str, frame: FrameType) -> bool:
392392

393393
return not reason
394394

395-
def _warn(self, msg: str, slug: Optional[str]=None, once: bool=False) -> None:
395+
def _warn(self, msg: str, slug: Optional[str] = None, once: bool = False) -> None:
396396
"""Use `msg` as a warning.
397397
398398
For warning suppression, use `slug` as the shorthand.
@@ -634,7 +634,7 @@ def stop(self) -> None:
634634
self._collector.stop()
635635
self._started = False
636636

637-
def _atexit(self, event: str="atexit") -> None:
637+
def _atexit(self, event: str = "atexit") -> None:
638638
"""Clean up on process shutdown."""
639639
if self._debug.should("process"):
640640
self._debug.write(f"{event}: pid: {os.getpid()}, instance: {self!r}")
@@ -688,13 +688,13 @@ def switch_context(self, new_context: str) -> None:
688688

689689
self._collector.switch_context(new_context)
690690

691-
def clear_exclude(self, which: str='exclude') -> None:
691+
def clear_exclude(self, which: str = 'exclude') -> None:
692692
"""Clear the exclude list."""
693693
self._init()
694694
setattr(self.config, which + "_list", [])
695695
self._exclude_regex_stale()
696696

697-
def exclude(self, regex: str, which: str='exclude') -> None:
697+
def exclude(self, regex: str, which: str = 'exclude') -> None:
698698
"""Exclude source lines from execution consideration.
699699
700700
A number of lists of regular expressions are maintained. Each list
@@ -726,7 +726,7 @@ def _exclude_regex(self, which: str) -> str:
726726
self._exclude_re[which] = join_regex(excl_list)
727727
return self._exclude_re[which]
728728

729-
def get_exclude_list(self, which: str='exclude') -> List[str]:
729+
def get_exclude_list(self, which: str = 'exclude') -> List[str]:
730730
"""Return a list of excluded regex strings.
731731
732732
`which` indicates which list is desired. See :meth:`exclude` for the
@@ -755,9 +755,9 @@ def _make_aliases(self) -> PathAliases:
755755

756756
def combine(
757757
self,
758-
data_paths: Optional[Iterable[str]]=None,
759-
strict: bool=False,
760-
keep: bool=False
758+
data_paths: Optional[Iterable[str]] = None,
759+
strict: bool = False,
760+
keep: bool = False
761761
) -> None:
762762
"""Combine together a number of similarly-named coverage data files.
763763
@@ -926,7 +926,7 @@ def _get_file_reporter(self, morf: TMorf) -> FileReporter:
926926
assert isinstance(file_reporter, FileReporter)
927927
return file_reporter
928928

929-
def _get_file_reporters(self, morfs: Optional[Iterable[TMorf]]=None) -> List[FileReporter]:
929+
def _get_file_reporters(self, morfs: Optional[Iterable[TMorf]] = None) -> List[FileReporter]:
930930
"""Get a list of FileReporters for a list of modules or file names.
931931
932932
For each module or file name in `morfs`, find a FileReporter. Return
@@ -956,18 +956,18 @@ def _prepare_data_for_reporting(self) -> None:
956956

957957
def report(
958958
self,
959-
morfs: Optional[Iterable[TMorf]]=None,
960-
show_missing: Optional[bool]=None,
961-
ignore_errors: Optional[bool]=None,
962-
file: Optional[IO[str]]=None,
963-
omit: Optional[Union[str, List[str]]]=None,
964-
include: Optional[Union[str, List[str]]]=None,
965-
skip_covered: Optional[bool]=None,
966-
contexts: Optional[List[str]]=None,
967-
skip_empty: Optional[bool]=None,
968-
precision: Optional[int]=None,
969-
sort: Optional[str]=None,
970-
output_format: Optional[str]=None,
959+
morfs: Optional[Iterable[TMorf]] = None,
960+
show_missing: Optional[bool] = None,
961+
ignore_errors: Optional[bool] = None,
962+
file: Optional[IO[str]] = None,
963+
omit: Optional[Union[str, List[str]]] = None,
964+
include: Optional[Union[str, List[str]]] = None,
965+
skip_covered: Optional[bool] = None,
966+
contexts: Optional[List[str]] = None,
967+
skip_empty: Optional[bool] = None,
968+
precision: Optional[int] = None,
969+
sort: Optional[str] = None,
970+
output_format: Optional[str] = None,
971971
) -> float:
972972
"""Write a textual summary report to `file`.
973973
@@ -1038,12 +1038,12 @@ def report(
10381038

10391039
def annotate(
10401040
self,
1041-
morfs: Optional[Iterable[TMorf]]=None,
1042-
directory: Optional[str]=None,
1043-
ignore_errors: Optional[bool]=None,
1044-
omit: Optional[Union[str, List[str]]]=None,
1045-
include: Optional[Union[str, List[str]]]=None,
1046-
contexts: Optional[List[str]]=None,
1041+
morfs: Optional[Iterable[TMorf]] = None,
1042+
directory: Optional[str] = None,
1043+
ignore_errors: Optional[bool] = None,
1044+
omit: Optional[Union[str, List[str]]] = None,
1045+
include: Optional[Union[str, List[str]]] = None,
1046+
contexts: Optional[List[str]] = None,
10471047
) -> None:
10481048
"""Annotate a list of modules.
10491049
@@ -1077,18 +1077,18 @@ def annotate(
10771077

10781078
def html_report(
10791079
self,
1080-
morfs: Optional[Iterable[TMorf]]=None,
1081-
directory: Optional[str]=None,
1082-
ignore_errors: Optional[bool]=None,
1083-
omit: Optional[Union[str, List[str]]]=None,
1084-
include: Optional[Union[str, List[str]]]=None,
1085-
extra_css: Optional[str]=None,
1086-
title: Optional[str]=None,
1087-
skip_covered: Optional[bool]=None,
1088-
show_contexts: Optional[bool]=None,
1089-
contexts: Optional[List[str]]=None,
1090-
skip_empty: Optional[bool]=None,
1091-
precision: Optional[int]=None,
1080+
morfs: Optional[Iterable[TMorf]] = None,
1081+
directory: Optional[str] = None,
1082+
ignore_errors: Optional[bool] = None,
1083+
omit: Optional[Union[str, List[str]]] = None,
1084+
include: Optional[Union[str, List[str]]] = None,
1085+
extra_css: Optional[str] = None,
1086+
title: Optional[str] = None,
1087+
skip_covered: Optional[bool] = None,
1088+
show_contexts: Optional[bool] = None,
1089+
contexts: Optional[List[str]] = None,
1090+
skip_empty: Optional[bool] = None,
1091+
precision: Optional[int] = None,
10921092
) -> float:
10931093
"""Generate an HTML report.
10941094
@@ -1135,13 +1135,13 @@ def html_report(
11351135

11361136
def xml_report(
11371137
self,
1138-
morfs: Optional[Iterable[TMorf]]=None,
1139-
outfile: Optional[str]=None,
1140-
ignore_errors: Optional[bool]=None,
1141-
omit: Optional[Union[str, List[str]]]=None,
1142-
include: Optional[Union[str, List[str]]]=None,
1143-
contexts: Optional[List[str]]=None,
1144-
skip_empty: Optional[bool]=None,
1138+
morfs: Optional[Iterable[TMorf]] = None,
1139+
outfile: Optional[str] = None,
1140+
ignore_errors: Optional[bool] = None,
1141+
omit: Optional[Union[str, List[str]]] = None,
1142+
include: Optional[Union[str, List[str]]] = None,
1143+
contexts: Optional[List[str]] = None,
1144+
skip_empty: Optional[bool] = None,
11451145
) -> float:
11461146
"""Generate an XML report of coverage results.
11471147
@@ -1169,14 +1169,14 @@ def xml_report(
11691169

11701170
def json_report(
11711171
self,
1172-
morfs: Optional[Iterable[TMorf]]=None,
1173-
outfile: Optional[str]=None,
1174-
ignore_errors: Optional[bool]=None,
1175-
omit: Optional[Union[str, List[str]]]=None,
1176-
include: Optional[Union[str, List[str]]]=None,
1177-
contexts: Optional[List[str]]=None,
1178-
pretty_print: Optional[bool]=None,
1179-
show_contexts: Optional[bool]=None,
1172+
morfs: Optional[Iterable[TMorf]] = None,
1173+
outfile: Optional[str] = None,
1174+
ignore_errors: Optional[bool] = None,
1175+
omit: Optional[Union[str, List[str]]] = None,
1176+
include: Optional[Union[str, List[str]]] = None,
1177+
contexts: Optional[List[str]] = None,
1178+
pretty_print: Optional[bool] = None,
1179+
show_contexts: Optional[bool] = None,
11801180
) -> float:
11811181
"""Generate a JSON report of coverage results.
11821182
@@ -1207,12 +1207,12 @@ def json_report(
12071207

12081208
def lcov_report(
12091209
self,
1210-
morfs: Optional[Iterable[TMorf]]=None,
1211-
outfile: Optional[str]=None,
1212-
ignore_errors: Optional[bool]=None,
1213-
omit: Optional[Union[str, List[str]]]=None,
1214-
include: Optional[Union[str, List[str]]]=None,
1215-
contexts: Optional[List[str]]=None,
1210+
morfs: Optional[Iterable[TMorf]] = None,
1211+
outfile: Optional[str] = None,
1212+
ignore_errors: Optional[bool] = None,
1213+
omit: Optional[Union[str, List[str]]] = None,
1214+
include: Optional[Union[str, List[str]]] = None,
1215+
contexts: Optional[List[str]] = None,
12161216
) -> float:
12171217
"""Generate an LCOV report of coverage results.
12181218

‎coverage/data.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from coverage.sqldata import CoverageData
2525

2626

27-
def line_counts(data: CoverageData, fullpath: bool=False) -> Dict[str, int]:
27+
def line_counts(data: CoverageData, fullpath: bool = False) -> Dict[str, int]:
2828
"""Return a dict summarizing the line coverage data.
2929
3030
Keys are based on the file names, and values are the number of executed
@@ -62,7 +62,7 @@ def add_data_to_hash(data: CoverageData, filename: str, hasher: Hasher) -> None:
6262
hasher.update(data.file_tracer(filename))
6363

6464

65-
def combinable_files(data_file: str, data_paths: Optional[Iterable[str]]=None) -> List[str]:
65+
def combinable_files(data_file: str, data_paths: Optional[Iterable[str]] = None) -> List[str]:
6666
"""Make a list of data files to be combined.
6767
6868
`data_file` is a path to a data file. `data_paths` is a list of files or
@@ -87,11 +87,11 @@ def combinable_files(data_file: str, data_paths: Optional[Iterable[str]]=None) -
8787

8888
def combine_parallel_data(
8989
data: CoverageData,
90-
aliases: Optional[PathAliases]=None,
91-
data_paths: Optional[Iterable[str]]=None,
92-
strict: bool=False,
93-
keep: bool=False,
94-
message: Optional[Callable[[str], None]]=None,
90+
aliases: Optional[PathAliases] = None,
91+
data_paths: Optional[Iterable[str]] = None,
92+
strict: bool = False,
93+
keep: bool = False,
94+
message: Optional[Callable[[str], None]] = None,
9595
) -> None:
9696
"""Combine a number of data files together.
9797

0 commit comments

Comments
 (0)