fix python2.6 support broken by string formats

Author: Elias Nygren

upcloud_api/cloud_manager/server_mixin.py

@@ -36,12 +36,12 @@ def get_servers(self, populate=False, tags_has_one=None, tags_has_all=None):
     if tags_has_all:
       tags_has_all = [ str(tag) for tag in tags_has_all]
       taglist = ':'.join(tags_has_all)
-      request = '/server/tag/{}'.format(taglist)
+      request = '/server/tag/{0}'.format(taglist)
 
     if tags_has_one:
       tags_has_one = [ str(tag) for tag in tags_has_one]
       taglist = ','.join(tags_has_one)
-      request = '/server/tag/{}'.format(taglist)
+      request = '/server/tag/{0}'.format(taglist)
 
     servers = self.get_request(request)['servers']['server']
 
@@ -134,10 +134,10 @@ def modify_server(self, UUID, **kwargs):
     body['server'] = {}
     for arg in kwargs:
       if arg not in Server.updateable_fields:
-        Exception('{} is not an updateable field'.format(arg))
+        Exception('{0} is not an updateable field'.format(arg))
       body['server'][arg] = kwargs[arg]
 
-    res = self.request('PUT', '/server/{}'.format(UUID), body)
+    res = self.request('PUT', '/server/{0}'.format(UUID), body)
     server = res['server']
 
     # Populate subobjects
@@ -160,15 +160,15 @@ def delete_server(self, UUID):
 
     Returns an empty object.
     """
-    return self.request('DELETE', '/server/{}'.format(UUID))
+    return self.request('DELETE', '/server/{0}'.format(UUID))
 
 
   def get_server_data(self, UUID):
     """
     Returns '/server/uuid' data in Python dict.
     Creates object representations of any IP-address and Storage.
     """
-    data = self.get_request('/server/{}'.format(UUID))
+    data = self.get_request('/server/{0}'.format(UUID))
     server = data['server']
 
     # Populate subobjects

upcloud_api/server.py

@@ -43,7 +43,7 @@ def __setattr__(self, name, value):
     Override to prevent updating readonly fields.
     """
     if name not in self.updateable_fields:
-      raise Exception("'{}' is a readonly field".format(name))
+      raise Exception("'{0}' is a readonly field".format(name))
     else:
       object.__setattr__(self, name, value)
 
@@ -124,7 +124,7 @@ def shutdown(self):
       'timeout' : '30'
     }
 
-    path = '/server/{}/stop'.format(self.uuid)
+    path = '/server/{0}/stop'.format(self.uuid)
     self.cloud_manager.post_request(path, body)
     object.__setattr__(self, 'state', 'maintenance')
 
@@ -140,7 +140,7 @@ def start(self):
     Starts the server. Note: slow and blocking request.
     The API waits for confirmation from UpCloud's IaaS backend before responding.
     """
-    path = '/server/{}/start'.format(self.uuid)
+    path = '/server/{0}/start'.format(self.uuid)
     res = self.cloud_manager.post_request(path)
     object.__setattr__(self, 'state', 'started')
 
@@ -160,7 +160,7 @@ def restart(self):
       'timeout_action' : 'destroy'
     }
 
-    path = '/server/{}/restart'.format(self.uuid)
+    path = '/server/{0}/restart'.format(self.uuid)
     self.cloud_manager.post_request(path, body)
     object.__setattr__(self, 'state', 'maintenance')