sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-09-05 21:02:20 +01:00
Code Issues Releases Wiki Activity

Remove a bunch of unnecessary pylint disabling (#4079)

Browse Source
This commit is contained in:
Jesse Hills
2022-11-24 11:09:19 +13:00
committed by GitHub
parent 81b4078871
commit b184b01600
16 changed files with 24 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
esphome/config_helpers.py
View File

@@ -26,7 +26,6 @@ def read_config_file(path: str) -> str:
def merge_config(full_old, full_new):
def merge(old, new):
# pylint: disable=no-else-return
if isinstance(new, dict):
if not isinstance(old, dict):
return new
@@ -34,11 +33,11 @@ def merge_config(full_old, full_new):
for k, v in new.items():
res[k] = merge(old[k], v) if k in old else v
return res
elif isinstance(new, list):
if isinstance(new, list):
if not isinstance(old, list):
return new
return old + new
elif new is None:
if new is None:
return old
return new