Consistency Update - rooms.py

Author: cmlccie

ciscosparkapi/api/rooms.py

@@ -19,14 +19,13 @@
 from builtins import *
 from past.builtins import basestring
 
-from ciscosparkapi.exceptions import ciscosparkapiException
+from ciscosparkapi.restsession import RestSession
+from ciscosparkapi.sparkdata import SparkData
 from ciscosparkapi.utils import (
     check_type,
     dict_from_items_with_values,
     generator_container,
 )
-from ciscosparkapi.restsession import RestSession
-from ciscosparkapi.sparkdata import SparkData
 
 
 __author__ = "Chris Lunsford"
@@ -142,8 +141,8 @@ def list(self, teamId=None, type=None, sortBy=None, max=None,
             sortBy(basestring): Sort results by room ID (`id`), most recent
                 activity (`lastactivity`), or most recently created
                 (`created`).
-            max(int): Limit the maximum number of rooms in the response from
-                the Spark service.
+            max(int): Limit the maximum number of items returned from the Spark
+                service per request.
             **request_parameters: Additional request parameters (provides
                 support for parameters that may be added in the future).
 
@@ -211,55 +210,55 @@ def create(self, title, teamId=None, **request_parameters):
         # Return a Room object created from the response JSON data
         return Room(json_data)
 
-    def update(self, roomId, title=None, **request_parameters):
-        """Update details for a room, by ID.
+    def get(self, roomId):
+        """Get the details of a room, by ID.
 
         Args:
-            roomId(basestring): The ID of the room to be updated.
-            title(basestring): A user-friendly name for the room.
-            **request_parameters: Additional request parameters (provides
-                support for parameters that may be added in the future).
+            roomId(basestring): The ID of the room to be retrieved.
 
         Returns:
-            Room: A Room object with the updated Spark room details.
+            Room: A Room object with the details of the requested room.
 
         Raises:
             TypeError: If the parameter types are incorrect.
             SparkApiError: If the Cisco Spark cloud returns an error.
 
         """
         check_type(roomId, basestring, may_be_none=False)
-        check_type(roomId, basestring)
-
-        put_data = dict_from_items_with_values(
-                request_parameters,
-                title=title,
-        )
 
         # API request
-        json_data = self._session.put('rooms/' + roomId, json=put_data)
+        json_data = self._session.get('rooms/' + roomId)
 
         # Return a Room object created from the response JSON data
         return Room(json_data)
 
-    def get(self, roomId):
-        """Get the details of a room, by ID.
+    def update(self, roomId, title=None, **request_parameters):
+        """Update details for a room, by ID.
 
         Args:
-            roomId(basestring): The ID of the room to be retrieved.
+            roomId(basestring): The room ID.
+            title(basestring): A user-friendly name for the room.
+            **request_parameters: Additional request parameters (provides
+                support for parameters that may be added in the future).
 
         Returns:
-            Room: A Room object with the details of the requested room.
+            Room: A Room object with the updated Spark room details.
 
         Raises:
             TypeError: If the parameter types are incorrect.
             SparkApiError: If the Cisco Spark cloud returns an error.
 
         """
         check_type(roomId, basestring, may_be_none=False)
+        check_type(roomId, basestring)
+
+        put_data = dict_from_items_with_values(
+                request_parameters,
+                title=title,
+        )
 
         # API request
-        json_data = self._session.get('rooms/' + roomId)
+        json_data = self._session.put('rooms/' + roomId, json=put_data)
 
         # Return a Room object created from the response JSON data
         return Room(json_data)