lint format

Author: soniafrancisNS1

ns1/__init__.py

@@ -36,9 +36,7 @@ def _loadConfig(self, apiKey, configFile):
         if apiKey:
             self.config.createFromAPIKey(apiKey)
         else:
-            configFile = (
-                Config.DEFAULT_CONFIG_FILE if not configFile else configFile
-            )
+            configFile = Config.DEFAULT_CONFIG_FILE if not configFile else configFile
             self.config.loadFromFile(configFile)
 
     # REST INTERFACE
@@ -300,13 +298,7 @@ def searchZone(
         return rest_zone.search(query, type, expand, max, callback, errback)
 
     def createZone(
-        self,
-        zone,
-        zoneFile=None,
-        callback=None,
-        errback=None,
-        name=None,
-        **kwargs
+        self, zone, zoneFile=None, callback=None, errback=None, name=None, **kwargs
     ):
         """
         Create a new zone, and return an associated high level Zone object.
@@ -331,11 +323,7 @@ def createZone(
         zone = ns1.zones.Zone(self.config, zone)
 
         return zone.create(
-            zoneFile=zoneFile,
-            name=name,
-            callback=callback,
-            errback=errback,
-            **kwargs
+            zoneFile=zoneFile, name=name, callback=callback, errback=errback, **kwargs
         )
 
     def loadRecord(
@@ -367,9 +355,7 @@ def loadRecord(
                 zone = ".".join(parts[1:])
         z = ns1.zones.Zone(self.config, zone)
 
-        return z.loadRecord(
-            domain, type, callback=callback, errback=errback, **kwargs
-        )
+        return z.loadRecord(domain, type, callback=callback, errback=errback, **kwargs)
 
     def loadMonitors(self, callback=None, errback=None, **kwargs):
         """

ns1/rest/zones.py

@@ -36,9 +36,7 @@ def _buildBody(self, zone, **kwargs):
         self._buildStdBody(body, kwargs)
         return body
 
-    def import_file(
-        self, zone, zoneFile, callback=None, errback=None, **kwargs
-    ):
+    def import_file(self, zone, zoneFile, callback=None, errback=None, **kwargs):
         files = [("zonefile", (zoneFile, open(zoneFile, "rb"), "text/plain"))]
         params = self._buildImportParams(kwargs)
         return self._make_request(
@@ -147,9 +145,7 @@ def list_versions(self, zone, callback=None, errback=None):
             errback=errback,
         )
 
-    def create_version(
-        self, zone, force=False, callback=None, errback=None, name=None
-    ):
+    def create_version(self, zone, force=False, callback=None, errback=None, name=None):
         if name is None:
             name = zone
         body = {}
@@ -167,9 +163,7 @@ def create_version(
         )
 
     def activate_version(self, zone, version_id, callback=None, errback=None):
-        request = "{}/{}/versions/{}/activate".format(
-            self.ROOT, zone, str(version_id)
-        )
+        request = "{}/{}/versions/{}/activate".format(self.ROOT, zone, str(version_id))
         return self._make_request(
             "POST",
             request,
@@ -228,7 +222,7 @@ def get_zonefile_export(self, zone, callback=None, errback=None):
         # The transport layer will try to parse it as JSON and fail
         # We catch that exception and extract the raw body text
         from ns1.rest.errors import ResourceException
-        
+
         try:
             return self._make_request(
                 "GET",
@@ -240,7 +234,7 @@ def get_zonefile_export(self, zone, callback=None, errback=None):
             # If it's about invalid JSON, that's expected - extract the body
             if "invalid json in response" in str(e):
                 # The body is the third argument in ResourceException
-                if hasattr(e, 'args') and len(e.args) >= 3:
+                if hasattr(e, "args") and len(e.args) >= 3:
                     body = e.args[2]
                     if callback:
                         return callback(body)

ns1/zones.py

@@ -61,9 +61,7 @@ def success(result, *args):
             else:
                 return self
 
-        return self._rest.retrieve(
-            self.zone, callback=success, errback=errback
-        )
+        return self._rest.retrieve(self.zone, callback=success, errback=errback)
 
     def delete(self, callback=None, errback=None):
         """
@@ -88,13 +86,9 @@ def success(result, *args):
             else:
                 return self
 
-        return self._rest.update(
-            self.zone, callback=success, errback=errback, **kwargs
-        )
+        return self._rest.update(self.zone, callback=success, errback=errback, **kwargs)
 
-    def create(
-        self, zoneFile=None, callback=None, errback=None, name=None, **kwargs
-    ):
+    def create(self, zoneFile=None, callback=None, errback=None, name=None, **kwargs):
         """
         Create a new zone. Pass a list of keywords and their values to
         configure. For the list of keywords available for zone configuration,
@@ -150,9 +144,7 @@ def add_X(domain, answers, callback=None, errback=None, **kwargs):
 
         return add_X
 
-    def createLinkToSelf(
-        self, new_zone, callback=None, errback=None, **kwargs
-    ):
+    def createLinkToSelf(self, new_zone, callback=None, errback=None, **kwargs):
         """
         Create a new linked zone, linking to ourselves. All records in this
         zone will then be available as "linked records" in the new zone.
@@ -286,13 +278,9 @@ def usage(self, callback=None, errback=None, **kwargs):
         :return: usage information
         """
         stats = Stats(self.config)
-        return stats.usage(
-            zone=self.zone, callback=callback, errback=errback, **kwargs
-        )
+        return stats.usage(zone=self.zone, callback=callback, errback=errback, **kwargs)
 
-    def export(
-        self, callback=None, errback=None, timeout=300, poll_interval=2
-    ):
+    def export(self, callback=None, errback=None, timeout=300, poll_interval=2):
         """
         Export zone as a BIND-compatible zone file.
 
@@ -309,18 +297,14 @@ def export(
         # Initiate the export
         init_response = self._rest.initiate_zonefile_export(self.zone)
         if not init_response or init_response.get("status") == "FAILED":
-            error_msg = init_response.get(
-                "message", "Failed to initiate export"
-            )
+            error_msg = init_response.get("message", "Failed to initiate export")
             raise ZoneException(f"Zone export initiation failed: {error_msg}")
 
         # Poll the status until complete or failed
         start_time = time.time()
         while True:
             if time.time() - start_time > timeout:
-                raise ZoneException(
-                    f"Zone export timed out after {timeout} seconds"
-                )
+                raise ZoneException(f"Zone export timed out after {timeout} seconds")
 
             status_response = self._rest.status_zonefile_export(self.zone)
             status = status_response.get("status")

tests/unit/test_zone.py

@@ -53,9 +53,7 @@ def test_rest_zone_retrieve(zones_config, zone, url):
     )
 
 
-@pytest.mark.parametrize(
-    "zone, url", [("test.zone", "zones/test.zone/versions")]
-)
+@pytest.mark.parametrize("zone, url", [("test.zone", "zones/test.zone/versions")])
 def test_rest_zone_version_list(zones_config, zone, url):
     z = ns1.rest.zones.Zones(zones_config)
     z._make_request = mock.MagicMock()
@@ -253,9 +251,7 @@ def test_rest_zone_buildbody(zones_config):
     assert z._buildBody(zone, **kwargs) == body
 
 
-@pytest.mark.parametrize(
-    "zone, url", [("test.zone", "export/zonefile/test.zone")]
-)
+@pytest.mark.parametrize("zone, url", [("test.zone", "export/zonefile/test.zone")])
 def test_rest_zone_get_zonefile_export(zones_config, zone, url):
     z = ns1.rest.zones.Zones(zones_config)
     z._make_request = mock.MagicMock()
@@ -268,9 +264,7 @@ def test_rest_zone_get_zonefile_export(zones_config, zone, url):
     )
 
 
-@pytest.mark.parametrize(
-    "zone, url", [("test.zone", "export/zonefile/test.zone")]
-)
+@pytest.mark.parametrize("zone, url", [("test.zone", "export/zonefile/test.zone")])
 def test_rest_zone_initiate_zonefile_export(zones_config, zone, url):
     z = ns1.rest.zones.Zones(zones_config)
     z._make_request = mock.MagicMock()