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

add-black (#1593)

Browse Source 
* Add black

Update pre commit

Update pre commit

add empty line

* Format with black
This commit is contained in:
Guillermo Ruffino
2021-03-07 16:03:16 -03:00
committed by GitHub
parent 2b60b0f1fa
commit 69879920eb
398 changed files with 21624 additions and 12644 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
esphome/mqtt.py
View File

@@ -7,9 +7,20 @@ import time
import paho.mqtt.client as mqtt
from esphome.const import CONF_BROKER, CONF_DISCOVERY_PREFIX, CONF_ESPHOME, \
CONF_LOG_TOPIC, CONF_MQTT, CONF_NAME, CONF_PASSWORD, CONF_PORT, CONF_SSL_FINGERPRINTS, \
CONF_TOPIC, CONF_TOPIC_PREFIX, CONF_USERNAME
from esphome.const import (
CONF_BROKER,
CONF_DISCOVERY_PREFIX,
CONF_ESPHOME,
CONF_LOG_TOPIC,
CONF_MQTT,
CONF_NAME,
CONF_PASSWORD,
CONF_PORT,
CONF_SSL_FINGERPRINTS,
CONF_TOPIC,
CONF_TOPIC_PREFIX,
CONF_USERNAME,
)
from esphome.core import CORE, EsphomeError
from esphome.helpers import color
from esphome.util import safe_print
@@ -36,21 +47,24 @@ def initialize(config, subscriptions, on_message, username, password, client_id)
except OSError:
pass
wait_time = min(2**tries, 300)
wait_time = min(2 ** tries, 300)
_LOGGER.warning(
"Disconnected from MQTT (%s). Trying to reconnect in %s s",
result_code, wait_time)
result_code,
wait_time,
)
time.sleep(wait_time)
tries += 1
client = mqtt.Client(client_id or '')
client = mqtt.Client(client_id or "")
client.on_connect = on_connect
client.on_message = on_message
client.on_disconnect = on_disconnect
if username is None:
if config[CONF_MQTT].get(CONF_USERNAME):
client.username_pw_set(config[CONF_MQTT][CONF_USERNAME],
config[CONF_MQTT][CONF_PASSWORD])
client.username_pw_set(
config[CONF_MQTT][CONF_USERNAME], config[CONF_MQTT][CONF_PASSWORD]
)
elif username:
client.username_pw_set(username, password)
@@ -59,8 +73,14 @@ def initialize(config, subscriptions, on_message, username, password, client_id)
tls_version = ssl.PROTOCOL_TLS # pylint: disable=no-member
else:
tls_version = ssl.PROTOCOL_SSLv23
client.tls_set(ca_certs=None, certfile=None, keyfile=None, cert_reqs=ssl.CERT_REQUIRED,
tls_version=tls_version, ciphers=None)
client.tls_set(
ca_certs=None,
certfile=None,
keyfile=None,
cert_reqs=ssl.CERT_REQUIRED,
tls_version=tls_version,
ciphers=None,
)
try:
host = str(config[CONF_MQTT][CONF_BROKER])
@@ -84,17 +104,17 @@ def show_logs(config, topic=None, username=None, password=None, client_id=None):
if CONF_LOG_TOPIC in conf:
topic = config[CONF_MQTT][CONF_LOG_TOPIC][CONF_TOPIC]
elif CONF_TOPIC_PREFIX in config[CONF_MQTT]:
topic = config[CONF_MQTT][CONF_TOPIC_PREFIX] + '/debug'
topic = config[CONF_MQTT][CONF_TOPIC_PREFIX] + "/debug"
else:
topic = config[CONF_ESPHOME][CONF_NAME] + '/debug'
topic = config[CONF_ESPHOME][CONF_NAME] + "/debug"
else:
_LOGGER.error("MQTT isn't setup, can't start MQTT logs")
return 1
_LOGGER.info("Starting log output from %s", topic)
def on_message(client, userdata, msg):
time_ = datetime.now().time().strftime('[%H:%M:%S]')
payload = msg.payload.decode(errors='backslashreplace')
time_ = datetime.now().time().strftime("[%H:%M:%S]")
payload = msg.payload.decode(errors="backslashreplace")
message = time_ + payload
safe_print(message)
@@ -103,12 +123,14 @@ def show_logs(config, topic=None, username=None, password=None, client_id=None):
def clear_topic(config, topic, username=None, password=None, client_id=None):
if topic is None:
discovery_prefix = config[CONF_MQTT].get(CONF_DISCOVERY_PREFIX, 'homeassistant')
discovery_prefix = config[CONF_MQTT].get(CONF_DISCOVERY_PREFIX, "homeassistant")
name = config[CONF_ESPHOME][CONF_NAME]
topic = f'{discovery_prefix}/+/{name}/#'
topic = f"{discovery_prefix}/+/{name}/#"
_LOGGER.info("Clearing messages from '%s'", topic)
_LOGGER.info("Please close this window when no more messages appear and the "
"MQTT topic has been cleared of retained messages.")
_LOGGER.info(
"Please close this window when no more messages appear and the "
"MQTT topic has been cleared of retained messages."
)
def on_message(client, userdata, msg):
if not msg.payload or not msg.retain:
@@ -136,7 +158,9 @@ def get_fingerprint(config):
sha1 = hashlib.sha1(cert_der).hexdigest()
safe_print("SHA1 Fingerprint: " + color('cyan', sha1))
safe_print("Copy the string above into mqtt.ssl_fingerprints section of {}"
"".format(CORE.config_path))
safe_print("SHA1 Fingerprint: " + color("cyan", sha1))
safe_print(
"Copy the string above into mqtt.ssl_fingerprints section of {}"
"".format(CORE.config_path)
)
return 0