Use str.format() for string formatting

Migrate the package’s usage of the older style ‘%’ string formatting
for newer str.format() method.

Author: cmlccie

ciscosparkapi/exceptions.py

@@ -39,9 +39,9 @@ def __init__(self, response_code, request=None, response=None):
         response_text = SPARK_RESPONSE_CODES.get(response_code)
         if response_text:
             self.response_text = response_text
-            error_message = "Response Code [%s] - %s" % \
-                            (response_code, response_text)
+            error_message = "Response Code [{!s}] - {}".format(response_code,
+                                                               response_text)
         else:
-            error_message = "Response Code [%s] - Unknown Response Code" % \
-                            response_code
+            error_message = "Response Code [{!s}] - " \
+                            "Unknown Response Code".format(response_code)
         super(SparkApiError, self).__init__(error_message)

ciscosparkapi/helper.py

@@ -35,7 +35,7 @@ def validate_base_url(base_url):
 def raise_if_extra_kwargs(kwargs):
     """Raise a TypeError if kwargs is not empty."""
     if kwargs:
-        raise TypeError("Unexpected **kwargs: %r" % kwargs)
+        raise TypeError("Unexpected **kwargs: {!r}".format(kwargs))
 
 
 def check_response_code(response, erc):

ciscosparkapi/restsession.py

@@ -148,8 +148,8 @@ def get_items(self, url, params=None, **kwargs):
                 for item in items:
                     yield item
             else:
-                error_message = "'items' object not found in JSON data: %r" \
-                                % json_page
+                error_message = "'items' object not found in JSON data: " \
+                                "{!r}".format(json_page)
                 raise ciscosparkapiException(error_message)
 
     def post(self, url, json, **kwargs):

ciscosparkapi/sparkdata.py

@@ -48,8 +48,8 @@ def _json_dict(json):
     elif isinstance(json, string_types):
         return json_pkg.loads(json)
     else:
-        error = "'json' must be a dictionary or string; " \
-                "received: %r" % json
+        error = "'json' must be a dictionary or JSON string; " \
+                "received: {!r}".format(json)
         raise TypeError(error)
 
 
@@ -96,19 +96,19 @@ def __getattr__(self, item):
             else:
                 return item_data
         else:
-            error = "'%s' object has no attribute '%s'" % \
-                    (self.__class__.__name__, item)
+            error = "'{}' object has no attribute " \
+                    "'{}'".format(self.__class__.__name__, item)
             raise AttributeError(error)
 
     def __str__(self):
         """Return a human-readable string representation of this object."""
         class_str = self.__class__.__name__
         json_str = json_pkg.dumps(self._json, indent=2)
-        return "%s:\n%s" % (class_str, json_str)
+        return "{}:\n{}".format(class_str, json_str)
 
     def __repr__(self):
         """Return a string representing this object as valid Python expression.
         """
         class_str = self.__class__.__name__
         json_str = json_pkg.dumps(self._json, ensure_ascii=False)
-        return "%s(%r)" % (class_str, json_str)
+        return "{}({})".format(class_str, json_str)