Rename Other and format code

ring_doorbell/__init__.py

@@ -15,7 +15,7 @@
 )
 from ring_doorbell.generic import RingGeneric
 from ring_doorbell.group import RingLightGroup
-from ring_doorbell.other import Other
+from ring_doorbell.other import RingOther
 from ring_doorbell.ring import Ring
 from ring_doorbell.stickup_cam import RingStickUpCam
 
@@ -26,7 +26,7 @@
     "RingStickUpCam",
     "RingLightGroup",
     "RingDoorBell",
-    "Other",
+    "RingOther",
     "RingEvent",
     "RingError",
     "AuthenticationError",

ring_doorbell/other.py

@@ -28,7 +28,7 @@
 _LOGGER = logging.getLogger(__name__)
 
 
-class Other(RingGeneric):
+class RingOther(RingGeneric):
     """Implementation for Ring Intercom."""
 
     def __init__(self, ring, device_api_id, shared=False):
@@ -230,7 +230,7 @@ def allowed_users(self):
 
         return None
 
-    def open_door(self, user_id = -1):
+    def open_door(self, user_id=-1):
         """Open the door"""
 
         if self.kind in INTERCOM_KINDS:

ring_doorbell/ring.py

@@ -10,7 +10,7 @@
 from ring_doorbell.doorbot import RingDoorBell
 from ring_doorbell.group import RingLightGroup
 from ring_doorbell.listen import RingEventListener, can_listen
-from ring_doorbell.other import Other
+from ring_doorbell.other import RingOther
 from ring_doorbell.stickup_cam import RingStickUpCam
 
 from .const import (
@@ -32,7 +32,7 @@
     "authorized_doorbots": lambda ring, description: RingDoorBell(
         ring, description, shared=True
     ),
-    "other": Other,
+    "other": RingOther,
 }
 
 

tests/conftest.py

@@ -142,7 +142,7 @@ def requests_mock_fixture():
         mock.put(
             "https://api.ring.com/clients_api/doorbots/185036587",
             status_code=204,
-            content=b""
+            content=b"",
         )
         mock.get(
             "https://api.ring.com/devices/v1/devices/185036587/settings",
@@ -154,14 +154,18 @@ def requests_mock_fixture():
         )
         mock.post(
             "https://api.ring.com/clients_api/locations/mock-location-id/invitations",
-            text="ok"
+            text="ok",
         )
         mock.delete(
-            "https://api.ring.com/clients_api/locations/mock-location-id/invitations/123456789",
-            text="ok"
+            (
+                "https://api.ring.com/clients_api/locations/"
+                "mock-location-id/invitations/123456789"
+            ),
+            text="ok",
         )
+        requestid = "44529542-3ed7-41da-807e-c170a01bac1d"
         mock.put(
             "https://api.ring.com/commands/v1/devices/185036587/device_rpc",
-            text='{"result": {"code": 0}, "id": "44529542-3ed7-41da-807e-c170a01bac1d", "jsonrpc": "2.0"}'
+            text='{"result": {"code": 0}, "id": "' + requestid + '", "jsonrpc": "2.0"}',
         )
         yield mock

tests/test_other.py

@@ -1,5 +1,6 @@
 """The tests for the Ring platform."""
 
+
 def test_other_attributes(ring):
     """Test the Ring Other class and methods."""
     dev = ring.devices()["other"][0]
@@ -16,18 +17,19 @@ def test_other_attributes(ring):
     assert dev.doorbell_volume == 8
     assert dev.mic_volume == 11
     assert dev.clip_length_max == 60
-    assert dev.connection_status == 'online'
+    assert dev.connection_status == "online"
     assert len(dev.allowed_users) == 2
-    assert dev.subscribed == True
-    assert dev.has_subscription == True
-    assert dev.unlock_duration == None
+    assert dev.subscribed is True
+    assert dev.has_subscription is True
+    assert dev.unlock_duration is None
     assert dev.keep_alive_auto == 45.0
 
     dev.update_health_data()
     assert dev.wifi_name == "ring_mock_wifi"
     assert dev.wifi_signal_category == "good"
     assert dev.wifi_signal_strength != 100
 
+
 def test_other_controls(ring, requests_mock):
     dev = ring.devices()["other"][0]
 
@@ -50,27 +52,40 @@ def test_other_controls(ring, requests_mock):
     assert history[3].path == "/devices/v1/devices/185036587/settings"
     assert history[3].text == '{"keep_alive_settings": {"keep_alive_auto": 32.2}}'
 
+
 def test_other_invitations(ring, requests_mock):
     dev = ring.devices()["other"][0]
 
     dev.invite_access("test@example.com")
     history = list(filter(lambda x: x.method == "POST", requests_mock.request_history))
     assert history[2].path == "/clients_api/locations/mock-location-id/invitations"
-    assert history[2].text == '{"invitation": {"doorbot_ids": [185036587], "invited_email": "test@example.com", "group_ids": []}}'
+    assert history[2].text == (
+        '{"invitation": {"doorbot_ids": [185036587],'
+        ' "invited_email": "test@example.com", "group_ids": []}}'
+    )
 
     dev.remove_access(123456789)
-    history = list(filter(lambda x: x.method == "DELETE", requests_mock.request_history))
-    assert history[0].path == "/clients_api/locations/mock-location-id/invitations/123456789"
+    history = list(
+        filter(lambda x: x.method == "DELETE", requests_mock.request_history)
+    )
+    assert (
+        history[0].path
+        == "/clients_api/locations/mock-location-id/invitations/123456789"
+    )
+
 
 def test_other_open_door(ring, requests_mock):
     dev = ring.devices()["other"][0]
 
     import uuid
+
     uuid.uuid4 = lambda: "987654321"
 
     dev.open_door(15)
     history = list(filter(lambda x: x.method == "PUT", requests_mock.request_history))
     assert history[0].path == "/commands/v1/devices/185036587/device_rpc"
-    assert history[0].text == ('{"command_name": "device_rpc", "request": ' 
-                                '{"id": "987654321", "jsonrpc": "2.0", "method": "unlock_door", "params": '
-                                '{"door_id": 0, "user_id": 15}}}')
+    assert history[0].text == (
+        '{"command_name": "device_rpc", "request": '
+        '{"id": "987654321", "jsonrpc": "2.0", "method": "unlock_door", "params": '
+        '{"door_id": 0, "user_id": 15}}}'
+    )

tests/test_ring.py

@@ -1,5 +1,6 @@
 """The tests for the Ring platform."""
 
+
 def test_basic_attributes(ring):
     """Test the Ring class and methods."""
     data = ring.devices()