Cleaned up adapter code

- Changed name of variables shadowing in-built names.
- Removed unecessary newlines.

Change-Id: I4ce767bd9d231efb09375bd42daa1c9589b46cf8

9 files changed, 40 insertions, 66 deletions

diff --git a/designate/api/v2/controllers/blacklists.py b/designate/api/v2/controllers/blacklists.py
index 2a104ce4..84913042 100644
--- a/designate/api/v2/controllers/blacklists.py
+++ b/designate/api/v2/controllers/blacklists.py
@@ -84,8 +84,8 @@ class BlacklistsController(rest.RestController):
 
         response.status_int = 201
 
-        blacklist = DesignateAdapter.render(
-            'API_v2', blacklist, request=request)
+        blacklist = DesignateAdapter.render('API_v2', blacklist,
+                                            request=request)
 
         response.headers['Location'] = blacklist['links']['self']
 
diff --git a/designate/api/v2/controllers/service_status.py b/designate/api/v2/controllers/service_status.py
index 18a9e30c..5d56a9a1 100644
--- a/designate/api/v2/controllers/service_status.py
+++ b/designate/api/v2/controllers/service_status.py
@@ -38,10 +38,8 @@ class ServiceStatusController(rest.RestController):
         service_statuses = self.central_api.find_service_statuses(
             context, criterion, )
 
-        return DesignateAdapter.render(
-            'API_v2',
-            service_statuses,
-            request=request)
+        return DesignateAdapter.render('API_v2', service_statuses,
+                                       request=request)
 
     @pecan.expose(template='json:', content_type='application/json')
     @utils.validate_uuid('service_id')
@@ -54,5 +52,5 @@ class ServiceStatusController(rest.RestController):
         service_status = self.central_api.find_service_status(
             context, criterion)
 
-        return DesignateAdapter.render(
-            'API_v2', service_status, request=request)
+        return DesignateAdapter.render('API_v2', service_status,
+                                       request=request)
diff --git a/designate/api/v2/controllers/zones/__init__.py b/designate/api/v2/controllers/zones/__init__.py
index 2608822f..1c2d93d0 100644
--- a/designate/api/v2/controllers/zones/__init__.py
+++ b/designate/api/v2/controllers/zones/__init__.py
@@ -54,10 +54,7 @@ class ZonesController(rest.RestController):
 
         LOG.info("Retrieved %(zone)s", {'zone': zone})
 
-        return DesignateAdapter.render(
-            'API_v2',
-            zone,
-            request=request)
+        return DesignateAdapter.render('API_v2', zone, request=request)
 
     @pecan.expose(template='json:', content_type='application/json')
     def get_all(self, **params):
diff --git a/designate/api/v2/controllers/zones/nameservers.py b/designate/api/v2/controllers/zones/nameservers.py
index b72fd2cd..09d0d1c3 100644
--- a/designate/api/v2/controllers/zones/nameservers.py
+++ b/designate/api/v2/controllers/zones/nameservers.py
@@ -40,7 +40,5 @@ class NameServersController(rest.RestController):
         LOG.info("Created %(ns_records)s", {'ns_records': ns_records})
 
         return {
-            "nameservers": DesignateAdapter.render(
-                'API_v2',
-                ns_records,
-                request=request)}
+            "nameservers": DesignateAdapter.render('API_v2', ns_records,
+                                                   request=request)}
diff --git a/designate/api/v2/controllers/zones/recordsets.py b/designate/api/v2/controllers/zones/recordsets.py
index fdcbf61c..8a954435 100644
--- a/designate/api/v2/controllers/zones/recordsets.py
+++ b/designate/api/v2/controllers/zones/recordsets.py
@@ -37,11 +37,10 @@ class RecordSetsController(rest.RestController):
         request = pecan.request
         context = request.environ['context']
 
-        return DesignateAdapter.render(
-            'API_v2',
-            self.central_api.get_recordset(
-                context, zone_id, recordset_id),
-            request=request)
+        return DesignateAdapter.render('API_v2',
+                                       self.central_api.get_recordset(
+                                           context, zone_id, recordset_id),
+                                       request=request)
 
     @pecan.expose(template='json:', content_type='application/json')
     @utils.validate_uuid('zone_id')
@@ -83,8 +82,8 @@ class RecordSetsController(rest.RestController):
         else:
             response.status_int = 201
 
-        recordset = DesignateAdapter.render(
-            'API_v2', recordset, request=request)
+        recordset = DesignateAdapter.render('API_v2', recordset,
+                                            request=request)
 
         response.headers['Location'] = recordset['links']['self']
 
diff --git a/designate/api/v2/controllers/zones/tasks/exports.py b/designate/api/v2/controllers/zones/tasks/exports.py
index 1e785c9d..56119f31 100644
--- a/designate/api/v2/controllers/zones/tasks/exports.py
+++ b/designate/api/v2/controllers/zones/tasks/exports.py
@@ -66,8 +66,8 @@ class ZoneExportCreateController(rest.RestController):
 
         LOG.info("Created %(zone_export)s", {'zone_export': zone_export})
 
-        zone_export = DesignateAdapter.render(
-            'API_v2', zone_export, request=request)
+        zone_export = DesignateAdapter.render('API_v2', zone_export,
+                                              request=request)
 
         response.headers['Location'] = zone_export['links']['self']
         return zone_export
@@ -91,10 +91,7 @@ class ZoneExportsController(rest.RestController):
 
         LOG.info("Retrieved %(export)s", {'export': zone_export})
 
-        return DesignateAdapter.render(
-            'API_v2',
-            zone_export,
-            request=request)
+        return DesignateAdapter.render('API_v2', zone_export, request=request)
 
     @pecan.expose(template='json:', content_type='application/json')
     def get_all(self, **params):
@@ -116,10 +113,7 @@ class ZoneExportsController(rest.RestController):
         LOG.info("Retrieved %(exports)s",
                  {'exports': zone_exports})
 
-        return DesignateAdapter.render(
-            'API_v2',
-            zone_exports,
-            request=request)
+        return DesignateAdapter.render('API_v2', zone_exports, request=request)
 
     # NOTE: template=None is important here, template='json:' manifests
     #       in this bug: https://bugs.launchpad.net/designate/+bug/1592153
diff --git a/designate/api/v2/controllers/zones/tasks/imports.py b/designate/api/v2/controllers/zones/tasks/imports.py
index 3f74cbae..0b312a0e 100644
--- a/designate/api/v2/controllers/zones/tasks/imports.py
+++ b/designate/api/v2/controllers/zones/tasks/imports.py
@@ -41,10 +41,7 @@ class ZoneImportController(rest.RestController):
 
         LOG.info("Retrieved %(import)s", {'import': zone_import})
 
-        return DesignateAdapter.render(
-            'API_v2',
-            zone_import,
-            request=request)
+        return DesignateAdapter.render('API_v2', zone_import, request=request)
 
     @pecan.expose(template='json:', content_type='application/json')
     def get_all(self, **params):
@@ -65,10 +62,7 @@ class ZoneImportController(rest.RestController):
 
         LOG.info("Retrieved %(imports)s", {'imports': zone_imports})
 
-        return DesignateAdapter.render(
-            'API_v2',
-            zone_imports,
-            request=request)
+        return DesignateAdapter.render('API_v2', zone_imports, request=request)
 
     @pecan.expose(template='json:', content_type='application/json')
     def post_all(self):
@@ -89,8 +83,8 @@ class ZoneImportController(rest.RestController):
 
         LOG.info("Created %(zone_import)s", {'zone_import': zone_import})
 
-        zone_import = DesignateAdapter.render(
-            'API_v2', zone_import, request=request)
+        zone_import = DesignateAdapter.render('API_v2', zone_import,
+                                              request=request)
 
         response.headers['Location'] = zone_import['links']['self']
         # Prepare and return the response body
diff --git a/designate/api/v2/controllers/zones/tasks/transfer_accepts.py b/designate/api/v2/controllers/zones/tasks/transfer_accepts.py
index b2a3299a..3ffd060c 100644
--- a/designate/api/v2/controllers/zones/tasks/transfer_accepts.py
+++ b/designate/api/v2/controllers/zones/tasks/transfer_accepts.py
@@ -42,8 +42,8 @@ class TransferAcceptsController(rest.RestController):
         LOG.info("Retrieved %(transfer_accepts)s",
                  {'transfer_accepts': transfer_accepts})
 
-        return DesignateAdapter.render(
-            'API_v2', transfer_accepts, request=request)
+        return DesignateAdapter.render('API_v2', transfer_accepts,
+                                       request=request)
 
     @pecan.expose(template='json:', content_type='application/json')
     def get_all(self, **params):
@@ -64,11 +64,8 @@ class TransferAcceptsController(rest.RestController):
         LOG.info("Retrieved %(zone_transfer_accepts)s",
                  {'zone_transfer_accepts': zone_transfer_accepts})
 
-        return DesignateAdapter.render(
-            'API_v2',
-            zone_transfer_accepts,
-            request=request,
-            context=context)
+        return DesignateAdapter.render('API_v2', zone_transfer_accepts,
+                                       request=request, context=context)
 
     @pecan.expose(template='json:', content_type='application/json')
     def post_all(self):
@@ -91,8 +88,9 @@ class TransferAcceptsController(rest.RestController):
         LOG.info("Created %(zone_transfer_accept)s",
                  {'zone_transfer_accept': zone_transfer_accept})
 
-        zone_transfer_accept = DesignateAdapter.render(
-            'API_v2', zone_transfer_accept, request=request)
+        zone_transfer_accept = DesignateAdapter.render('API_v2',
+                                                       zone_transfer_accept,
+                                                       request=request)
 
         response.headers['Location'] = zone_transfer_accept['links']['self']
 
diff --git a/designate/api/v2/controllers/zones/tasks/transfer_requests.py b/designate/api/v2/controllers/zones/tasks/transfer_requests.py
index 947bce8a..61fa7259 100644
--- a/designate/api/v2/controllers/zones/tasks/transfer_requests.py
+++ b/designate/api/v2/controllers/zones/tasks/transfer_requests.py
@@ -43,11 +43,8 @@ class TransferRequestsController(rest.RestController):
         LOG.info("Retrieved %(transfer_request)s",
                  {'transfer_request': transfer_request})
 
-        return DesignateAdapter.render(
-            'API_v2',
-            transfer_request,
-            request=request,
-            context=context)
+        return DesignateAdapter.render('API_v2', transfer_request,
+                                       request=request, context=context)
 
     @pecan.expose(template='json:', content_type='application/json')
     def get_all(self, **params):
@@ -68,11 +65,8 @@ class TransferRequestsController(rest.RestController):
         LOG.info("Retrieved %(zone_transfer_requests)s",
                  {'zone_transfer_requests': zone_transfer_requests})
 
-        return DesignateAdapter.render(
-            'API_v2',
-            zone_transfer_requests,
-            request=request,
-            context=context)
+        return DesignateAdapter.render('API_v2', zone_transfer_requests,
+                                       request=request, context=context)
 
     @pecan.expose(template='json:', content_type='application/json')
     @utils.validate_uuid('zone_id')
@@ -103,8 +97,10 @@ class TransferRequestsController(rest.RestController):
         LOG.info("Created %(zone_transfer_request)s",
                  {'zone_transfer_request': zone_transfer_request})
 
-        zone_transfer_request = DesignateAdapter.render(
-            'API_v2', zone_transfer_request, request=request, context=context)
+        zone_transfer_request = DesignateAdapter.render('API_v2',
+                                                        zone_transfer_request,
+                                                        request=request,
+                                                        context=context)
 
         response.headers['Location'] = zone_transfer_request['links']['self']
         # Prepare and return the response body
@@ -140,8 +136,8 @@ class TransferRequestsController(rest.RestController):
 
         response.status_int = 200
 
-        return DesignateAdapter.render(
-            'API_v2', zone_transfer_request, request=request, context=context)
+        return DesignateAdapter.render('API_v2', zone_transfer_request,
+                                       request=request, context=context)
 
     @pecan.expose(template=None, content_type='application/json')
     @utils.validate_uuid('zone_transfer_request_id')