diff --git a/homeassistant/components/kira/__init__.py b/homeassistant/components/kira/__init__.py index 7cf27d342f51c9edf10d009a7730d783d78047b2..723a13e426a1e380cebc262c9c3cba125e464a36 100644 --- a/homeassistant/components/kira/__init__.py +++ b/homeassistant/components/kira/__init__.py @@ -60,7 +60,7 @@ def load_codes(path): codes = [] if os.path.exists(path): with open(path) as code_file: - data = yaml.load(code_file) or [] + data = yaml.safe_load(code_file) or [] for code in data: try: codes.append(CODE_SCHEMA(code)) diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt index 619c6fad581a1148c360846c68c9b8875f770b6e..9e83ca6fd0e02e8149b7dc61e0e8764e3af9371a 100644 --- a/homeassistant/package_constraints.txt +++ b/homeassistant/package_constraints.txt @@ -17,7 +17,7 @@ netdisco==2.6.0 pip>=8.0.3 python-slugify==3.0.2 pytz>=2019.01 -pyyaml>=3.13,<4 +pyyaml==5.1 requests==2.22.0 ruamel.yaml==0.15.97 sqlalchemy==1.3.3 diff --git a/requirements_all.txt b/requirements_all.txt index b973695cba3a672dbd2929c4bff542e4cd762e52..2c4920a246908765a220d96ba9d833dfc64569e0 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -12,7 +12,7 @@ cryptography==2.6.1 pip>=8.0.3 python-slugify==3.0.2 pytz>=2019.01 -pyyaml>=3.13,<4 +pyyaml==5.1 requests==2.22.0 ruamel.yaml==0.15.97 voluptuous==0.11.5 diff --git a/setup.py b/setup.py index d9c135240707339a907cca68dd35c6cf7d5fac1f..3278ec197d4574d220622ebcbcc78856f6d4fa2c 100755 --- a/setup.py +++ b/setup.py @@ -46,7 +46,7 @@ REQUIRES = [ 'pip>=8.0.3', 'python-slugify==3.0.2', 'pytz>=2019.01', - 'pyyaml>=3.13,<4', + 'pyyaml==5.1', 'requests==2.22.0', 'ruamel.yaml==0.15.97', 'voluptuous==0.11.5', diff --git a/tests/components/apns/test_notify.py b/tests/components/apns/test_notify.py index 7303f4872e3a04699dbf0c42ff1224d92ee42a91..3f8d00f8f50a25f52eaf189e1f12727b4c34ffe3 100644 --- a/tests/components/apns/test_notify.py +++ b/tests/components/apns/test_notify.py @@ -400,7 +400,7 @@ def test_write_device(): device = apns.ApnsDevice('123', 'name', 'track_id', True) apns._write_device(out, device) - data = yaml.load(out.getvalue()) + data = yaml.safe_load(out.getvalue()) assert data == { 123: { 'name': 'name', diff --git a/tests/components/scene/test_init.py b/tests/components/scene/test_init.py index 99364d51e6c5ef0a6a42665671c8a75df58d6975..94746cce0f00dc7e05ba8922e9647738aa5fdcf5 100644 --- a/tests/components/scene/test_init.py +++ b/tests/components/scene/test_init.py @@ -90,7 +90,7 @@ class TestScene(unittest.TestCase): self.light_1.entity_id, self.light_2.entity_id) with io.StringIO(config) as file: - doc = yaml_loader.yaml.load(file) + doc = yaml_loader.yaml.safe_load(file) assert setup_component(self.hass, scene.DOMAIN, doc) common.activate(self.hass, 'scene.test')