From: Frank Brehm Date: Tue, 6 Feb 2018 10:54:55 +0000 (+0100) Subject: Applying flake8 rules to pp_lib/pdns_record.py X-Git-Tag: 0.1.2~6^2~41 X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=cdaba5e96fa633c8d6d61af03dbfea72a00c747a;p=pixelpark%2Fadmin-tools.git Applying flake8 rules to pp_lib/pdns_record.py --- diff --git a/pp_lib/pdns_record.py b/pp_lib/pdns_record.py index a6ec3d3..3895d3e 100644 --- a/pp_lib/pdns_record.py +++ b/pp_lib/pdns_record.py @@ -9,23 +9,19 @@ from __future__ import absolute_import # Standard modules -import sys -import os import logging import copy import re import datetime -import json # Third party modules # Own modules -from .common import pp, compare_fqdn, to_bytes, to_utf8, to_str +from .common import pp, compare_fqdn, to_utf8, to_str -from .errors import PpError from .obj import PpBaseObjectError, PpBaseObject -__version__ = '0.4.4' +__version__ = '0.4.5' LOG = logging.getLogger(__name__) @@ -93,7 +89,7 @@ class PdnsApiRecord(PpBaseObject): # ------------------------------------------------------------------------- def __init__( self, appname=None, verbose=0, version=__version__, base_dir=None, initialized=None, - content=None, disabled=False): + content=None, disabled=False): self._content = content self._disabled = False @@ -208,7 +204,7 @@ class PdnsSoaData(PpBaseObject): self.ttl = ttl if (self.primary and self.email and self.serial is not None and self.refresh and - self.retry and self.expire and self.ttl): + self.retry and self.expire and self.ttl): self.initialized = True else: self.initialized = False @@ -311,7 +307,7 @@ class PdnsSoaData(PpBaseObject): def data(self): "String representation of SOA data." if (self.primary and self.email and self.serial is not None and self.refresh and - self.retry and self.expire and self.ttl): + self.retry and self.expire and self.ttl): return "{_primary} {_email} {_serial} {_refresh} {_retry} {_expire} {_ttl}".format( **self.__dict__) else: @@ -401,13 +397,14 @@ class PdnsApiRrset(PpBaseObject): # ------------------------------------------------------------------------- def __init__( - self, appname=None, verbose=0, version=__version__, base_dir=None, initialized=None): + self, appname=None, verbose=0, version=__version__, + base_dir=None, initialized=None): -# { 'comments': [], -# 'name': 'www.bmwi.tv.', -# 'records': [{'content': '77.74.236.5', 'disabled': False}], -# 'ttl': 3600, -# 'type': 'A'}, + # { 'comments': [], + # 'name': 'www.bmwi.tv.', + # 'records': [{'content': '77.74.236.5', 'disabled': False}], + # 'ttl': 3600, + # 'type': 'A'}, self.comments = [] self._name = None @@ -457,10 +454,11 @@ class PdnsApiRrset(PpBaseObject): # ------------------------------------------------------------------------- @classmethod def init_from_dict( - cls, data, appname=None, verbose=0, version=__version__, base_dir=None, initialized=None): + cls, data, appname=None, verbose=0, version=__version__, + base_dir=None, initialized=None): if not isinstance(data, dict): - raise PdnsApiRecordError("Given data {!r} is not a dict object.".format(data)) + raise PdnsApiRrsetError("Given data {!r} is not a dict object.".format(data)) params = { 'appname': appname,