Skip to content

Commit 576152e

Browse files
craigbarrattcraigbarratt
committed
pylint updates
1 parent 27cb82c commit 576152e

File tree

11 files changed

+90
-52
lines changed

11 files changed

+90
-52
lines changed

‎custom_components/pyscript/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,14 @@ async def update_yaml_config(hass: HomeAssistant, config_entry: ConfigEntry) ->
109109
# since they affect all scripts
110110
#
111111
config_save = {
112-
param: config_entry.data.get(param, False) for param in {CONF_HASS_IS_GLOBAL, CONF_ALLOW_ALL_IMPORTS}
112+
param: config_entry.data.get(param, False) for param in [CONF_HASS_IS_GLOBAL, CONF_ALLOW_ALL_IMPORTS]
113113
}
114114
if DOMAIN not in hass.data:
115115
hass.data.setdefault(DOMAIN, {})
116116
if CONFIG_ENTRY_OLD in hass.data[DOMAIN]:
117117
old_entry = hass.data[DOMAIN][CONFIG_ENTRY_OLD]
118118
hass.data[DOMAIN][CONFIG_ENTRY_OLD] = config_save
119-
for param in {CONF_HASS_IS_GLOBAL, CONF_ALLOW_ALL_IMPORTS}:
119+
for param in [CONF_HASS_IS_GLOBAL, CONF_ALLOW_ALL_IMPORTS]:
120120
if old_entry.get(param, False) != config_entry.data.get(param, False):
121121
return True
122122
hass.data[DOMAIN][CONFIG_ENTRY_OLD] = config_save

‎custom_components/pyscript/eval.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ async def do_service_call(func, ast_ctx, data):
537537
got_trig = True
538538
if not got_trig:
539539
break
540-
for dec_name in {"state_active", "time_active", "task_unique"}:
540+
for dec_name in ["state_active", "time_active", "task_unique"]:
541541
if dec_name in trig_decs:
542542
trig_args[dec_name] = trig_decs[dec_name][0]
543543

@@ -599,8 +599,8 @@ async def resolve_nonlocals(self, ast_ctx):
599599
args.append(self.func_def.args.vararg.arg)
600600
if self.func_def.args.kwarg:
601601
args.append(self.func_def.args.kwarg.arg)
602-
for i in range(len(self.func_def.args.kwonlyargs)):
603-
args.append(self.func_def.args.kwonlyargs[i].arg)
602+
for kwonlyarg in self.func_def.args.kwonlyargs:
603+
args.append(kwonlyarg.arg)
604604
nonlocal_names = set()
605605
global_names = set()
606606
var_names = set(args)
@@ -673,8 +673,8 @@ async def call(self, ast_ctx, *args, **kwargs):
673673
if args is None:
674674
args = []
675675
kwargs = kwargs.copy() if kwargs else {}
676-
for i in range(len(self.func_def.args.args)):
677-
var_name = self.func_def.args.args[i].arg
676+
for i, func_def_arg in enumerate(self.func_def.args.args):
677+
var_name = func_def_arg.arg
678678
val = None
679679
if i < len(args):
680680
val = args[i]
@@ -690,8 +690,8 @@ async def call(self, ast_ctx, *args, **kwargs):
690690
f"{self.name}() missing {self.num_posn_arg - i} required positional arguments"
691691
)
692692
sym_table[var_name] = val
693-
for i in range(len(self.func_def.args.kwonlyargs)):
694-
var_name = self.func_def.args.kwonlyargs[i].arg
693+
for i, kwonlyarg in enumerate(self.func_def.args.kwonlyargs):
694+
var_name = kwonlyarg.arg
695695
if var_name in kwargs:
696696
val = kwargs[var_name]
697697
del kwargs[var_name]
@@ -1341,7 +1341,7 @@ async def recurse_assign(self, lhs, val):
13411341
"""Recursive assignment."""
13421342
if isinstance(lhs, ast.Tuple):
13431343
try:
1344-
vals = [*(val.__iter__())]
1344+
vals = [*(iter(val))]
13451345
except Exception:
13461346
raise TypeError("cannot unpack non-iterable object") # pylint: disable=raise-missing-from
13471347
got_star = 0
@@ -1892,7 +1892,7 @@ async def call_func(self, func, func_name, *args, **kwargs):
18921892
# it is later garbage collected
18931893
#
18941894
inst_weak = weakref.ref(inst)
1895-
for name in inst.__dir__():
1895+
for name in dir(inst):
18961896
value = getattr(inst, name)
18971897
if type(value) is not EvalFuncVar:
18981898
continue

‎custom_components/pyscript/requirements.py‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -297,24 +297,25 @@ async def install_requirements(hass, config_entry, pyscript_folder):
297297

298298
if requirements_to_install:
299299
_LOGGER.info(
300-
"Installing the following packages: %s", str(requirements_to_install),
300+
"Installing the following packages: %s",
301+
str(requirements_to_install),
301302
)
302303
await async_process_requirements(
303304
hass,
304305
DOMAIN,
305306
[
306-
f"{package}=={requirements_to_install[package][ATTR_VERSION]}"
307-
if requirements_to_install[package][ATTR_VERSION] != UNPINNED_VERSION
307+
f"{package}=={pkg_info[ATTR_VERSION]}"
308+
if pkg_info[ATTR_VERSION] != UNPINNED_VERSION
308309
else package
309-
for package in requirements_to_install
310+
for package, pkg_info in requirements_to_install.items()
310311
],
311312
)
312313
else:
313314
_LOGGER.debug("No new packages to install")
314315

315316
# Update package tracker in config entry for next time
316317
pyscript_installed_packages.update(
317-
{package: requirements_to_install[package][ATTR_VERSION] for package in requirements_to_install}
318+
{package: pkg_info[ATTR_VERSION] for package, pkg_info in requirements_to_install.items()}
318319
)
319320

320321
# If any requirements were unpinned, get their version now so they can be pinned later

‎custom_components/pyscript/trigger.py‎

Lines changed: 40 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from croniter import croniter
1313

1414
from homeassistant.core import Context
15-
import homeassistant.helpers.sun as sun
15+
from homeassistant.helpers import sun
1616

1717
from .const import LOGGER_PATH
1818
from .eval import AstEval, EvalFunc, EvalFuncVar
@@ -308,7 +308,9 @@ async def wait_until(
308308
return {"trigger_type": "state"}
309309

310310
_LOGGER.debug(
311-
"trigger %s wait_until: watching vars %s", ast_ctx.name, state_trig_ident,
311+
"trigger %s wait_until: watching vars %s",
312+
ast_ctx.name,
313+
state_trig_ident,
312314
)
313315
if len(state_trig_ident) > 0:
314316
await State.notify_add(state_trig_ident, notify_q)
@@ -368,7 +370,10 @@ async def wait_until(
368370
if time_trigger is not None:
369371
time_next = cls.timer_trigger_next(time_trigger, now, startup_time)
370372
_LOGGER.debug(
371-
"trigger %s wait_until time_next = %s, now = %s", ast_ctx.name, time_next, now,
373+
"trigger %s wait_until time_next = %s, now = %s",
374+
ast_ctx.name,
375+
time_next,
376+
now,
372377
)
373378
if time_next is not None:
374379
this_timeout = (time_next - now).total_seconds()
@@ -390,7 +395,8 @@ async def wait_until(
390395
if this_timeout is None:
391396
if state_trigger is None and event_trigger is None and mqtt_trigger is None:
392397
_LOGGER.debug(
393-
"trigger %s wait_until no next time - returning with none", ast_ctx.name,
398+
"trigger %s wait_until no next time - returning with none",
399+
ast_ctx.name,
394400
)
395401
ret = {"trigger_type": "none"}
396402
break
@@ -522,7 +528,9 @@ async def wait_until(
522528
break
523529
else:
524530
_LOGGER.error(
525-
"trigger %s wait_until got unexpected queue message %s", ast_ctx.name, notify_type,
531+
"trigger %s wait_until got unexpected queue message %s",
532+
ast_ctx.name,
533+
notify_type,
526534
)
527535

528536
if len(state_trig_ident) > 0:
@@ -771,7 +779,10 @@ class TrigInfo:
771779
"""Class for all trigger-decorated functions."""
772780

773781
def __init__(
774-
self, name, trig_cfg, global_ctx=None,
782+
self,
783+
name,
784+
trig_cfg,
785+
global_ctx=None,
775786
):
776787
"""Create a new TrigInfo."""
777788
self.name = name
@@ -870,7 +881,9 @@ def __init__(
870881
if self.event_trigger is not None:
871882
if len(self.event_trigger) == 2:
872883
self.event_trig_expr = AstEval(
873-
f"{self.name} @event_trigger()", self.global_ctx, logger_name=self.name,
884+
f"{self.name} @event_trigger()",
885+
self.global_ctx,
886+
logger_name=self.name,
874887
)
875888
Function.install_ast_funcs(self.event_trig_expr)
876889
self.event_trig_expr.parse(self.event_trigger[1], mode="eval")
@@ -883,7 +896,9 @@ def __init__(
883896
if self.mqtt_trigger is not None:
884897
if len(self.mqtt_trigger) == 2:
885898
self.mqtt_trig_expr = AstEval(
886-
f"{self.name} @mqtt_trigger()", self.global_ctx, logger_name=self.name,
899+
f"{self.name} @mqtt_trigger()",
900+
self.global_ctx,
901+
logger_name=self.name,
887902
)
888903
Function.install_ast_funcs(self.mqtt_trig_expr)
889904
self.mqtt_trig_expr.parse(self.mqtt_trigger[1], mode="eval")
@@ -994,7 +1009,10 @@ async def trigger_watch(self):
9941009
if self.time_trigger:
9951010
time_next = TrigTime.timer_trigger_next(self.time_trigger, now, startup_time)
9961011
_LOGGER.debug(
997-
"trigger %s time_next = %s, now = %s", self.name, time_next, now,
1012+
"trigger %s time_next = %s, now = %s",
1013+
self.name,
1014+
time_next,
1015+
now,
9981016
)
9991017
if time_next is not None:
10001018
timeout = (time_next - now).total_seconds()
@@ -1157,7 +1175,9 @@ async def trigger_watch(self):
11571175

11581176
if not trig_ok:
11591177
_LOGGER.debug(
1160-
"trigger %s got %s trigger, but not active", self.name, notify_type,
1178+
"trigger %s got %s trigger, but not active",
1179+
self.name,
1180+
notify_type,
11611181
)
11621182
continue
11631183

@@ -1231,7 +1251,10 @@ def call_action(self, notify_type, func_args, run_task=True):
12311251
Function.hass.bus.async_fire("pyscript_running", event_data, context=hass_context)
12321252

12331253
_LOGGER.debug(
1234-
"trigger %s got %s trigger, running action (kwargs = %s)", self.name, notify_type, func_args,
1254+
"trigger %s got %s trigger, running action (kwargs = %s)",
1255+
self.name,
1256+
notify_type,
1257+
func_args,
12351258
)
12361259

12371260
async def do_func_call(func, ast_ctx, task_unique, task_unique_func, hass_context, **kwargs):
@@ -1245,7 +1268,12 @@ async def do_func_call(func, ast_ctx, task_unique, task_unique_func, hass_contex
12451268
ast_ctx.get_logger().error(ast_ctx.get_exception_long())
12461269

12471270
func = do_func_call(
1248-
self.action, action_ast_ctx, self.task_unique, task_unique_func, hass_context, **func_args,
1271+
self.action,
1272+
action_ast_ctx,
1273+
self.task_unique,
1274+
task_unique_func,
1275+
hass_context,
1276+
**func_args,
12491277
)
12501278
if run_task:
12511279
task = Function.create_task(func, ast_ctx=action_ast_ctx)

‎pylintrc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ good-names=id,i,j,k,ex,Run,_,fp,T
2626
# wrong-import-order - isort guards this
2727
disable=
2828
format,
29-
abstract-class-little-used,
3029
abstract-method,
3130
broad-except,
3231
cyclic-import,

‎tests/test_decorator_errors.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44
from datetime import datetime as dt
55
from unittest.mock import mock_open, patch
66

7+
from custom_components.pyscript import trigger
78
from custom_components.pyscript.const import DOMAIN
89
from custom_components.pyscript.function import Function
9-
import custom_components.pyscript.trigger as trigger
10-
1110
from homeassistant.const import EVENT_HOMEASSISTANT_STARTED, EVENT_STATE_CHANGED
1211
from homeassistant.setup import async_setup_component
1312

@@ -35,7 +34,8 @@ async def setup_script(hass, notify_q, now, source):
3534
), patch(
3635
"custom_components.pyscript.global_ctx.os.path.getmtime", return_value=1000
3736
), patch(
38-
"custom_components.pyscript.install_requirements", return_value=None,
37+
"custom_components.pyscript.install_requirements",
38+
return_value=None,
3939
):
4040
assert await async_setup_component(hass, "pyscript", {DOMAIN: {}})
4141

‎tests/test_decorators.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
from datetime import datetime as dt
55
from unittest.mock import mock_open, patch
66

7+
from custom_components.pyscript import trigger
78
from custom_components.pyscript.const import DOMAIN
89
from custom_components.pyscript.function import Function
9-
import custom_components.pyscript.trigger as trigger
1010
from homeassistant.const import EVENT_HOMEASSISTANT_STARTED, EVENT_STATE_CHANGED
1111
from homeassistant.setup import async_setup_component
1212

‎tests/test_function.py‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
import re
77
from unittest.mock import MagicMock, Mock, patch
88

9-
from custom_components.pyscript.const import CONF_ALLOW_ALL_IMPORTS, CONF_HASS_IS_GLOBAL, DOMAIN, FOLDER
10-
from custom_components.pyscript.function import Function
11-
import custom_components.pyscript.trigger as trigger
129
from mock_open import MockOpen
1310
import pytest
1411

12+
from custom_components.pyscript import trigger
13+
from custom_components.pyscript.const import CONF_ALLOW_ALL_IMPORTS, CONF_HASS_IS_GLOBAL, DOMAIN, FOLDER
14+
from custom_components.pyscript.function import Function
1515
from homeassistant.const import EVENT_HOMEASSISTANT_STARTED, EVENT_STATE_CHANGED
1616
from homeassistant.core import Context
1717
from homeassistant.setup import async_setup_component
@@ -136,7 +136,8 @@ def glob_side_effect(path, recursive=None):
136136
), patch(
137137
"homeassistant.config.load_yaml_config_file", return_value=config
138138
), patch(
139-
"custom_components.pyscript.install_requirements", return_value=None,
139+
"custom_components.pyscript.install_requirements",
140+
return_value=None,
140141
), patch(
141142
"custom_components.pyscript.watchdog_start", return_value=None
142143
), patch(
@@ -526,7 +527,7 @@ def func9(var_name=None, value=None, old_value=None):
526527
hass.states.async_set("pyscript.f5var1", 0)
527528
assert literal_eval(await wait_until_done(notify_q)) == [seq_num, "pyscript.f5var1", "0"]
528529
#
529-
# make sure it doesn't trigger on attribte changes
530+
# make sure it doesn't trigger on attribute changes
530531
#
531532
hass.states.async_set("pyscript.f5var1", 0, {"attr1": 123, "attr2": 10})
532533
hass.states.async_set("pyscript.f5var1", 0, {"attr1": 123, "attr2": 20})

‎tests/test_init.py‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@
55
import pathlib
66
from unittest.mock import mock_open, patch
77

8+
from custom_components.pyscript import trigger
89
from custom_components.pyscript.const import DOMAIN
910
from custom_components.pyscript.event import Event
1011
from custom_components.pyscript.function import Function
1112
from custom_components.pyscript.global_ctx import GlobalContextMgr
1213
from custom_components.pyscript.state import State
13-
import custom_components.pyscript.trigger as trigger
14-
1514
from homeassistant import loader
1615
from homeassistant.const import EVENT_HOMEASSISTANT_STARTED, EVENT_STATE_CHANGED
1716
from homeassistant.core import Context
@@ -41,7 +40,8 @@ async def setup_script(hass, notify_q, now, source, script_name="/hello.py"):
4140
), patch(
4241
"custom_components.pyscript.global_ctx.os.path.getmtime", return_value=1000
4342
), patch(
44-
"custom_components.pyscript.install_requirements", return_value=None,
43+
"custom_components.pyscript.install_requirements",
44+
return_value=None,
4545
):
4646
assert await async_setup_component(hass, "pyscript", {DOMAIN: {}})
4747

@@ -198,7 +198,8 @@ def func_yaml_doc_string(param2=None, param3=None):
198198
)
199199

200200
with patch(
201-
"homeassistant.loader.async_get_custom_components", return_value={"pyscript": integration},
201+
"homeassistant.loader.async_get_custom_components",
202+
return_value={"pyscript": integration},
202203
):
203204
descriptions = (await async_get_all_descriptions(hass))[DOMAIN]
204205

@@ -285,7 +286,9 @@ def call_service(domain=None, name=None, **kwargs):
285286
assert literal_eval(ret) == [5, {"trigger_type": "service"}, 1, 0]
286287

287288
await hass.services.async_call(
288-
"pyscript", "call_service", {"domain": "pyscript", "name": "func2", "arg1": "string1"},
289+
"pyscript",
290+
"call_service",
291+
{"domain": "pyscript", "name": "func2", "arg1": "string1"},
289292
)
290293
ret = await wait_until_done(notify_q)
291294
assert literal_eval(ret) == [5, {"trigger_type": "service", "arg1": "string1"}, 1, 0]
@@ -427,7 +430,8 @@ def func5(var_name=None, value=None):
427430
), patch(
428431
"custom_components.pyscript.global_ctx.os.path.getmtime", return_value=1000
429432
), patch(
430-
"custom_components.pyscript.install_requirements", return_value=None,
433+
"custom_components.pyscript.install_requirements",
434+
return_value=None,
431435
):
432436
reload_param = {}
433437
if i % 2 == 1:

0 commit comments

Comments
 (0)