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

Drop Python 2 Support (#793)

Browse Source 
* Remove Python 2 support

* Remove u-strings

* Remove docker symlinks

* Remove from travis

* Update requirements

* Upgrade flake8/pylint

* Fixes

* Manual

* Run pyupgrade

* Lint

* Remove base_int

* Fix

* Update platformio_api.py

* Update component.cpp
This commit is contained in:
Otto Winter
2019-12-07 18:28:55 +01:00
committed by GitHub
parent b5714cd70f
commit 056c72d50d
78 changed files with 815 additions and 1097 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
esphome/pins.py
View File

@@ -1,5 +1,3 @@
from __future__ import division
import logging
import esphome.config_validation as cv
@@ -271,13 +269,13 @@ def _lookup_pin(value):
return board_pins[value]
if value in base_pins:
return base_pins[value]
raise cv.Invalid(u"Cannot resolve pin name '{}' for board {}.".format(value, CORE.board))
raise cv.Invalid(f"Cannot resolve pin name '{value}' for board {CORE.board}.")
def _translate_pin(value):
if isinstance(value, dict) or value is None:
raise cv.Invalid(u"This variable only supports pin numbers, not full pin schemas "
u"(with inverted and mode).")
raise cv.Invalid("This variable only supports pin numbers, not full pin schemas "
"(with inverted and mode).")
if isinstance(value, int):
return value
try:
@@ -301,27 +299,27 @@ def validate_gpio_pin(value):
value = _translate_pin(value)
if CORE.is_esp32:
if value < 0 or value > 39:
raise cv.Invalid(u"ESP32: Invalid pin number: {}".format(value))
raise cv.Invalid(f"ESP32: Invalid pin number: {value}")
if value in _ESP_SDIO_PINS:
raise cv.Invalid("This pin cannot be used on ESP32s and is already used by "
"the flash interface (function: {})".format(_ESP_SDIO_PINS[value]))
if 9 <= value <= 10:
_LOGGER.warning(u"ESP32: Pin %s (9-10) might already be used by the "
u"flash interface in QUAD IO flash mode.", value)
_LOGGER.warning("ESP32: Pin %s (9-10) might already be used by the "
"flash interface in QUAD IO flash mode.", value)
if value in (20, 24, 28, 29, 30, 31):
# These pins are not exposed in GPIO mux (reason unknown)
# but they're missing from IO_MUX list in datasheet
raise cv.Invalid("The pin GPIO{} is not usable on ESP32s.".format(value))
raise cv.Invalid(f"The pin GPIO{value} is not usable on ESP32s.")
return value
if CORE.is_esp8266:
if value < 0 or value > 17:
raise cv.Invalid(u"ESP8266: Invalid pin number: {}".format(value))
raise cv.Invalid(f"ESP8266: Invalid pin number: {value}")
if value in _ESP_SDIO_PINS:
raise cv.Invalid("This pin cannot be used on ESP8266s and is already used by "
"the flash interface (function: {})".format(_ESP_SDIO_PINS[value]))
if 9 <= value <= 10:
_LOGGER.warning(u"ESP8266: Pin %s (9-10) might already be used by the "
u"flash interface in QUAD IO flash mode.", value)
_LOGGER.warning("ESP8266: Pin %s (9-10) might already be used by the "
"flash interface in QUAD IO flash mode.", value)
return value
raise NotImplementedError
@@ -349,8 +347,8 @@ def output_pin(value):
value = validate_gpio_pin(value)
if CORE.is_esp32:
if 34 <= value <= 39:
raise cv.Invalid(u"ESP32: GPIO{} (34-39) can only be used as an "
u"input pin.".format(value))
raise cv.Invalid("ESP32: GPIO{} (34-39) can only be used as an "
"input pin.".format(value))
return value
if CORE.is_esp8266:
if value == 17:
@@ -364,11 +362,11 @@ def analog_pin(value):
if CORE.is_esp32:
if 32 <= value <= 39: # ADC1
return value
raise cv.Invalid(u"ESP32: Only pins 32 though 39 support ADC.")
raise cv.Invalid("ESP32: Only pins 32 though 39 support ADC.")
if CORE.is_esp8266:
if value == 17: # A0
return value
raise cv.Invalid(u"ESP8266: Only pin A0 (GPIO17) supports ADC.")
raise cv.Invalid("ESP8266: Only pin A0 (GPIO17) supports ADC.")
raise NotImplementedError