Skip to content

Commit f371731

Browse files
soniafrancisNS1soniafrancisNS1
committed
black format
1 parent 421d382 commit f371731

4 files changed

Lines changed: 60 additions & 18 deletions

File tree

‎ns1/__init__.py‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ def _loadConfig(self, apiKey, configFile):
3636
if apiKey:
3737
self.config.createFromAPIKey(apiKey)
3838
else:
39-
configFile = Config.DEFAULT_CONFIG_FILE if not configFile else configFile
39+
configFile = (
40+
Config.DEFAULT_CONFIG_FILE if not configFile else configFile
41+
)
4042
self.config.loadFromFile(configFile)
4143

4244
# REST INTERFACE
@@ -298,7 +300,13 @@ def searchZone(
298300
return rest_zone.search(query, type, expand, max, callback, errback)
299301

300302
def createZone(
301-
self, zone, zoneFile=None, callback=None, errback=None, name=None, **kwargs
303+
self,
304+
zone,
305+
zoneFile=None,
306+
callback=None,
307+
errback=None,
308+
name=None,
309+
**kwargs
302310
):
303311
"""
304312
Create a new zone, and return an associated high level Zone object.
@@ -323,7 +331,11 @@ def createZone(
323331
zone = ns1.zones.Zone(self.config, zone)
324332

325333
return zone.create(
326-
zoneFile=zoneFile, name=name, callback=callback, errback=errback, **kwargs
334+
zoneFile=zoneFile,
335+
name=name,
336+
callback=callback,
337+
errback=errback,
338+
**kwargs
327339
)
328340

329341
def loadRecord(
@@ -355,7 +367,9 @@ def loadRecord(
355367
zone = ".".join(parts[1:])
356368
z = ns1.zones.Zone(self.config, zone)
357369

358-
return z.loadRecord(domain, type, callback=callback, errback=errback, **kwargs)
370+
return z.loadRecord(
371+
domain, type, callback=callback, errback=errback, **kwargs
372+
)
359373

360374
def loadMonitors(self, callback=None, errback=None, **kwargs):
361375
"""

‎ns1/rest/zones.py‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ def _buildBody(self, zone, **kwargs):
3636
self._buildStdBody(body, kwargs)
3737
return body
3838

39-
def import_file(self, zone, zoneFile, callback=None, errback=None, **kwargs):
39+
def import_file(
40+
self, zone, zoneFile, callback=None, errback=None, **kwargs
41+
):
4042
files = [("zonefile", (zoneFile, open(zoneFile, "rb"), "text/plain"))]
4143
params = self._buildImportParams(kwargs)
4244
return self._make_request(
@@ -145,7 +147,9 @@ def list_versions(self, zone, callback=None, errback=None):
145147
errback=errback,
146148
)
147149

148-
def create_version(self, zone, force=False, callback=None, errback=None, name=None):
150+
def create_version(
151+
self, zone, force=False, callback=None, errback=None, name=None
152+
):
149153
if name is None:
150154
name = zone
151155
body = {}
@@ -163,7 +167,9 @@ def create_version(self, zone, force=False, callback=None, errback=None, name=No
163167
)
164168

165169
def activate_version(self, zone, version_id, callback=None, errback=None):
166-
request = "{}/{}/versions/{}/activate".format(self.ROOT, zone, str(version_id))
170+
request = "{}/{}/versions/{}/activate".format(
171+
self.ROOT, zone, str(version_id)
172+
)
167173
return self._make_request(
168174
"POST",
169175
request,

‎ns1/zones.py‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ def success(result, *args):
6161
else:
6262
return self
6363

64-
return self._rest.retrieve(self.zone, callback=success, errback=errback)
64+
return self._rest.retrieve(
65+
self.zone, callback=success, errback=errback
66+
)
6567

6668
def delete(self, callback=None, errback=None):
6769
"""
@@ -86,9 +88,13 @@ def success(result, *args):
8688
else:
8789
return self
8890

89-
return self._rest.update(self.zone, callback=success, errback=errback, **kwargs)
91+
return self._rest.update(
92+
self.zone, callback=success, errback=errback, **kwargs
93+
)
9094

91-
def create(self, zoneFile=None, callback=None, errback=None, name=None, **kwargs):
95+
def create(
96+
self, zoneFile=None, callback=None, errback=None, name=None, **kwargs
97+
):
9298
"""
9399
Create a new zone. Pass a list of keywords and their values to
94100
configure. For the list of keywords available for zone configuration,
@@ -144,7 +150,9 @@ def add_X(domain, answers, callback=None, errback=None, **kwargs):
144150

145151
return add_X
146152

147-
def createLinkToSelf(self, new_zone, callback=None, errback=None, **kwargs):
153+
def createLinkToSelf(
154+
self, new_zone, callback=None, errback=None, **kwargs
155+
):
148156
"""
149157
Create a new linked zone, linking to ourselves. All records in this
150158
zone will then be available as "linked records" in the new zone.
@@ -278,9 +286,13 @@ def usage(self, callback=None, errback=None, **kwargs):
278286
:return: usage information
279287
"""
280288
stats = Stats(self.config)
281-
return stats.usage(zone=self.zone, callback=callback, errback=errback, **kwargs)
289+
return stats.usage(
290+
zone=self.zone, callback=callback, errback=errback, **kwargs
291+
)
282292

283-
def export(self, callback=None, errback=None, timeout=300, poll_interval=2):
293+
def export(
294+
self, callback=None, errback=None, timeout=300, poll_interval=2
295+
):
284296
"""
285297
Export zone as a BIND-compatible zone file.
286298
@@ -297,14 +309,18 @@ def export(self, callback=None, errback=None, timeout=300, poll_interval=2):
297309
# Initiate the export
298310
init_response = self._rest.initiate_zonefile_export(self.zone)
299311
if not init_response or init_response.get("status") == "FAILED":
300-
error_msg = init_response.get("message", "Failed to initiate export")
312+
error_msg = init_response.get(
313+
"message", "Failed to initiate export"
314+
)
301315
raise ZoneException(f"Zone export initiation failed: {error_msg}")
302316

303317
# Poll the status until complete or failed
304318
start_time = time.time()
305319
while True:
306320
if time.time() - start_time > timeout:
307-
raise ZoneException(f"Zone export timed out after {timeout} seconds")
321+
raise ZoneException(
322+
f"Zone export timed out after {timeout} seconds"
323+
)
308324

309325
status_response = self._rest.status_zonefile_export(self.zone)
310326
status = status_response.get("status")

‎tests/unit/test_zone.py‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ def test_rest_zone_retrieve(zones_config, zone, url):
5353
)
5454

5555

56-
@pytest.mark.parametrize("zone, url", [("test.zone", "zones/test.zone/versions")])
56+
@pytest.mark.parametrize(
57+
"zone, url", [("test.zone", "zones/test.zone/versions")]
58+
)
5759
def test_rest_zone_version_list(zones_config, zone, url):
5860
z = ns1.rest.zones.Zones(zones_config)
5961
z._make_request = mock.MagicMock()
@@ -251,7 +253,9 @@ def test_rest_zone_buildbody(zones_config):
251253
assert z._buildBody(zone, **kwargs) == body
252254

253255

254-
@pytest.mark.parametrize("zone, url", [("test.zone", "export/zonefile/test.zone")])
256+
@pytest.mark.parametrize(
257+
"zone, url", [("test.zone", "export/zonefile/test.zone")]
258+
)
255259
def test_rest_zone_get_zonefile_export(zones_config, zone, url):
256260
z = ns1.rest.zones.Zones(zones_config)
257261
z._make_request = mock.MagicMock()
@@ -264,7 +268,9 @@ def test_rest_zone_get_zonefile_export(zones_config, zone, url):
264268
)
265269

266270

267-
@pytest.mark.parametrize("zone, url", [("test.zone", "export/zonefile/test.zone")])
271+
@pytest.mark.parametrize(
272+
"zone, url", [("test.zone", "export/zonefile/test.zone")]
273+
)
268274
def test_rest_zone_initiate_zonefile_export(zones_config, zone, url):
269275
z = ns1.rest.zones.Zones(zones_config)
270276
z._make_request = mock.MagicMock()

0 commit comments

Comments
 (0)