From 7bd37e617b74300371c57e73b68881678d4ec5c6 Mon Sep 17 00:00:00 2001
From: Cody <cody@quantifiedcode.com>
Date: Thu, 10 Dec 2015 02:07:47 +0000
Subject: [PATCH] Migrated `%` string formating

---
 solve_threesixty/api.py | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/solve_threesixty/api.py b/solve_threesixty/api.py
index 9b116cb..f00999c 100644
--- a/solve_threesixty/api.py
+++ b/solve_threesixty/api.py
@@ -38,22 +38,22 @@ def connect(self, verb, uri, body='', type='json'):
         Base connector class to Solve360.
         """
         if not verb in ['GET', 'POST', 'PUT', 'DELETE']:
-            logger.error('Invalid verb for Solve360 %s' % verb)
+            logger.error('Invalid verb for Solve360 {0!s}'.format(verb))
             return False
 
         if not type in ['json', 'xml']:
-            logger.error('Invalid data type for Solve360 %s' % verb)
+            logger.error('Invalid data type for Solve360 {0!s}'.format(verb))
             return False
 
         headers = {
-            'Authorization': 'Basic %s' %
+            'Authorization': 'Basic {0!s}'.format(
                  base64.encodestring(":".join(
                         [self.user, self.password]
-                    ).encode('utf-8')).replace('\n', ''),
+                    ).encode('utf-8')).replace('\n', '')),
         }
 
-        headers['Content-Type'] = 'application/%s' % type
-        headers['Accept'] = 'application/%s' % type
+        headers['Content-Type'] = 'application/{0!s}'.format(type)
+        headers['Accept'] = 'application/{0!s}'.format(type)
 
         self.connection = httplib.HTTPSConnection(self.server)
         if settings.DEBUG:
@@ -62,8 +62,7 @@ def connect(self, verb, uri, body='', type='json'):
         response = self.connection.getresponse()
         if not response.status in (200, 201):
             logger.error('Unable to post to Solve360 at %s -' \
-                            + '%s:%s\nPayload: %s'
-                            % (uri, response.status, response.reason, body))
+                            + '{0!s}:{1!s}\nPayload: {2!s}'.format(uri, response.status, response.reason, body))
         else:
 #            self.connection.close()
             return response.read()
@@ -85,7 +84,7 @@ def contactShow(self, contact_id):
         """
         Returns raw response of all fields for contact.
         """
-        payload = self.connect('GET', '/contacts/%s' % contact_id)
+        payload = self.connect('GET', '/contacts/{0!s}'.format(contact_id))
         self.close()
         return payload
 
@@ -104,7 +103,7 @@ def contactDelete(self, contact_id):
         """
         Deletes a contact by ID.
         """
-        payload = self.connect('DELETE', '/contacts/%s' % contact_id)
+        payload = self.connect('DELETE', '/contacts/{0!s}'.format(contact_id))
         self.close()
         return payload
 
@@ -150,11 +149,11 @@ def report(self, uri, **kwargs):
         Refer to http://bit.ly/solve360-api-reports
         """
         if uri[0] != '/':
-            uri = '/report/%s' % uri
+            uri = '/report/{0!s}'.format(uri)
         if len(kwargs) > 0:
             uri += '?'
             for key in kwargs:
-                uri += '%s=%s&' % (key, kwargs[key])
+                uri += '{0!s}={1!s}&'.format(key, kwargs[key])
             uri = uri[:-1]
         payload = self.connect('GET', uri)
         self.close()
@@ -180,20 +179,17 @@ def opportunityAdd(self, **kwargs):
                           'MXN', 'MYR', 'NOK', 'NZD', 'RUB', 'SEK', 'SGD',
                           'THB', 'ZAR', ]
                 if kwargs[key] not in values:
-                    raise Exception('Invalid valuecurrency must be one of: %s'\
-                                        % ', '.join(values))
+                    raise Exception('Invalid valuecurrency must be one of: {0!s}'.format(', '.join(values)))
             elif key == 'valueinterval':
                 values = ['fixed price', 'per hour', 'per day', 'per week',
                           'per month', 'per quarter', 'per month',
                           'per quarter', 'per year', ]
                 if kwargs[key] not in values:
-                    raise Exception('Invalid valueinterval must be one of: %s'\
-                                        % ', '.join(values))
+                    raise Exception('Invalid valueinterval must be one of: {0!s}'.format(', '.join(values)))
             elif key == 'status':
                 values = ['Discussion', 'Pending', 'Won', 'Lost', 'On-hold', ]
                 if kwargs[key] not in values:
-                    raise Exception('Invalid status must be one of: %s'\
-                                        % ', '.join(values))
+                    raise Exception('Invalid status must be one of: {0!s}'.format(', '.join(values)))
 
             body[key] = kwargs[key]
         response = self.connectJSON('POST', '/opportunity', body)