From 8328ea6bd79c26483ae4bbbea7e4f04660ecea09 Mon Sep 17 00:00:00 2001
From: Alexei Chetroi <lexoid@gmail.com>
Date: Sun, 5 May 2019 17:15:35 -0400
Subject: [PATCH] Bump ZHA modules versions. (#23705)

* Bump ZHA modules versions.

Bump bellows-homeassistant version.
Bump zigpy-homeassistant version.
Bump zigpy-xbee-homeassistant version.

* Update requirements_*.txt
---
 homeassistant/components/zha/__init__.py     |  5 -----
 homeassistant/components/zha/core/patches.py | 17 -----------------
 homeassistant/components/zha/manifest.json   |  6 +++---
 requirements_all.txt                         |  6 +++---
 requirements_test_all.txt                    |  4 ++--
 5 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/homeassistant/components/zha/__init__.py b/homeassistant/components/zha/__init__.py
index 64760170150..87c405873ee 100644
--- a/homeassistant/components/zha/__init__.py
+++ b/homeassistant/components/zha/__init__.py
@@ -17,7 +17,6 @@ from .core.const import (
     CONF_RADIO_TYPE, CONF_USB_PATH, DATA_ZHA, DATA_ZHA_CONFIG,
     DATA_ZHA_CORE_COMPONENT, DATA_ZHA_DISPATCHERS, DATA_ZHA_GATEWAY,
     DEFAULT_BAUDRATE, DEFAULT_RADIO_TYPE, DOMAIN, ENABLE_QUIRKS, RadioType)
-from .core.patches import apply_cluster_listener_patch
 from .core.registries import establish_device_mappings
 
 DEVICE_CONFIG_SCHEMA_ENTRY = vol.Schema({
@@ -91,10 +90,6 @@ async def async_setup_entry(hass, config_entry):
         # pylint: disable=W0611, W0612
         import zhaquirks  # noqa
 
-    # patch zigpy listener to prevent flooding logs with warnings due to
-    # how zigpy implemented its listeners
-    apply_cluster_listener_patch()
-
     zha_gateway = ZHAGateway(hass, config)
     await zha_gateway.async_initialize(config_entry)
 
diff --git a/homeassistant/components/zha/core/patches.py b/homeassistant/components/zha/core/patches.py
index 8f708a568d1..63c01ed04fd 100644
--- a/homeassistant/components/zha/core/patches.py
+++ b/homeassistant/components/zha/core/patches.py
@@ -5,23 +5,6 @@ For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/zha/
 """
 
-import types
-
-
-def apply_cluster_listener_patch():
-    """Apply patches to ZHA objects."""
-    # patch zigpy listener to prevent flooding logs with warnings due to
-    # how zigpy implemented its listeners
-    from zigpy.appdb import ClusterPersistingListener
-
-    def zha_send_event(self, cluster, command, args):
-        pass
-
-    ClusterPersistingListener.zha_send_event = types.MethodType(
-        zha_send_event,
-        ClusterPersistingListener
-    )
-
 
 def apply_application_controller_patch(zha_gateway):
     """Apply patches to ZHA objects."""
diff --git a/homeassistant/components/zha/manifest.json b/homeassistant/components/zha/manifest.json
index e107a980aa6..f70198e5690 100644
--- a/homeassistant/components/zha/manifest.json
+++ b/homeassistant/components/zha/manifest.json
@@ -3,11 +3,11 @@
   "name": "Zigbee Home Automation",
   "documentation": "https://www.home-assistant.io/components/zha",
   "requirements": [
-    "bellows-homeassistant==0.7.2",
+    "bellows-homeassistant==0.7.3",
     "zha-quirks==0.0.9",
     "zigpy-deconz==0.1.4",
-    "zigpy-homeassistant==0.3.2",
-    "zigpy-xbee-homeassistant==0.2.0"
+    "zigpy-homeassistant==0.3.3",
+    "zigpy-xbee-homeassistant==0.2.1"
   ],
   "dependencies": [],
   "codeowners": [
diff --git a/requirements_all.txt b/requirements_all.txt
index 0b5320e26a1..650c503cbbb 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -224,7 +224,7 @@ batinfo==0.4.2
 beautifulsoup4==4.7.1
 
 # homeassistant.components.zha
-bellows-homeassistant==0.7.2
+bellows-homeassistant==0.7.3
 
 # homeassistant.components.bmw_connected_drive
 bimmer_connected==0.5.3
@@ -1857,10 +1857,10 @@ ziggo-mediabox-xl==1.1.0
 zigpy-deconz==0.1.4
 
 # homeassistant.components.zha
-zigpy-homeassistant==0.3.2
+zigpy-homeassistant==0.3.3
 
 # homeassistant.components.zha
-zigpy-xbee-homeassistant==0.2.0
+zigpy-xbee-homeassistant==0.2.1
 
 # homeassistant.components.zoneminder
 zm-py==0.3.3
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 6279b045b61..a96e1c5f506 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -70,7 +70,7 @@ av==6.1.2
 axis==22
 
 # homeassistant.components.zha
-bellows-homeassistant==0.7.2
+bellows-homeassistant==0.7.3
 
 # homeassistant.components.caldav
 caldav==0.6.1
@@ -342,4 +342,4 @@ vultr==0.1.2
 wakeonlan==1.1.6
 
 # homeassistant.components.zha
-zigpy-homeassistant==0.3.2
+zigpy-homeassistant==0.3.3