formatting

Author: Pedro Angelo

ns1/__init__.py

@@ -248,7 +248,13 @@ def loadZone(self, zone, callback=None, errback=None):
         return zone.load(callback=callback, errback=errback)
 
     def searchZone(
-            self, query, type="all", expand=True, max=None, callback=None, errback=None,
+        self,
+        query,
+        type="all",
+        expand=True,
+        max=None,
+        callback=None,
+        errback=None,
     ):
         """
         This method was updated since NS1 deprecated v1/search/zones
@@ -261,11 +267,12 @@ def searchZone(
         :return: list of zones searched
         """
         from ns1.rest.zones import Zones
+
         rest_zone = Zones(self.config)
         return rest_zone.search(query, type, expand, max, callback, errback)
 
     def createZone(
-            self, zone, zoneFile=None, callback=None, errback=None, **kwargs
+        self, zone, zoneFile=None, callback=None, errback=None, **kwargs
     ):
         """
         Create a new zone, and return an associated high level Zone object.
@@ -293,7 +300,7 @@ def createZone(
         )
 
     def loadRecord(
-            self, domain, type, zone=None, callback=None, errback=None, **kwargs
+        self, domain, type, zone=None, callback=None, errback=None, **kwargs
     ):
         """
         Load an existing record into a high level Record object.
@@ -370,7 +377,7 @@ def loadNetworkbyName(self, name, callback=None, errback=None):
         return network.load(callback=callback, errback=errback)
 
     def createNetwork(
-            self, name, scope_group_id=None, callback=None, errback=None, **kwargs
+        self, name, scope_group_id=None, callback=None, errback=None, **kwargs
     ):
         """
         Create a new Network
@@ -403,7 +410,7 @@ def loadAddressbyID(self, id, callback=None, errback=None):
         return address.load(callback=callback, errback=errback)
 
     def loadAddressbyPrefix(
-            self, prefix, status, network_id, callback=None, errback=None
+        self, prefix, status, network_id, callback=None, errback=None
     ):
         """
         Load an existing address by prefix, status and network into a high level Address object
@@ -422,7 +429,7 @@ def loadAddressbyPrefix(
         return address.load(callback=callback, errback=errback)
 
     def createAddress(
-            self, prefix, status, network_id, callback=None, errback=None, **kwargs
+        self, prefix, status, network_id, callback=None, errback=None, **kwargs
     ):
         """
         Create a new Address
@@ -454,14 +461,14 @@ def loadScopeGroup(self, id, callback=None, errback=None):
         return scope_group.load(callback=callback, errback=errback)
 
     def createScopeGroup(
-            self,
-            name,
-            service_def_id,
-            dhcp4,
-            dhcp6,
-            callback=None,
-            errback=None,
-            **kwargs
+        self,
+        name,
+        service_def_id,
+        dhcp4,
+        dhcp6,
+        callback=None,
+        errback=None,
+        **kwargs
     ):
         """
         Create a new Scope Group
@@ -487,14 +494,14 @@ def createScopeGroup(
         )
 
     def createReservation(
-            self,
-            scopegroup_id,
-            address_id,
-            mac,
-            dhcp_options=None,
-            callback=None,
-            errback=None,
-            **kwargs
+        self,
+        scopegroup_id,
+        address_id,
+        mac,
+        dhcp_options=None,
+        callback=None,
+        errback=None,
+        **kwargs
     ):
         """
         Create a new Reservation
@@ -518,12 +525,12 @@ def createReservation(
         return reservation.create(callback=callback, errback=errback, **kwargs)
 
     def loadReservation(
-            self,
-            scopegroup_id,
-            address_id,
-            reservation_id=None,
-            callback=None,
-            errback=None,
+        self,
+        scopegroup_id,
+        address_id,
+        reservation_id=None,
+        callback=None,
+        errback=None,
     ):
         import ns1.ipam
 
@@ -534,13 +541,13 @@ def loadReservation(
         return reservation.load(callback=callback, errback=errback)
 
     def createScope(
-            self,
-            scopegroup_id,
-            address_id,
-            dhcp_options=None,
-            callback=None,
-            errback=None,
-            **kwargs
+        self,
+        scopegroup_id,
+        address_id,
+        dhcp_options=None,
+        callback=None,
+        errback=None,
+        **kwargs
     ):
         """
         Create a new Scope
@@ -559,7 +566,7 @@ def createScope(
         return scope.create(callback=callback, errback=errback, **kwargs)
 
     def loadScope(
-            self, scopegroup_id, address_id, callback=None, errback=None
+        self, scopegroup_id, address_id, callback=None, errback=None
     ):
         import ns1.ipam
 
@@ -568,13 +575,13 @@ def loadScope(
         return scope.load(callback=callback, errback=errback)
 
     def loadLeases(
-            self,
-            scope_group_id=None,
-            scope_id=None,
-            limit=None,
-            offset=None,
-            callback=None,
-            errback=None,
+        self,
+        scope_group_id=None,
+        scope_id=None,
+        limit=None,
+        offset=None,
+        callback=None,
+        errback=None,
     ):
         import ns1.ipam
 

ns1/helpers.py

@@ -2,6 +2,7 @@
 
 from threading import Lock
 
+
 class SingletonMixin(object):
     """double-locked thread safe singleton"""
 

ns1/rest/zones.py

@@ -29,7 +29,7 @@ def _buildBody(self, zone, **kwargs):
         return body
 
     def import_file(
-            self, zone, zoneFile, callback=None, errback=None, **kwargs
+        self, zone, zoneFile, callback=None, errback=None, **kwargs
     ):
         files = [("zonefile", (zoneFile, open(zoneFile, "rb"), "text/plain"))]
         return self._make_request(
@@ -86,8 +86,18 @@ def retrieve(self, zone, callback=None, errback=None):
             pagination_handler=zone_retrieve_pagination,
         )
 
-    def search(self, query, type="all", expand=True, max=None, callback=None, errback=None):
-        request = "{}?q={}&type={}&expand={}".format(self.SEARCH_ROOT, query, type, expand)
+    def search(
+        self,
+        query,
+        type="all",
+        expand=True,
+        max=None,
+        callback=None,
+        errback=None,
+    ):
+        request = "{}?q={}&type={}&expand={}".format(
+            self.SEARCH_ROOT, query, type, expand
+        )
         if max is not None:
             request += "&max=" + str(max)
         return self._make_request(

ns1/zones.py

@@ -138,7 +138,7 @@ def add_X(domain, answers, callback=None, errback=None, **kwargs):
         return add_X
 
     def createLinkToSelf(
-            self, new_zone, callback=None, errback=None, **kwargs
+        self, new_zone, callback=None, errback=None, **kwargs
     ):
         """
         Create a new linked zone, linking to ourselves. All records in this
@@ -152,13 +152,13 @@ def createLinkToSelf(
         return zone.create(callback=callback, errback=errback, **kwargs)
 
     def linkRecord(
-            self,
-            existing_domain,
-            new_domain,
-            rtype,
-            callback=None,
-            errback=None,
-            **kwargs
+        self,
+        existing_domain,
+        new_domain,
+        rtype,
+        callback=None,
+        errback=None,
+        **kwargs
     ):
 
         """
@@ -188,13 +188,13 @@ def linkRecord(
         )
 
     def cloneRecord(
-            self,
-            existing_domain,
-            new_domain,
-            rtype,
-            zone=None,
-            callback=None,
-            errback=None,
+        self,
+        existing_domain,
+        new_domain,
+        rtype,
+        zone=None,
+        callback=None,
+        errback=None,
     ):
         """
         Clone the given record to a new record such that their configs are