Skip to content

Commit 5742454

Browse files
committed
Edit Domain: Lint
1 parent d387368 commit 5742454

File tree

1 file changed

+19
-24
lines changed

1 file changed

+19
-24
lines changed

Orange/widgets/data/oweditdomain.py

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -378,8 +378,8 @@ def reconstruct(tname, args):
378378
"""
379379
try:
380380
constructor = globals()[tname]
381-
except KeyError:
382-
raise NameError(tname)
381+
except KeyError as exc:
382+
raise NameError(tname) from exc
383383
return constructor(*args)
384384

385385

@@ -1327,7 +1327,7 @@ def set_data_categorical(self, var, values, transform=()):
13271327
SourceNameRole: ci
13281328
}
13291329
else:
1330-
assert False, "invalid mapping: {!r}".format(tr.mapping)
1330+
assert False, f"invalid mapping: {tr.mapping}"
13311331
items.append(item)
13321332
elif var is not None:
13331333
items = [
@@ -1457,8 +1457,7 @@ def _remove_category(self):
14571457
# new level -> remove it
14581458
model.removeRow(index.row())
14591459
else:
1460-
assert False, "invalid state '{}' for {}" \
1461-
.format(state, index.row())
1460+
assert False, f"invalid state '{state}' for {index.row()}"
14621461

14631462
def _add_category(self):
14641463
"""
@@ -1633,8 +1632,7 @@ def initStyleOption(self, option, index):
16331632
text = var.name
16341633
for tr in transform:
16351634
if isinstance(tr, Rename):
1636-
text = ("{} \N{RIGHTWARDS ARROW} {}"
1637-
.format(var.name, tr.name))
1635+
text = f"{var.name} \N{RIGHTWARDS ARROW} {tr.name}"
16381636
for tr in transform:
16391637
if isinstance(tr, ReinterpretTransformTypes):
16401638
text += f" (reinterpreted as " \
@@ -2075,21 +2073,21 @@ def __init__(self):
20752073
gui.rubber(self.buttonsArea)
20762074

20772075
bbox = gui.hBox(self.buttonsArea)
2078-
breset_all = gui.button(
2076+
gui.button(
20792077
bbox, self, "Reset All",
20802078
objectName="button-reset-all",
20812079
toolTip="Reset all variables to their input state.",
20822080
autoDefault=False,
20832081
callback=self.reset_all
20842082
)
2085-
breset = gui.button(
2083+
gui.button(
20862084
bbox, self, "Reset Selected",
20872085
objectName="button-reset",
20882086
toolTip="Rest selected variable to its input state.",
20892087
autoDefault=False,
20902088
callback=self.reset_selected
20912089
)
2092-
bapply = gui.button(
2090+
gui.button(
20932091
bbox, self, "Apply",
20942092
objectName="button-apply",
20952093
toolTip="Apply changes and commit data on output.",
@@ -2281,7 +2279,7 @@ def _restore_transform(self, var):
22812279
tr.append(reconstruct(*t))
22822280
except (NameError, TypeError) as err:
22832281
warnings.warn(
2284-
"Failed to restore transform: {}, {!r}".format(t, err),
2282+
f"Failed to restore transform: {t}, {err}",
22852283
UserWarning, stacklevel=2
22862284
)
22872285
if tr:
@@ -2400,7 +2398,7 @@ def send_report(self):
24002398
parts.append(report_transform(vector.vtype, trs))
24012399
if parts:
24022400
html = ("<ul>" +
2403-
"".join(map("<li>{}</li>".format, parts)) +
2401+
"".join(f"<li>{part}</li>" for part in parts) +
24042402
"</ul>")
24052403
else:
24062404
html = "No changes"
@@ -2410,7 +2408,6 @@ def send_report(self):
24102408

24112409
@classmethod
24122410
def migrate_context(cls, context, version):
2413-
# pylint: disable=bad-continuation
24142411
if version is None or version <= 1:
24152412
hints_ = context.values.get("domain_change_hints", ({}, -2))[0]
24162413
store = []
@@ -2552,13 +2549,13 @@ def type_char(value: ReinterpretTransform) -> str:
25522549
return ReinterpretTypeCode.get(type(value), "?")
25532550

25542551
def strike(text):
2555-
return "<s>{}</s>".format(escape(text))
2552+
return f"<s>{escape(text)}</s>"
25562553

25572554
def i(text):
2558-
return "<i>{}</i>".format(escape(text))
2555+
return f"<i>{escape(text)}</i>"
25592556

25602557
def text(text):
2561-
return "<span>{}</span>".format(escape(text))
2558+
return f"<span>{escape(text)}</span>"
25622559
assert trs
25632560
rename = annotate = catmap = unlink = None
25642561
reinterpret = None
@@ -2576,12 +2573,10 @@ def text(text):
25762573
reinterpret = tr
25772574

25782575
if reinterpret is not None:
2579-
header = "{} → ({}) {}".format(
2580-
var.name, type_char(reinterpret),
2581-
rename.name if rename is not None else var.name
2582-
)
2576+
header = f"{var.name} → ({type_char(reinterpret)}) " \
2577+
f"{rename.name if rename is not None else var.name}"
25832578
elif rename is not None:
2584-
header = "{} → {}".format(var.name, rename.name)
2579+
header = f"{var.name}{rename.name}"
25852580
else:
25862581
header = var.name
25872582
if unlink is not None:
@@ -2621,9 +2616,9 @@ def text(text):
26212616
i(name) + " : " + text(old[name]) + " → " + text(new[name])
26222617
)
26232618

2624-
html = ["<div style='font-weight: bold;'>{}</div>".format(header)]
2619+
html = [f"<div style='font-weight: bold;'>{header}</div>"]
26252620
for title, contents in filter(None, [values_section, annotate_section]):
2626-
section_header = "<div>{}:</div>".format(title)
2621+
section_header = f"<div>{title}:</div>"
26272622
section_contents = "<br/>\n".join(contents)
26282623
html.append(section_header)
26292624
html.append(
@@ -2669,7 +2664,7 @@ def _parse_attributes(mapping):
26692664
# Use the same functionality that parses attributes
26702665
# when reading text files
26712666
return Orange.data.Flags([
2672-
"{}={}".format(*item) for item in mapping
2667+
f"{item[0]}={item[1]}" for item in mapping
26732668
]).attributes
26742669

26752670

0 commit comments

Comments
 (0)