mirror of
https://github.com/Threnklyn/esphome-dev.git
synced 2026-05-27 00:17:22 +02:00
Otto Winter
6682c43dfa
## Description: Move esphome-core codebase into esphome (and a bunch of other refactors). See https://github.com/esphome/feature-requests/issues/97 Yes this is a shit ton of work and no there's no way to automate it :( But it will be worth it 👍 Progress: - Core support (file copy etc): 80% - Base Abstractions (light, switch): ~50% - Integrations: ~10% - Working? Yes, (but only with ported components). Other refactors: - Moves all codegen related stuff into a single class: `esphome.codegen` (imported as `cg`) - Rework coroutine syntax - Move from `component/platform.py` to `domain/component.py` structure as with HA - Move all defaults out of C++ and into config validation. - Remove `make_...` helpers from Application class. Reason: Merge conflicts with every single new integration. - Pointer Variables are stored globally instead of locally in setup(). Reason: stack size limit. Future work: - Rework const.py - Move all `CONF_...` into a conf class (usage `conf.UPDATE_INTERVAL` vs `CONF_UPDATE_INTERVAL`). Reason: Less convoluted import block - Enable loading from `custom_components` folder. **Related issue (if applicable):** https://github.com/esphome/feature-requests/issues/97 **Pull request in [esphome-docs](https://github.com/esphome/esphome-docs) with documentation (if applicable):** esphome/esphome-docs#<esphome-docs PR number goes here> ## Checklist: - [ ] The code change is tested and works locally. - [ ] Tests have been added to verify that the new code works (under `tests/` folder). If user exposed functionality or configuration variables are added/changed: - [ ] Documentation added/updated in [esphomedocs](https://github.com/OttoWinter/esphomedocs).
82 lines
1.7 KiB
Python
82 lines
1.7 KiB
Python
import functools
|
|
import sys
|
|
|
|
PYTHON_MAJOR = sys.version_info[0]
|
|
IS_PY2 = PYTHON_MAJOR == 2
|
|
IS_PY3 = PYTHON_MAJOR == 3
|
|
|
|
|
|
# pylint: disable=no-else-return
|
|
def safe_input(line):
|
|
if IS_PY2:
|
|
return raw_input(line)
|
|
else:
|
|
return input(line)
|
|
|
|
|
|
if IS_PY2:
|
|
text_type = unicode
|
|
string_types = (str, unicode)
|
|
integer_types = (int, long)
|
|
binary_type = str
|
|
else:
|
|
text_type = str
|
|
string_types = (str,)
|
|
integer_types = (int,)
|
|
binary_type = bytes
|
|
|
|
|
|
def byte_to_bytes(val): # type: (int) -> bytes
|
|
if IS_PY2:
|
|
return chr(val)
|
|
else:
|
|
return bytes([val])
|
|
|
|
|
|
def char_to_byte(val): # type: (str) -> int
|
|
if IS_PY2:
|
|
if isinstance(val, string_types):
|
|
return ord(val)
|
|
elif isinstance(val, int):
|
|
return val
|
|
else:
|
|
raise ValueError
|
|
else:
|
|
if isinstance(val, str):
|
|
return ord(val)
|
|
elif isinstance(val, int):
|
|
return val
|
|
else:
|
|
raise ValueError
|
|
|
|
|
|
def format_bytes(val):
|
|
if IS_PY2:
|
|
return ' '.join('{:02X}'.format(ord(x)) for x in val)
|
|
else:
|
|
return ' '.join('{:02X}'.format(x) for x in val)
|
|
|
|
|
|
def sort_by_cmp(list_, cmp):
|
|
if IS_PY2:
|
|
list_.sort(cmp=cmp)
|
|
else:
|
|
list_.sort(key=functools.cmp_to_key(cmp))
|
|
|
|
|
|
def indexbytes(buf, i):
|
|
if IS_PY3:
|
|
return buf[i]
|
|
else:
|
|
return ord(buf[i])
|
|
|
|
|
|
if IS_PY2:
|
|
def decode_text(data, encoding='utf-8', errors='strict'):
|
|
# type: (str, str, str) -> unicode
|
|
return unicode(data, encoding=encoding, errors=errors)
|
|
else:
|
|
def decode_text(data, encoding='utf-8', errors='strict'):
|
|
# type: (bytes, str, str) -> str
|
|
return data.decode(encoding=encoding, errors=errors)
|