From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: ddns@lists.ipfire.org Subject: Re: [PATCH] DDNS: Port to python3 Date: Mon, 06 Jan 2020 14:44:25 +0000 Message-ID: In-Reply-To: <3125c3335d44ab24744fe1f9ed75974f1c142d8a.camel@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3238552680399432557==" List-Id: --===============3238552680399432557== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable > On 6 Jan 2020, at 12:31, Stefan Schantl wrote: >=20 > Hello Kim, >=20 > thanks for keep working on this and sorry for the long delay. >=20 > Today I had some spare-time and checked your patch. >=20 > Besides there are still some formating issues because of your used > Editor (New blank lines added, tabs are reformated, intensions are > changed etc), I was not able to get a list of the supported Providers > anymore after applying your Patch. Some of those whitespace changes are required because Python 3 does not allow= mixed tabs and spaces in the same line (file?) any more. > root(a)system:/home/ddns# python3 /usr/bin/ddns -d -c > /etc/ddns/ddns.conf.sample list-providers > Debugmodus eingeschaltet > Laufe auf Distribution: unknown > Lade Konfigurationsdatei /etc/ddns/ddns.conf.sample >=20 > The output should look like this: >=20 > root(a)system:/home/ddns# python2 /usr/bin/ddns -d -c > /etc/ddns/ddns.conf.sample list-providers > Debugmodus eingeschaltet > Registered new provider: All-inkl.com (all-inkl.com) > Registered new provider: ChangeIP.com (changeip.com) > Registered new provider: DDNSS (ddnss.de) > Registered new provider: desec.io (desec.io) > Registered new provider: DHS International (dhs.org) > Registered new provider: Lightning Wire Labs DNS Service > (dns.lightningwirelabs.com) > Registered new provider: DNSmadeEasy.com (dnsmadeeasy.com) > Registered new provider: DNS Park (dnspark.com) > Registered new provider: Domain-Offensive (do.de) > Registered new provider: Google Domains (domains.google.com) > Registered new provider: domopoli.de (domopoli.de) > Registered new provider: DtDNS (dtdns.com) > Registered new provider: Duck DNS (duckdns.org) > Registered new provider: dy.fi (dy.fi) > Registered new provider: Dyn (dyndns.org) > Registered new provider: DyNS (dyns.net) > Registered new provider: Dynu (dynu.com) > Registered new provider: DynUp.DE (dynup.de) > Registered new provider: EasyDNS (easydns.com) > Registered new provider: eNom Inc. (enom.com) > Registered new provider: EntryDNS (entrydns.net) > Registered new provider: freedns.afraid.org (freedns.afraid.org) > Registered new provider: INWX (inwx.com) > Registered new provider: it's DNS (itsdns.de) > Registered new provider: Joker.com Dynamic DNS (joker.com) > Registered new provider: Loopia AB (loopia.se) > Registered new provider: myonlineportal.net (myonlineportal.net) > Registered new provider: Namecheap (namecheap.com) > Registered new provider: No-IP (no-ip.com) > Registered new provider: NOW-DNS (now-dns.com) > Registered new provider: BIND nsupdate utility (nsupdate) > Registered new provider: nsupdate.info (nsupdate.info) > Registered new provider: OpenDNS (opendns.com) > Registered new provider: OVH (ovh.com) > Registered new provider: Regfish GmbH (regfish.com) > Registered new provider: Schokokeks (schokokeks.org) > Registered new provider: Selfhost.de (selfhost.de) > Registered new provider: servercow.de (servercow.de) > Registered new provider: SPDYN (spdns.org) > Registered new provider: Strato AG (strato.com) > Registered new provider: TwoDNS (twodns.de) > Registered new provider: Udmedia GmbH (udmedia.de) > Registered new provider: Variomedia (variomedia.de) > Registered new provider: XLhost (xlhost.de) > Registered new provider: Zoneedit (zoneedit.com) > Registered new provider: zzzz (zzzz.io) > Laufe auf Distribution: unknown > Lade Konfigurationsdatei /etc/ddns/ddns.conf.sample > all-inkl.com > changeip.com > ddnss.de > desec.io > dhs.org > dns.lightningwirelabs.com > dnsmadeeasy.com > dnspark.com > do.de > domains.google.com > domopoli.de > dtdns.com > duckdns.org > dy.fi > dyndns.org > dyns.net > dynu.com > dynup.de > easydns.com > enom.com > entrydns.net > freedns.afraid.org > inwx.com > itsdns.de > joker.com > loopia.se > myonlineportal.net > namecheap.com > no-ip.com > now-dns.com > nsupdate > nsupdate.info > opendns.com > ovh.com > regfish.com > schokokeks.org > selfhost.de > servercow.de > spdns.org > strato.com > twodns.de > udmedia.de > variomedia.de > xlhost.de > zoneedit.com > zzzz.io >=20 > Please check your Patch and re-submit a fixed version. >=20 > Many thanks in advance, >=20 > -Stefan >> Hi together, >>=20 >> Fixed the things Michael mentioned. Update of the headers and >> .gitignore will follow in a separate patch if we decide it is >> necessary. >>=20 >> I corrected additionally some intentions and adapted some PEP8 style >> guidelines=20 >>=20 >> Greetings >> Kim >>=20 >> Index: src/ddns/system.py >> IDEA additional info: >> Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP >> <+>UTF-8 >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >> --- src/ddns/system.py (revision >> c0277eeea2b2c1ed8f40f1248b28438e44e51912) >> +++ src/ddns/system.py (date 1577472902318) >> @@ -1,4 +1,4 @@ >> -#!/usr/bin/python >> +#!/usr/bin/python3 >> #################################################################### >> ########### >> # =20 >> # >> # ddns - A dynamic DNS client for IPFire =20 >> # >> @@ -23,18 +23,20 @@ >> import re >> import ssl >> import socket >> -import urllib >> -import urllib2 >> +import urllib.request >> +import urllib.parse >> +import urllib.error >>=20 >> -from __version__ import CLIENT_VERSION >> +from .__version__ import CLIENT_VERSION >> from .errors import * >> -from i18n import _ >> +from .i18n import _ >>=20 >> # Initialize the logger. >> import logging >> logger =3D logging.getLogger("ddns.system") >> logger.propagate =3D 1 >>=20 >> + >> class DDNSSystem(object): >> """ >> The DDNSSystem class adds a layer of abstraction >> @@ -79,7 +81,7 @@ >> with open("/var/ipfire/red/local- >> ipaddress") as f: >> return f.readline() >>=20 >> - except IOError, e: >> + except IOError as e: >> # File not found >> if e.errno =3D=3D 2: >> return >> @@ -137,7 +139,7 @@ >> if data: >> logger.debug(" data: %s" % data) >>=20 >> - req =3D urllib2.Request(url, data=3Ddata) >> + req =3D urllib.request.Request(url, data=3Ddata) >>=20 >> if username and password: >> basic_auth_header =3D >> self._make_basic_auth_header(username, password) >> @@ -163,7 +165,7 @@ >> logger.debug(" %s: %s" % (k, v)) >>=20 >> try: >> - resp =3D urllib2.urlopen(req, timeout=3Dtimeout) >> + resp =3D urllib.request.urlopen(req, >> timeout=3Dtimeout) >>=20 >> # Log response header. >> logger.debug(_("Response header (Status Code >> %s):") % resp.code) >> @@ -173,7 +175,7 @@ >> # Return the entire response object. >> return resp >>=20 >> - except urllib2.HTTPError, e: >> + except urllib.error.HTTPError as e: >> # Log response header. >> logger.debug(_("Response header (Status Code >> %s):") % e.code) >> for k, v in e.hdrs.items(): >> @@ -209,7 +211,7 @@ >> # Raise all other unhandled exceptions. >> raise >>=20 >> - except urllib2.URLError, e: >> + except urllib.error.URLError as e: >> if e.reason: >> # Handle SSL errors >> if isinstance(e.reason, ssl.SSLError): >> @@ -240,7 +242,7 @@ >> # Raise all other unhandled exceptions. >> raise >>=20 >> - except socket.timeout, e: >> + except socket.timeout as e: >> logger.debug(_("Connection timeout")) >>=20 >> raise DDNSConnectionTimeoutError >> @@ -249,7 +251,7 @@ >> args =3D [] >>=20 >> for k, v in data.items(): >> - arg =3D "%s=3D%s" % (k, urllib.quote(v)) >> + arg =3D "%s=3D%s" % (k, urllib.parse.quote(v)) >> args.append(arg) >>=20 >> return "&".join(args) >> @@ -258,7 +260,7 @@ >> authstring =3D "%s:%s" % (username, password) >>=20 >> # Encode authorization data in base64. >> - authstring =3D base64.encodestring(authstring) >> + authstring =3D base64.encodebytes(authstring) >>=20 >> # Remove any newline characters. >> authstring =3D authstring.replace("\n", "") >> @@ -354,7 +356,7 @@ >> # Resolve the host address. >> try: >> response =3D socket.getaddrinfo(hostname, None, >> family) >> - except socket.gaierror, e: >> + except socket.gaierror as e: >> # Name or service not known >> if e.errno =3D=3D -2: >> return [] >> @@ -388,7 +390,7 @@ >> continue >>=20 >> # Add to repsonse list if not already in there. >> - if not address in addresses: >> + if address not in addresses: >> addresses.append(address) >>=20 >> return addresses >> @@ -418,7 +420,7 @@ >> """ >> try: >> f =3D open("/etc/os-release", "r") >> - except IOError, e: >> + except IOError as e: >> # File not found >> if e.errno =3D=3D 2: >> return >> @@ -447,7 +449,7 @@ >> """ >> try: >> f =3D open("/etc/system-release", "r") >> - except IOError, e: >> + except IOError as e: >> # File not found >> if e.errno =3D=3D 2: >> return >> Index: src/ddns/i18n.py >> IDEA additional info: >> Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP >> <+>UTF-8 >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >> --- src/ddns/i18n.py (revision >> c0277eeea2b2c1ed8f40f1248b28438e44e51912) >> +++ src/ddns/i18n.py (date 1577472902317) >> @@ -1,4 +1,4 @@ >> -#!/usr/bin/python >> +#!/usr/bin/python3 >> #################################################################### >> ########### >> # =20 >> # >> # ddns - A dynamic DNS client for IPFire =20 >> # >> @@ -25,15 +25,14 @@ >>=20 >> N_ =3D lambda x: x >>=20 >> + >> def _(singular, plural=3DNone, n=3DNone): >> """ >> A function that returnes the translation of a string if >> available. >> - >> The language is taken from the system environment. >> - """ >> - if not plural is None: >> + """ >> + if plural is not None: >> assert n is not None >> return gettext.dngettext(TEXTDOMAIN, singular, plural, >> n) >>=20 >> return gettext.dgettext(TEXTDOMAIN, singular) >> - >> Index: configure.ac >> IDEA additional info: >> Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP >> <+>UTF-8 >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >> --- configure.ac (revision >> c0277eeea2b2c1ed8f40f1248b28438e44e51912) >> +++ configure.ac (date 1577473544755) >> @@ -21,7 +21,7 @@ >> AC_PREREQ([2.64]) >>=20 >> AC_INIT([ddns], >> - [012], >> + [013], >> [info(a)ipfire.org], >> [ddns], >> [http://git.ipfire.org/?p=3Doddments/ddns.git;a=3Dsummary]) >> @@ -54,7 +54,7 @@ >> AC_PATH_PROG([XSLTPROC], [xsltproc]) >>=20 >> # Python >> -AM_PATH_PYTHON([2.7]) >> +AM_PATH_PYTHON([3.6]) >>=20 >> save_LIBS=3D"$LIBS" >>=20 >> Index: ddns.in >> IDEA additional info: >> Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP >> <+>UTF-8 >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >> --- ddns.in (revision c0277eeea2b2c1ed8f40f1248b28438e44e51912) >> +++ ddns.in (date 1577472902316) >> @@ -1,4 +1,4 @@ >> -#!/usr/bin/python >> +#!/usr/bin/python3 >> #################################################################### >> ########### >> # =20 >> # >> # ddns - A dynamic DNS client for IPFire =20 >> # >> @@ -27,27 +27,24 @@ >>=20 >> CONFIGURATION_FILE =3D "@configsdir@/ddns.conf" >>=20 >> + >> def main(): >> # Parse command line >> p =3D argparse.ArgumentParser(description=3D_("Dynamic DNS >> Updater")) >>=20 >> - p.add_argument("-d", "--debug", action=3D"store_true", >> - help=3D_("Enable debugging output")) >> + p.add_argument("-d", "--debug", action=3D"store_true", >> help=3D_("Enable debugging output")) >>=20 >> p.add_argument("-c", "--config", default=3DCONFIGURATION_FILE, >> help=3D_("Load configuration file (Default: %s)") % >> CONFIGURATION_FILE) >>=20 >> # Create subparsers for commands. >> - subparsers =3D p.add_subparsers(help=3D_("Sub-command help"), >> - dest=3D"subparsers_name") >> + subparsers =3D p.add_subparsers(help=3D_("Sub-command help"), >> dest=3D"subparsers_name") >>=20 >> # guess-ip-addresses >> - p_guess_ip_addresses =3D subparsers.add_parser("guess-ip- >> addresses", >> - help=3D_("Guess the external IP addresses")) >> + p_guess_ip_addresses =3D subparsers.add_parser("guess-ip- >> addresses", help=3D_("Guess the external IP addresses")) >>=20 >> # list-providers >> - p_list_providers =3D subparsers.add_parser("list-providers", >> - help=3D_("List all available providers")) >> + p_list_providers =3D subparsers.add_parser("list-providers", >> help=3D_("List all available providers")) >>=20 >> # update >> p_update =3D subparsers.add_parser("update", help=3D_("Update DNS >> record")) >> @@ -74,16 +71,16 @@ >> # IPv6 >> ipv6_address =3D >> d.system.guess_external_ip_address("ipv6") >> if ipv6_address: >> - print _("IPv6 Address: %s") % ipv6_address >> + print("IPv6 Address: %s" % ipv6_address) >>=20 >> # IPv4 >> ipv4_address =3D >> d.system.guess_external_ip_address("ipv4") >> if ipv4_address: >> - print _("IPv4 Address: %s") % ipv4_address >> + print("IPv4 Address: %s" % ipv4_address) >>=20 >> elif args.subparsers_name =3D=3D "list-providers": >> provider_names =3D d.get_provider_names() >> - print "\n".join(provider_names) >> + print("\n".join(provider_names)) >>=20 >> elif args.subparsers_name =3D=3D "update": >> d.updateone(hostname=3Dargs.hostname, force=3Dargs.force) >> @@ -94,4 +91,5 @@ >> else: >> raise RuntimeError("Unhandled command: %s" % >> args.subparsers_name) >>=20 >> + >> main() >> Index: src/ddns/database.py >> IDEA additional info: >> Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP >> <+>UTF-8 >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >> --- src/ddns/database.py (revision >> c0277eeea2b2c1ed8f40f1248b28438e44e51912) >> +++ src/ddns/database.py (date 1577472902317) >> @@ -1,4 +1,4 @@ >> -#!/usr/bin/python >> +#!/usr/bin/python3 >> #################################################################### >> ########### >> # =20 >> # >> # ddns - A dynamic DNS client for IPFire =20 >> # >> @@ -28,6 +28,7 @@ >> logger =3D logging.getLogger("ddns.database") >> logger.propagate =3D 1 >>=20 >> + >> class DDNSDatabase(object): >> def __init__(self, core, path): >> self.core =3D core >> @@ -82,6 +83,7 @@ >>=20 >> def _close_database(self): >> if self._db: >> + # TODO: Check Unresolved attribute reference >> '_db_close' for class 'DDNSDatabase' >> self._db_close() >> self._db =3D None >>=20 >> Index: src/ddns/providers.py >> IDEA additional info: >> Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP >> <+>UTF-8 >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >> --- src/ddns/providers.py (revision >> c0277eeea2b2c1ed8f40f1248b28438e44e51912) >> +++ src/ddns/providers.py (date 1577472902318) >> @@ -1,4 +1,4 @@ >> -#!/usr/bin/python >> +#!/usr/bin/python3 >> #################################################################### >> ########### >> # =20 >> # >> # ddns - A dynamic DNS client for IPFire =20 >> # >> @@ -23,10 +23,12 @@ >> import logging >> import os >> import subprocess >> -import urllib2 >> +import urllib.request >> +import urllib.error >> +import urllib.parse >> import xml.dom.minidom >>=20 >> -from i18n import _ >> +from .i18n import _ >>=20 >> # Import all possible exception types. >> from .errors import * >> @@ -36,12 +38,14 @@ >>=20 >> _providers =3D {} >>=20 >> + >> def get(): >> """ >> Returns a dict with all automatically registered >> providers. >> """ >> return _providers.copy() >>=20 >> + >> class DDNSProvider(object): >> # A short string that uniquely identifies >> # this provider. >> @@ -84,7 +88,7 @@ >> if not all((provider.handle, provider.name, >> provider.website)): >> raise DDNSError(_("Provider is not >> properly configured")) >>=20 >> - assert not _providers.has_key(provider.handle), >> \ >> + assert provider.handle not in _providers, \ >> "Provider '%s' has already been >> registered" % provider.handle >>=20 >> _providers[provider.handle] =3D provider >> @@ -109,7 +113,7 @@ >> return "" % (self.name, >> self.handle) >>=20 >> def __cmp__(self, other): >> - return cmp(self.hostname, other.hostname) >> + return (lambda a, b: (a > b)-(a < b))(self.hostname, >> other.hostname) >>=20 >> @property >> def db(self): >> @@ -176,8 +180,8 @@ >> self.core.db.log_failure(self.hostname, e) >> raise >>=20 >> - logger.info(_("Dynamic DNS update for %(hostname)s >> (%(provider)s) successful") % \ >> - { "hostname" : self.hostname, "provider" : >> self.name }) >> + logger.info(_("Dynamic DNS update for %(hostname)s >> (%(provider)s) successful") % >> + {"hostname": self.hostname, >> "provider": self.name}) >> self.core.db.log_success(self.hostname) >>=20 >> def update(self): >> @@ -192,7 +196,7 @@ >>=20 >> def remove_protocol(self, proto): >> if not self.can_remove_records: >> - raise RuntimeError, "can_remove_records is >> enabled, but remove_protocol() not implemented" >> + raise RuntimeError("can_remove_records is >> enabled, but remove_protocol() not implemented") >>=20 >> raise NotImplementedError >>=20 >> @@ -200,23 +204,21 @@ >> def requires_update(self): >> # If the IP addresses have changed, an update is >> required >> if self.ip_address_changed(self.protocols): >> - logger.debug(_("An update for %(hostname)s >> (%(provider)s)" >> - " is performed because of an IP address >> change") % \ >> - { "hostname" : self.hostname, >> "provider" : self.name }) >> + logger.debug(_("An update for %(hostname)s >> (%(provider)s) is performed because of an IP address change") % >> + {"hostname": self.hostname, "provider": >> self.name}) >>=20 >> return True >>=20 >> # If the holdoff time has expired, an update is >> required, too >> if self.holdoff_time_expired(): >> - logger.debug(_("An update for %(hostname)s >> (%(provider)s)" >> - " is performed because the holdoff time >> has expired") % \ >> - { "hostname" : self.hostname, >> "provider" : self.name }) >> + logger.debug(_("An update for %(hostname)s >> (%(provider)s) is performed because the holdoff time has expired") % >> + {"hostname": >> self.hostname, "provider": self.name}) >>=20 >> return True >>=20 >> # Otherwise, we don't need to perform an update >> - logger.debug(_("No update required for %(hostname)s >> (%(provider)s)") % \ >> - { "hostname" : self.hostname, "provider" : >> self.name }) >> + logger.debug(_("No update required for %(hostname)s >> (%(provider)s)") % >> + {"hostname": self.hostname, >> "provider": self.name}) >>=20 >> return False >>=20 >> @@ -234,8 +236,7 @@ >>=20 >> # If there is no holdoff time, we won't update ever >> again. >> if self.holdoff_failure_days is None: >> - logger.warning(_("An update has not been >> performed because earlier updates failed for %s") \ >> - % self.hostname) >> + logger.warning(_("An update has not been >> performed because earlier updates failed for %s") % self.hostname) >> logger.warning(_("There will be no retries")) >>=20 >> return True >> @@ -248,8 +249,7 @@ >> if now < holdoff_end: >> failure_message =3D >> self.db.last_update_failure_message(self.hostname) >>=20 >> - logger.warning(_("An update has not been >> performed because earlier updates failed for %s") \ >> - % self.hostname) >> + logger.warning(_("An update has not been >> performed because earlier updates failed for %s") % self.hostname) >>=20 >> if failure_message: >> logger.warning(_("Last failure >> message:")) >> @@ -315,8 +315,8 @@ >> logger.debug("The holdoff time has expired for >> %s" % self.hostname) >> return True >> else: >> - logger.debug("Updates for %s are held off until >> %s" % \ >> - (self.hostname, holdoff_end)) >> + logger.debug("Updates for %s are held off until >> %s" % >> + (self.hostname, >> holdoff_end)) >> return False >>=20 >> def send_request(self, *args, **kwargs): >> @@ -362,8 +362,8 @@ >>=20 >> def prepare_request_data(self, proto): >> data =3D { >> - "hostname" : self.hostname, >> - "myip" : self.get_address(proto), >> + "hostname": self.hostname, >> + "myip": self.get_address(proto), >> } >>=20 >> return data >> @@ -375,8 +375,7 @@ >>=20 >> def send_request(self, data): >> # Send update to the server. >> - response =3D DDNSProvider.send_request(self, self.url, >> data=3Ddata, >> - username=3Dself.username, password=3Dself.password) >> + response =3D DDNSProvider.send_request(self, self.url, >> data=3Ddata, username=3Dself.username, password=3Dself.password) >>=20 >> # Get the full response message. >> output =3D response.read() >> @@ -413,7 +412,7 @@ >> will be sent by various providers. This class uses the >> python >> shipped XML minidom module to walk through the XML tree >> and return >> a requested element. >> - """ >> + """ >>=20 >> def get_xml_tag_value(self, document, content): >> # Send input to the parser. >> @@ -494,9 +493,7 @@ >> # -t sets the timeout >> command =3D ["nsupdate", "-v", "-t", "60"] >>=20 >> - p =3D subprocess.Popen(command, shell=3DTrue, >> - stdin=3Dsubprocess.PIPE, stdout=3Dsubprocess.PIPE, >> stderr=3Dsubprocess.PIPE, >> - ) >> + p =3D subprocess.Popen(command, shell=3DTrue, >> stdin=3Dsubprocess.PIPE, stdout=3Dsubprocess.PIPE, >> stderr=3Dsubprocess.PIPE) >> stdout, stderr =3D p.communicate(scriptlet) >>=20 >> if p.returncode =3D=3D 0: >> @@ -533,7 +530,7 @@ >>=20 >> scriptlet.append("update delete %s. %s" % >> (self.hostname, rrtype)) >> scriptlet.append("update add %s. %s %s %s" % \ >> - (self.hostname, ttl, rrtype, address)) >> + (self.hostname >> , ttl, rrtype, address)) >>=20 >> # Send the actions to the server. >> scriptlet.append("send") >> @@ -570,11 +567,10 @@ >>=20 >> # Send update to the server. >> try: >> - response =3D self.send_request(self.url, >> username=3Dself.username, password=3Dself.password, >> - data=3Ddata) >> + response =3D self.send_request(self.url, >> username=3Dself.username, password=3Dself.password, data=3Ddata) >>=20 >> # Handle error codes. >> - except urllib2.HTTPError, e: >> + except urllib.error.HTTPError as e: >> if e.code =3D=3D 422: >> raise DDNSRequestError(_("Domain not >> found.")) >>=20 >> @@ -585,7 +581,7 @@ >> return >>=20 >> # If we got here, some other update error happened. >> - raise DDNSUpdateError(_("Server response: %s") % >> output) >> + raise DDNSUpdateError(_("Server response: %s") % >> response) >>=20 >>=20 >> class DDNSProviderDesecIO(DDNSProtocolDynDNS2, DDNSProvider): >> @@ -631,8 +627,8 @@ >>=20 >> def update_protocol(self, proto): >> data =3D { >> - "ip" : self.get_address(proto), >> - "host" : self.hostname, >> + "ip": self.get_address(proto), >> + "host": self.hostname, >> } >>=20 >> # Check if a token has been set. >> @@ -642,8 +638,8 @@ >> # Check if username and hostname are given. >> elif self.username and self.password: >> data.update({ >> - "user" : self.username, >> - "pwd" : self.password, >> + "user": self.username, >> + "pwd": self.password, >> }) >>=20 >> # Raise an error if no auth details are given. >> @@ -695,16 +691,15 @@ >>=20 >> def update_protocol(self, proto): >> data =3D { >> - "domain" : self.hostname, >> - "ip" : self.get_address(proto), >> - "hostcmd" : "edit", >> - "hostcmdstage" : "2", >> - "type" : "4", >> + "domain": self.hostname, >> + "ip": self.get_address(proto), >> + "hostcmd": "edit", >> + "hostcmdstage": "2", >> + "type": "4", >> } >>=20 >> # Send update to the server. >> - response =3D self.send_request(self.url, >> username=3Dself.username, password=3Dself.password, >> - data=3Ddata) >> + response =3D self.send_request(self.url, >> username=3Dself.username, password=3Dself.password, data=3Ddata) >>=20 >> # Handle success messages. >> if response.code =3D=3D 200: >> @@ -728,13 +723,12 @@ >>=20 >> def update_protocol(self, proto): >> data =3D { >> - "domain" : self.hostname, >> - "ip" : self.get_address(proto), >> + "domain": self.hostname, >> + "ip": self.get_address(proto), >> } >>=20 >> # Send update to the server. >> - response =3D self.send_request(self.url, >> username=3Dself.username, password=3Dself.password, >> - data=3Ddata) >> + response =3D self.send_request(self.url, >> username=3Dself.username, password=3Dself.password, data=3Ddata) >>=20 >> # Get the full response message. >> output =3D response.read() >> @@ -777,9 +771,9 @@ >>=20 >> def update_protocol(self, proto): >> data =3D { >> - "ip" : self.get_address(proto), >> - "id" : self.hostname, >> - "pw" : self.password >> + "ip": self.get_address(proto), >> + "id": self.hostname, >> + "pw": self.password >> } >>=20 >> # Send update to the server. >> @@ -873,6 +867,7 @@ >>=20 >> url =3D "https://ddns.do.de/" >>=20 >> + >> class DDNSProviderDynUp(DDNSProvider): >> handle =3D "dynup.de" >> name =3D "DynUp.DE" >> @@ -887,10 +882,10 @@ >>=20 >> def update_protocol(self, proto): >> data =3D { >> - "username" : self.username, >> - "password" : self.password, >> - "hostname" : self.hostname, >> - "print" : '1', >> + "username": self.username, >> + "password": self.password, >> + "hostname": self.hostname, >> + "print": '1', >> } >>=20 >> # Send update to the server. >> @@ -903,14 +898,13 @@ >> output =3D output.strip() >>=20 >> # Handle success messages. >> - if output.startswith("I:OK") : >> + if output.startswith("I:OK"): >> return >>=20 >> # If we got here, some other update error happened. >> raise DDNSUpdateError >>=20 >>=20 >> - >> class DDNSProviderDynU(DDNSProtocolDynDNS2, DDNSProvider): >> handle =3D "dynu.com" >> name =3D "Dynu" >> @@ -952,13 +946,12 @@ >>=20 >> def update_protocol(self, proto): >> data =3D { >> - "myip" : self.get_address(proto, "-"), >> - "hostname" : self.hostname, >> + "myip": self.get_address(proto, "-"), >> + "hostname": self.hostname, >> } >>=20 >> # Send update to the server. >> - response =3D self.send_request(self.url, data=3Ddata, >> - username=3Dself.username, password=3Dself.password) >> + response =3D self.send_request(self.url, data=3Ddata, >> username=3Dself.username, password=3Dself.password) >>=20 >> # Get the full response message. >> output =3D response.read() >> @@ -1058,11 +1051,11 @@ >>=20 >> def update_protocol(self, proto): >> data =3D { >> - "command" : "setdnshost", >> - "responsetype" : "xml", >> - "address" : self.get_address(proto), >> - "domainpassword" : self.password, >> - "zone" : self.hostname >> + "command": "setdnshost", >> + "responsetype": "xml", >> + "address": self.get_address(proto), >> + "domainpassword": self.password, >> + "zone": self.hostname >> } >>=20 >> # Send update to the server. >> @@ -1100,7 +1093,7 @@ >>=20 >> def update_protocol(self, proto): >> data =3D { >> - "ip" : self.get_address(proto), >> + "ip": self.get_address(proto), >> } >>=20 >> # Add auth token to the update url. >> @@ -1111,7 +1104,7 @@ >> response =3D self.send_request(url, data=3Ddata) >>=20 >> # Handle error codes >> - except urllib2.HTTPError, e: >> + except urllib.error.HTTPError as e: >> if e.code =3D=3D 404: >> raise DDNSAuthenticationError >>=20 >> @@ -1140,7 +1133,7 @@ >>=20 >> def update_protocol(self, proto): >> data =3D { >> - "address" : self.get_address(proto), >> + "address": self.get_address(proto), >> } >>=20 >> # Add auth token to the update url. >> @@ -1167,53 +1160,53 @@ >>=20 >>=20 >> class DDNSProviderItsdns(DDNSProtocolDynDNS2, DDNSProvider): >> - handle =3D "inwx.com" >> - name =3D "INWX" >> - website =3D "https://www.inwx.com" >> - protocols =3D ("ipv6", "ipv4") >> + handle =3D "inwx.com" >> + name =3D "INWX" >> + website =3D "https://www.inwx.com" >> + protocols =3D ("ipv6", "ipv4") >>=20 >> - # Information about the format of the HTTP request is >> to be found >> - # here: https://www.inwx.com/en/nameserver2/dyndns >> (requires login) >> - # Notice: The URL is the same for: inwx.com|de|at|ch|es >> + # Information about the format of the HTTP request is to be >> found >> + # here: https://www.inwx.com/en/nameserver2/dyndns (requires >> login) >> + # Notice: The URL is the same for: inwx.com|de|at|ch|es >>=20 >> - url =3D "https://dyndns.inwx.com/nic/update" >> + url =3D "https://dyndns.inwx.com/nic/update" >>=20 >>=20 >> class DDNSProviderItsdns(DDNSProtocolDynDNS2, DDNSProvider): >> - handle =3D "itsdns.de" >> - name =3D "it's DNS" >> - website =3D "http://www.itsdns.de/" >> - protocols =3D ("ipv6", "ipv4") >> + handle =3D "itsdns.de" >> + name =3D "it's DNS" >> + website =3D "http://www.itsdns.de/" >> + protocols =3D ("ipv6", "ipv4") >>=20 >> - # Information about the format of the HTTP request is >> to be found >> - # here: https://www.itsdns.de/dynupdatehelp.htm >> + # Information about the format of the HTTP request is to be >> found >> + # here: https://www.itsdns.de/dynupdatehelp.htm >>=20 >> - url =3D "https://www.itsdns.de/update.php" >> + url =3D "https://www.itsdns.de/update.php" >>=20 >>=20 >> class DDNSProviderJoker(DDNSProtocolDynDNS2, DDNSProvider): >> - handle =3D "joker.com" >> - name =3D "Joker.com Dynamic DNS" >> - website =3D "https://joker.com/" >> - protocols =3D ("ipv4",) >> + handle =3D "joker.com" >> + name =3D "Joker.com Dynamic DNS" >> + website =3D "https://joker.com/" >> + protocols =3D ("ipv4",) >>=20 >> - # Information about the request can be found here: >> - #=20 >> https://joker.com/faq/content/11/427/en/what-is-dynamic-dns-dyndns.html >> - # Using DynDNS V2 protocol over HTTPS here >> + # Information about the request can be found here: >> + #=20 >> https://joker.com/faq/content/11/427/en/what-is-dynamic-dns-dyndns.html >> + # Using DynDNS V2 protocol over HTTPS here >>=20 >> - url =3D "https://svc.joker.com/nic/update" >> + url =3D "https://svc.joker.com/nic/update" >>=20 >>=20 >> class DDNSProviderGoogle(DDNSProtocolDynDNS2, DDNSProvider): >> - handle =3D "domains.google.com" >> - name =3D "Google Domains" >> - website =3D "https://domains.google.com/" >> - protocols =3D ("ipv4",) >> + handle =3D "domains.google.com" >> + name =3D "Google Domains" >> + website =3D "https://domains.google.com/" >> + protocols =3D ("ipv4",) >>=20 >> - # Information about the format of the HTTP request is to be >> found >> - # here:=20 >> https://support.google.com/domains/answer/6147083?hl=3Den >> + # Information about the format of the HTTP request is to be >> found >> + # here: https://support.google.com/domains/answer/6147083?hl=3Den >>=20 >> - url =3D "https://domains.google.com/nic/update" >> + url =3D "https://domains.google.com/nic/update" >>=20 >>=20 >> class DDNSProviderLightningWireLabs(DDNSProvider): >> @@ -1227,10 +1220,10 @@ >> url =3D "https://dns.lightningwirelabs.com/update" >>=20 >> def update(self): >> - data =3D { >> - "hostname" : self.hostname, >> - "address6" : self.get_address("ipv6", "-"), >> - "address4" : self.get_address("ipv4", "-"), >> + data =3D { >> + "hostname": self.hostname, >> + "address6": self.get_address("ipv6", "-"), >> + "address4": self.get_address("ipv4", "-"), >> } >>=20 >> # Check if a token has been set. >> @@ -1240,8 +1233,8 @@ >> # Check for username and password. >> elif self.username and self.password: >> data.update({ >> - "username" : self.username, >> - "password" : self.password, >> + "username": self.username, >> + "password": self.password, >> }) >>=20 >> # Raise an error if no auth details are given. >> @@ -1283,8 +1276,8 @@ >>=20 >> def prepare_request_data(self, proto): >> data =3D { >> - "hostname" : self.hostname, >> - "ip" : self.get_address(proto), >> + "hostname": self.hostname, >> + "ip": self.get_address(proto), >> } >>=20 >> return data >> @@ -1311,10 +1304,10 @@ >> address =3D self.get_address(proto) >>=20 >> data =3D { >> - "ip" : address, >> - "password" : self.password, >> - "host" : host, >> - "domain" : domain >> + "ip": address, >> + "password": self.password, >> + "host": host, >> + "domain": domain >> } >>=20 >> # Send update to the server. >> @@ -1359,8 +1352,8 @@ >> assert proto =3D=3D "ipv4" >>=20 >> data =3D { >> - "hostname" : self.hostname, >> - "address" : self.get_address(proto), >> + "hostname": self.hostname, >> + "address": self.get_address(proto), >> } >>=20 >> return data >> @@ -1411,7 +1404,7 @@ >>=20 >> def prepare_request_data(self, proto): >> data =3D { >> - "myip" : self.get_address(proto), >> + "myip": self.get_address(proto), >> } >>=20 >> return data >> @@ -1430,8 +1423,8 @@ >>=20 >> def prepare_request_data(self, proto): >> data =3D { >> - "hostname" : self.hostname, >> - "myip" : self.get_address(proto), >> + "hostname": self.hostname, >> + "myip": self.get_address(proto), >> } >>=20 >> return data >> @@ -1454,7 +1447,7 @@ >> def prepare_request_data(self, proto): >> data =3D DDNSProtocolDynDNS2.prepare_request_data(self, >> proto) >> data.update({ >> - "system" : "dyndns", >> + "system": "dyndns", >> }) >>=20 >> return data >> @@ -1474,7 +1467,7 @@ >>=20 >> def update(self): >> data =3D { >> - "fqdn" : self.hostname, >> + "fqdn": self.hostname, >> } >>=20 >> # Check if we update an IPv6 address. >> @@ -1488,7 +1481,7 @@ >> data["ipv4"] =3D address4 >>=20 >> # Raise an error if none address is given. >> - if not data.has_key("ipv6") and not >> data.has_key("ipv4"): >> + if "ipv6" not in data and "ipv4" not in data: >> raise DDNSConfigurationError >>=20 >> # Check if a token has been set. >> @@ -1506,8 +1499,7 @@ >> response =3D self.send_request(self.url, >> data=3Ddata) >> else: >> # Send update to the server. >> - response =3D self.send_request(self.url, >> username=3Dself.username, password=3Dself.password, >> - data=3Ddata) >> + response =3D self.send_request(self.url, >> username=3Dself.username, password=3Dself.password, data=3Ddata) >>=20 >> # Get the full response message. >> output =3D response.read() >> @@ -1554,7 +1546,7 @@ >> def prepare_request_data(self, proto): >> data =3D DDNSProtocolDynDNS2.prepare_request_data(self, >> proto) >> data.update({ >> - "hostname" : "1", >> + "hostname": "1", >> }) >>=20 >> return data >> @@ -1571,10 +1563,10 @@ >>=20 >> def update_protocol(self, proto): >> data =3D { >> - "ipaddr" : self.get_address(proto), >> - "hostname" : self.hostname, >> - "username" : self.username, >> - "pass" : self.password, >> + "ipaddr": self.get_address(proto), >> + "hostname": self.hostname, >> + "username": self.username, >> + "pass": self.password, >> } >>=20 >> # Send request to provider >> @@ -1632,8 +1624,8 @@ >> def prepare_request_data(self, proto): >> data =3D DDNSProtocolDynDNS2.prepare_request_data(self, >> proto) >> data.update({ >> - "mx" : "NOCHG", >> - "backupmx" : "NOCHG" >> + "mx": "NOCHG", >> + "backupmx": "NOCHG" >> }) >>=20 >> return data >> @@ -1655,8 +1647,8 @@ >> assert proto =3D=3D "ipv4" >>=20 >> data =3D { >> - "ip" : self.get_address(proto), >> - "hostname" : self.hostname >> + "ip": self.get_address(proto), >> + "hostname": self.hostname >> } >>=20 >> return data >> @@ -1687,23 +1679,23 @@ >>=20 >> def prepare_request_data(self, proto): >> data =3D { >> - "hostname" : self.hostname, >> - "myip" : self.get_address(proto), >> + "hostname": self.hostname, >> + "myip": self.get_address(proto), >> } >>=20 >> return data >>=20 >>=20 >> class DDNSProviderXLhost(DDNSProtocolDynDNS2, DDNSProvider): >> - handle =3D "xlhost.de" >> - name =3D "XLhost" >> - website =3D "http://xlhost.de/" >> - protocols =3D ("ipv4",) >> + handle =3D "xlhost.de" >> + name =3D "XLhost" >> + website =3D "http://xlhost.de/" >> + protocols =3D ("ipv4",) >>=20 >> - # Information about the format of the HTTP request is to be >> found >> - # here:=20 >> https://xlhost.de/faq/index_html?topicId=3DCQA2ELIPO4SQ >> + # Information about the format of the HTTP request is to be >> found >> + # here: https://xlhost.de/faq/index_html?topicId=3DCQA2ELIPO4SQ >>=20 >> - url =3D "https://nsupdate.xlhost.de/" >> + url =3D "https://nsupdate.xlhost.de/" >>=20 >>=20 >> class DDNSProviderZoneedit(DDNSProvider): >> @@ -1721,13 +1713,12 @@ >>=20 >> def update_protocol(self, proto): >> data =3D { >> - "dnsto" : self.get_address(proto), >> - "host" : self.hostname >> + "dnsto": self.get_address(proto), >> + "host": self.hostname >> } >>=20 >> # Send update to the server. >> - response =3D self.send_request(self.url, >> username=3Dself.username, password=3Dself.password, >> - data=3Ddata) >> + response =3D self.send_request(self.url, >> username=3Dself.username, password=3Dself.password, data=3Ddata) >>=20 >> # Get the full response message. >> output =3D response.read() >> @@ -1763,10 +1754,10 @@ >>=20 >> def update_protocol(self, proto): >> data =3D { >> - "ip" : self.get_address(proto), >> - "id" : self.hostname, >> - "username" : self.username, >> - "password" : self.password, >> + "ip": self.get_address(proto), >> + "id": self.hostname, >> + "username": self.username, >> + "password": self.password, >> } >>=20 >> # Send update to the server. >> @@ -1813,8 +1804,8 @@ >>=20 >> def update_protocol(self, proto): >> data =3D { >> - "ip" : self.get_address(proto), >> - "token" : self.token, >> + "ip": self.get_address(proto), >> + "token": self.token, >> } >>=20 >> if proto =3D=3D "ipv6": >> Index: src/ddns/__init__.py >> IDEA additional info: >> Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP >> <+>UTF-8 >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >> --- src/ddns/__init__.py (revision >> c0277eeea2b2c1ed8f40f1248b28438e44e51912) >> +++ src/ddns/__init__.py (date 1577472902316) >> @@ -1,4 +1,4 @@ >> -#!/usr/bin/python >> +#!/usr/bin/python3 >> #################################################################### >> ########### >> # =20 >> # >> # ddns - A dynamic DNS client for IPFire =20 >> # >> @@ -21,19 +21,20 @@ >>=20 >> import logging >> import logging.handlers >> -import ConfigParser >> +import configparser >>=20 >> -from i18n import _ >> +from .i18n import _ >>=20 >> logger =3D logging.getLogger("ddns.core") >> logger.propagate =3D 1 >>=20 >> -import database >> -import providers >> +from . import database >> +from . import providers >>=20 >> from .errors import * >> from .system import DDNSSystem >>=20 >> + >> # Setup the logger. >> def setup_logging(): >> rootlogger =3D logging.getLogger("ddns") >> @@ -51,8 +52,10 @@ >> handler =3D logging.StreamHandler() >> rootlogger.addHandler(handler) >>=20 >> + >> setup_logging() >>=20 >> + >> class DDNSCore(object): >> def __init__(self, debug=3DFalse): >> # In debug mode, enable debug logging. >> @@ -89,7 +92,7 @@ >> def load_configuration(self, filename): >> logger.debug(_("Loading configuration file %s") % >> filename) >>=20 >> - configs =3D ConfigParser.RawConfigParser() >> + configs =3D configparser.RawConfigParser() >> configs.read([filename,]) >>=20 >> # First apply all global configuration settings. >> @@ -98,7 +101,7 @@ >> self.settings[k] =3D v >>=20 >> # Allow missing config section >> - except ConfigParser.NoSectionError: >> + except configparser.NoSectionError: >> pass >>=20 >> for entry in configs.sections(): >> @@ -127,7 +130,7 @@ >> # Check if the provider is actually supported >> and if there are >> # some dependencies missing on this system. >> if not provider.supported(): >> - logger.warning("Provider '%s' is known, >> but not supported on this machine" % (provider.name)) >> + logger.warning("Provider '%s' is known, >> but not supported on this machine" % provider.name) >> continue >>=20 >> # Create an instance of the provider object >> with settings from the >> @@ -163,13 +166,13 @@ >> try: >> entry(force=3Dforce) >>=20 >> - except DDNSError, e: >> - logger.error(_("Dynamic DNS update for >> %(hostname)s (%(provider)s) failed:") % \ >> - { "hostname" : entry.hostname, >> "provider" : entry.name }) >> + except DDNSError as e: >> + logger.error(_("Dynamic DNS update for >> %(hostname)s (%(provider)s) failed:") % >> + {"hostname": entry.hostname, >> "provider": entry.name}) >> logger.error(" %s: %s" % >> (e.__class__.__name__, e.reason)) >> if e.message: >> logger.error(" %s" % e.message) >>=20 >> - except Exception, e: >> - logger.error(_("Dynamic DNS update for >> %(hostname)s (%(provider)s) throwed an unhandled exception:") % \ >> - { "hostname" : entry.hostname, >> "provider" : entry.name }, exc_info=3DTrue) >> + except Exception: >> + logger.error(_("Dynamic DNS update for >> %(hostname)s (%(provider)s) threw an unhandled exception:") % >> + {"hostname": >> entry.hostname, "provider": entry.name}, exc_info=3DTrue) >> Index: src/ddns/errors.py >> IDEA additional info: >> Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP >> <+>UTF-8 >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >> --- src/ddns/errors.py (revision >> c0277eeea2b2c1ed8f40f1248b28438e44e51912) >> +++ src/ddns/errors.py (date 1577472902317) >> @@ -1,4 +1,4 @@ >> -#!/usr/bin/python >> +#!/usr/bin/python3 >> #################################################################### >> ########### >> # =20 >> # >> # ddns - A dynamic DNS client for IPFire =20 >> # >> @@ -21,6 +21,7 @@ >>=20 >> N_ =3D lambda x: x >>=20 >> + >> class DDNSError(Exception): >> """ >> Generic error class for all exceptions >>=20 >>=20 >> Am 25.12.2019 um 16:52 schrieb Michael Tremer < >> michael.tremer(a)ipfire.org>: >>=20 >> Hi, >>=20 >> Thanks for working on this. >>=20 >> There are some issues with this patch. >>=20 >> First of all, the formatting is off and all leading spaces have been >> stripped. >>=20 >>> On 25 Dec 2019, at 16:39, Kim wrote: >>>=20 >>> --- >>> .gitignore | 1 + >>> Makefile.am | 2 +- >>> configure.ac | 6 +- >>> ddns.in | 30 ++- >>> src/ddns/__init__.py | 33 +-- >>> src/ddns/database.py | 5 +- >>> src/ddns/errors.py | 5 +- >>> src/ddns/i18n.py | 11 +- >>> src/ddns/providers.py | 545 +++++++++++++++++++++---------------- >>> ----- >>> src/ddns/system.py | 44 ++-- >>> 10 files changed, 339 insertions(+), 343 deletions(-) >>>=20 >>> diff --git a/.gitignore b/.gitignore >>> index cd5023c..df7e7eb 100644 >>> --- a/.gitignore >>> +++ b/.gitignore >>> @@ -27,3 +27,4 @@ intltool-extract.in >>> intltool-merge.in >>> intltool-update.in >>> stamp-* >>> +.idea >>=20 >> What does this have to do with the Python port? >>=20 >>> diff --git a/Makefile.am b/Makefile.am >>> index fc119b8..d36f880 100644 >>> --- a/Makefile.am >>> +++ b/Makefile.am >>> @@ -1,7 +1,7 @@ >>> ################################################################### >>> ############ >>> # >>>=20 >>> # >>> # Pakfire - The IPFire package management system >>> # >>> -# Copyright (C) 2013 Pakfire development team >>> # >>> +# Copyright (C) 2013-2019 Pakfire development team >>> # >>=20 >> Pakfire? >>=20 >>> # >>>=20 >>> # >>> # This program is free software: you can redistribute it and/or >>> modify # >>> # it under the terms of the GNU General Public License as published >>> by # >>> diff --git a/configure.ac b/configure.ac >>> index 14bccc0..320de10 100644 >>> --- a/configure.ac >>> +++ b/configure.ac >>> @@ -1,7 +1,7 @@ >>> ################################################################### >>> ############ >>> # >>>=20 >>> # >>> # Pakfire - The IPFire package management system >>> # >>> -# Copyright (C) 2013 Pakfire development team >>> # >>> +# Copyright (C) 2013-2019 Pakfire development team >>> # >>> # >>>=20 >>> # >>> # This program is free software: you can redistribute it and/or >>> modify # >>> # it under the terms of the GNU General Public License as published >>> by # >>> @@ -21,7 +21,7 @@ >>> AC_PREREQ([2.64]) >>>=20 >>> AC_INIT([ddns], >>> - [012], >>> + [013], >>> [info(a)ipfire.org], >>> [ddns], >>> [http://git.ipfire.org/?p=3Doddments/ddns.git;a=3Dsummary]) >>=20 >> You do not need to tag a new release. >>=20 >>> @@ -54,7 +54,7 @@ AC_PROG_SED >>> AC_PATH_PROG([XSLTPROC], [xsltproc]) >>>=20 >>> # Python >>> -AM_PATH_PYTHON([2.7]) >>> +AM_PATH_PYTHON([3]) >>=20 >> Are you sure this will run with Python 3.0, 3.2, etc.? >>=20 >> I suppose it is safe to have 3.6 or even 3.8 here. >>=20 >>> save_LIBS=3D"$LIBS" >>>=20 >>> diff --git a/ddns.in b/ddns.in >>> index 1ca5f83..9bb267a 100644 >>> --- a/ddns.in >>> +++ b/ddns.in >>> @@ -1,8 +1,8 @@ >>> -#!/usr/bin/python >>> +#!/usr/bin/python3 >>> ################################################################### >>> ############ >>> # >>>=20 >>> # >>> # ddns - A dynamic DNS client for IPFire >>> # >>> -# Copyright (C) 2012 IPFire development team >>> # >>> +# Copyright (C) 2012-2019 IPFire development team >>> # >>=20 >> See above. >>=20 >>> # >>>=20 >>> # >>> # This program is free software: you can redistribute it and/or >>> modify # >>> # it under the terms of the GNU General Public License as published >>> by # >>> @@ -27,38 +27,35 @@ from ddns.i18n import _ >>>=20 >>> CONFIGURATION_FILE =3D "@configsdir@/ddns.conf" >>>=20 >>> + >>> def main(): >>> # Parse command line >>> p =3D argparse.ArgumentParser(description=3D_("Dynamic DNS >>> Updater")) >>>=20 >>> - p.add_argument("-d", "--debug", action=3D"store_true", >>> - help=3D_("Enable debugging output")) >>> + p.add_argument("-d", "--debug", action=3D"store_true", >>> help=3D_("Enable debugging output")) >>>=20 >>> p.add_argument("-c", "--config", default=3DCONFIGURATION_FILE, >>> - help=3D_("Load configuration file (Default: %s)") % >>> CONFIGURATION_FILE) >>> + help=3D_("Load configuration file (Default: %s)") >>> % CONFIGURATION_FILE) >>>=20 >>> # Create subparsers for commands. >>> - subparsers =3D p.add_subparsers(help=3D_("Sub-command help"), >>> - dest=3D"subparsers_name") >>> + subparsers =3D p.add_subparsers(help=3D_("Sub-command help"), >>> dest=3D"subparsers_name") >>>=20 >>> # guess-ip-addresses >>> - p_guess_ip_addresses =3D subparsers.add_parser("guess-ip- >>> addresses", >>> - help=3D_("Guess the external IP addresses")) >>> + p_guess_ip_addresses =3D subparsers.add_parser("guess-ip- >>> addresses", help=3D_("Guess the external IP addresses")) >>>=20 >>> # list-providers >>> - p_list_providers =3D subparsers.add_parser("list-providers", >>> - help=3D_("List all available providers")) >>> + p_list_providers =3D subparsers.add_parser("list-providers", >>> help=3D_("List all available providers")) >>>=20 >>> # update >>> p_update =3D subparsers.add_parser("update", help=3D_("Update DNS >>> record")) >>> p_update.add_argument("hostname") >>> p_update.add_argument("--force", action=3D"store_true", >>> - help=3D_("Execute update even if the record is already up >>> to date")) >>> + help=3D_("Execute update even if the record >>> is already up to date")) >>=20 >> You have changed indentation here. Is there any need for it? >>=20 >> This doesn=E2=80=99t change the code, but further down, there is a lot of >> noise in the patch and I do not know why. >>=20 >>> # update-all >>> p_update_all =3D subparsers.add_parser("update-all", >>> help=3D_("Update all DNS records")) >>> p_update_all.add_argument("--force", action=3D"store_true", >>> - help=3D_("Execute update even if the record is already up >>> to date")) >>> + help=3D_("Execute update even if the >>> record is already up to date")) >>>=20 >>> args =3D p.parse_args() >>>=20 >>> @@ -74,16 +71,16 @@ def main(): >>> # IPv6 >>> ipv6_address =3D >>> d.system.guess_external_ip_address("ipv6") >>> if ipv6_address: >>> - print _("IPv6 Address: %s") % ipv6_address >>> + print("IPv6 Address: %s" % ipv6_address) >>=20 >> You are removing the translation here. >>=20 >>> # IPv4 >>> ipv4_address =3D >>> d.system.guess_external_ip_address("ipv4") >>> if ipv4_address: >>> - print _("IPv4 Address: %s") % ipv4_address >>> + print("IPv4 Address: %s" % ipv4_address) >>=20 >> Likewise. >>=20 >>> elif args.subparsers_name =3D=3D "list-providers": >>> provider_names =3D d.get_provider_names() >>> - print "\n".join(provider_names) >>> + print("\n".join(provider_names)) >>>=20 >>> elif args.subparsers_name =3D=3D "update": >>> d.updateone(hostname=3Dargs.hostname, force=3Dargs.force) >>> @@ -94,4 +91,5 @@ def main(): >>> else: >>> raise RuntimeError("Unhandled command: %s" % >>> args.subparsers_name) >>>=20 >>> + >>=20 >> We only have one empty line after functions and two after classes. >>=20 >>> main() >>> diff --git a/src/ddns/__init__.py b/src/ddns/__init__.py >>> index 7f2729c..4fffcf7 100644 >>> --- a/src/ddns/__init__.py >>> +++ b/src/ddns/__init__.py >>> @@ -1,8 +1,8 @@ >>> -#!/usr/bin/python >>> +#!/usr/bin/python3 >>> ################################################################### >>> ############ >>> # >>>=20 >>> # >>> # ddns - A dynamic DNS client for IPFire >>> # >>> -# Copyright (C) 2012 IPFire development team >>> # >>> +# Copyright (C) 2012-2019 IPFire development team >>> # >>> # >>>=20 >>> # >>> # This program is free software: you can redistribute it and/or >>> modify # >>> # it under the terms of the GNU General Public License as published >>> by # >>> @@ -21,19 +21,20 @@ >>>=20 >>> import logging >>> import logging.handlers >>> -import ConfigParser >>> +import configparser >>>=20 >>> -from i18n import _ >>> +from .i18n import _ >>>=20 >>> logger =3D logging.getLogger("ddns.core") >>> logger.propagate =3D 1 >>>=20 >>> -import database >>> -import providers >>> +from . import database >>> +from . import providers >>>=20 >>> from .errors import * >>> from .system import DDNSSystem >>>=20 >>> + >>=20 >> Another blank line. >>=20 >>> # Setup the logger. >>> def setup_logging(): >>> rootlogger =3D logging.getLogger("ddns") >>> @@ -51,8 +52,10 @@ def setup_logging(): >>> handler =3D logging.StreamHandler() >>> rootlogger.addHandler(handler) >>>=20 >>> + >>> setup_logging() >>=20 >> And here again. >>=20 >>> + >>=20 >> And again. >>=20 >>> class DDNSCore(object): >>> def __init__(self, debug=3DFalse): >>> # In debug mode, enable debug logging. >>> @@ -89,7 +92,7 @@ class DDNSCore(object): >>> def load_configuration(self, filename): >>> logger.debug(_("Loading configuration file %s") % >>> filename) >>>=20 >>> - configs =3D ConfigParser.RawConfigParser() >>> + configs =3D configparser.RawConfigParser() >>> configs.read([filename,]) >>>=20 >>> # First apply all global configuration settings. >>> @@ -98,7 +101,7 @@ class DDNSCore(object): >>> self.settings[k] =3D v >>>=20 >>> # Allow missing config section >>> - except ConfigParser.NoSectionError: >>> + except configparser.NoSectionError: >>> pass >>>=20 >>> for entry in configs.sections(): >>> @@ -127,7 +130,7 @@ class DDNSCore(object): >>> # Check if the provider is actually supported >>> and if there are >>> # some dependencies missing on this system. >>> if not provider.supported(): >>> - logger.warning("Provider '%s' is known, >>> but not supported on this machine" % (provider.name)) >>> + logger.warning("Provider '%s' is known, >>> but not supported on this machine" % provider.name) >>> continue >>>=20 >>> # Create an instance of the provider object >>> with settings from the >>> @@ -163,13 +166,13 @@ class DDNSCore(object): >>> try: >>> entry(force=3Dforce) >>>=20 >>> - except DDNSError, e: >>> - logger.error(_("Dynamic DNS update for >>> %(hostname)s (%(provider)s) failed:") % \ >>> - { "hostname" : entry.hostname, >>> "provider" : entry.name }) >>> + except DDNSError as e: >>> + logger.error(_("Dynamic DNS update for >>> %(hostname)s (%(provider)s) failed:") % >>> + {"hostname": entry.hostname, >>> "provider": entry.name}) >>=20 >> You are removing spaces here for no reason. >>=20 >>> logger.error(" %s: %s" % >>> (e.__class__.__name__, e.reason)) >>> if e.message: >>> logger.error(" %s" % e.message) >>>=20 >>> - except Exception, e: >>> - logger.error(_("Dynamic DNS update for >>> %(hostname)s (%(provider)s) throwed an unhandled exception:") % \ >>> - { "hostname" : entry.hostname, >>> "provider" : entry.name }, exc_info=3DTrue) >>> + except Exception: >>> + logger.error(_("Dynamic DNS update for >>> %(hostname)s (%(provider)s) threw an unhandled exception:") % >>> + {"hostname": >>> entry.hostname, "provider": entry.name}, exc_info=3DTrue) >>=20 >> See above. >>=20 >>> diff --git a/src/ddns/database.py b/src/ddns/database.py >>> index 70a7363..45c445f 100644 >>> --- a/src/ddns/database.py >>> +++ b/src/ddns/database.py >>> @@ -1,8 +1,8 @@ >>> -#!/usr/bin/python >>> +#!/usr/bin/python3 >>> ################################################################### >>> ############ >>> # >>>=20 >>> # >>> # ddns - A dynamic DNS client for IPFire >>> # >>> -# Copyright (C) 2014 IPFire development team >>> # >>> +# Copyright (C) 2012-2019 IPFire development team >>> # >>> # >>>=20 >>> # >>> # This program is free software: you can redistribute it and/or >>> modify # >>> # it under the terms of the GNU General Public License as published >>> by # >>> @@ -82,6 +82,7 @@ class DDNSDatabase(object): >>>=20 >>> def _close_database(self): >>> if self._db: >>> + # TODO: Check Unresolved attribute reference >>> '_db_close' for class 'DDNSDatabase' >>> self._db_close() >>> self._db =3D None >>=20 >> What does this mean? >>=20 >> Does that mean this patch isn=E2=80=99t ready for production? >>=20 >>> diff --git a/src/ddns/errors.py b/src/ddns/errors.py >>> index a8a2017..128d20d 100644 >>> --- a/src/ddns/errors.py >>> +++ b/src/ddns/errors.py >>> @@ -1,8 +1,8 @@ >>> -#!/usr/bin/python >>> +#!/usr/bin/python3 >>> ################################################################### >>> ############ >>> # >>>=20 >>> # >>> # ddns - A dynamic DNS client for IPFire >>> # >>> -# Copyright (C) 2012-2017 IPFire development team >>> # >>> +# Copyright (C) 2012-2019 IPFire development team >>> # >>> # >>>=20 >>> # >>> # This program is free software: you can redistribute it and/or >>> modify # >>> # it under the terms of the GNU General Public License as published >>> by # >>> @@ -21,6 +21,7 @@ >>>=20 >>> N_ =3D lambda x: x >>>=20 >>> + >>=20 >> Blank line again. >>=20 >>> class DDNSError(Exception): >>> """ >>> Generic error class for all exceptions >>> diff --git a/src/ddns/i18n.py b/src/ddns/i18n.py >>> index 170414d..b71f7dc 100644 >>> --- a/src/ddns/i18n.py >>> +++ b/src/ddns/i18n.py >>> @@ -1,8 +1,8 @@ >>> -#!/usr/bin/python >>> +#!/usr/bin/python3 >>> ################################################################### >>> ############ >>> # >>>=20 >>> # >>> # ddns - A dynamic DNS client for IPFire >>> # >>> -# Copyright (C) 2012 IPFire development team >>> # >>> +# Copyright (C) 2012-2019 IPFire development team >>> # >>> # >>>=20 >>> # >>> # This program is free software: you can redistribute it and/or >>> modify # >>> # it under the terms of the GNU General Public License as published >>> by # >>> @@ -25,15 +25,14 @@ TEXTDOMAIN =3D "ddns" >>>=20 >>> N_ =3D lambda x: x >>>=20 >>> + >>=20 >> Blank line. >>=20 >>> def _(singular, plural=3DNone, n=3DNone): >>> """ >>> A function that returnes the translation of a string if >>> available. >>> - >>> The language is taken from the system environment. >>> - """ >>> - if not plural is None: >>> + """ >>> + if plural is not None: >>> assert n is not None >>> return gettext.dngettext(TEXTDOMAIN, singular, plural, >>> n) >>>=20 >>> return gettext.dgettext(TEXTDOMAIN, singular) >>> - >>> diff --git a/src/ddns/providers.py b/src/ddns/providers.py >>> index 661fbcc..b4a27a1 100644 >>> --- a/src/ddns/providers.py >>> +++ b/src/ddns/providers.py >>> @@ -1,8 +1,8 @@ >>> -#!/usr/bin/python >>> +#!/usr/bin/python3 >>> ################################################################### >>> ############ >>> # >>>=20 >>> # >>> # ddns - A dynamic DNS client for IPFire >>> # >>> -# Copyright (C) 2012-2017 IPFire development team >>> # >>> +# Copyright (C) 2012-2019 IPFire development team >>> # >>> # >>>=20 >>> # >>> # This program is free software: you can redistribute it and/or >>> modify # >>> # it under the terms of the GNU General Public License as published >>> by # >>> @@ -23,10 +23,10 @@ import datetime >>> import logging >>> import os >>> import subprocess >>> -import urllib2 >>> +import urllib.request, urllib.error, urllib.parse >>> import xml.dom.minidom >>>=20 >>> -from i18n import _ >>> +from .i18n import _ >>>=20 >>> # Import all possible exception types. >>> from .errors import * >>> @@ -36,12 +36,14 @@ logger.propagate =3D 1 >>>=20 >>> _providers =3D {} >>>=20 >>> + >>=20 >> I will stop commenting on the blank lines now, but there is many many >> more. >>=20 >>> def get(): >>> """ >>> Returns a dict with all automatically registered >>> providers. >>> """ >>> return _providers.copy() >>>=20 >>> + >>> class DDNSProvider(object): >>> # A short string that uniquely identifies >>> # this provider. >>> @@ -84,7 +86,7 @@ class DDNSProvider(object): >>> if not all((provider.handle, provider.name, >>> provider.website)): >>> raise DDNSError(_("Provider is not >>> properly configured")) >>>=20 >>> - assert not _providers.has_key(provider.handle), >>> \ >>> + assert provider.handle not in _providers, \ >>> "Provider '%s' has already been >>> registered" % provider.handle >>>=20 >>> _providers[provider.handle] =3D provider >>> @@ -109,7 +111,7 @@ class DDNSProvider(object): >>> return "" % (self.name, >>> self.handle) >>>=20 >>> def __cmp__(self, other): >>> - return cmp(self.hostname, other.hostname) >>> + return (lambda a, b: (a > b)-(a < b))(self.hostname, >>> other.hostname) >>=20 >> __cmp__ should be replaced by __eq__ and __lt__ at least. >>=20 >> Those are straight forward comparisons of the hostname, and this >> lambda function is confusing and difficult to read. >>=20 >>> @property >>> def db(self): >>> @@ -176,8 +178,8 @@ class DDNSProvider(object): >>> self.core.db.log_failure(self.hostname, e) >>> raise >>>=20 >>> - logger.info(_("Dynamic DNS update for %(hostname)s >>> (%(provider)s) successful") % \ >>> - { "hostname" : self.hostname, "provider" : >>> self.name }) >>> + logger.info(_("Dynamic DNS update for %(hostname)s >>> (%(provider)s) successful") % >>> + {"hostname": self.hostname, "provider": >>> self.name}) >>=20 >> Spaces. >>=20 >>> self.core.db.log_success(self.hostname) >>>=20 >>> def update(self): >>> @@ -192,7 +194,7 @@ class DDNSProvider(object): >>>=20 >>> def remove_protocol(self, proto): >>> if not self.can_remove_records: >>> - raise RuntimeError, "can_remove_records is >>> enabled, but remove_protocol() not implemented" >>> + raise RuntimeError("can_remove_records is >>> enabled, but remove_protocol() not implemented") >>>=20 >>> raise NotImplementedError >>>=20 >>> @@ -201,22 +203,22 @@ class DDNSProvider(object): >>> # If the IP addresses have changed, an update is >>> required >>> if self.ip_address_changed(self.protocols): >>> logger.debug(_("An update for %(hostname)s >>> (%(provider)s)" >>> - " is performed because of an IP address >>> change") % \ >>> - { "hostname" : self.hostname, >>> "provider" : self.name }) >>> + " is performed because of an IP >>> address change") % >>> + {"hostname": self.hostname, >>> "provider": self.name}) >>>=20 >>=20 >> Spaces. >>=20 >>> return True >>>=20 >>> # If the holdoff time has expired, an update is >>> required, too >>> if self.holdoff_time_expired(): >>> logger.debug(_("An update for %(hostname)s >>> (%(provider)s)" >>> - " is performed because the holdoff time >>> has expired") % \ >>> - { "hostname" : self.hostname, >>> "provider" : self.name }) >>> + " is performed because the >>> holdoff time has expired") % >>> + {"hostname": self.hostname, >>> "provider": self.name}) >>>=20 >>=20 >> Likewise. >>=20 >>> return True >>>=20 >>> # Otherwise, we don't need to perform an update >>> - logger.debug(_("No update required for %(hostname)s >>> (%(provider)s)") % \ >>> - { "hostname" : self.hostname, "provider" : >>> self.name }) >>> + logger.debug(_("No update required for %(hostname)s >>> (%(provider)s)") % >>> + {"hostname": self.hostname, "provider": >>> self.name}) >>=20 >> Likewise. >>=20 >>> return False >>>=20 >>> @@ -234,8 +236,7 @@ class DDNSProvider(object): >>>=20 >>> # If there is no holdoff time, we won't update ever >>> again. >>> if self.holdoff_failure_days is None: >>> - logger.warning(_("An update has not been >>> performed because earlier updates failed for %s") \ >>> - % self.hostname) >>> + logger.warning(_("An update has not been >>> performed because earlier updates failed for %s") % self.hostname) >>> logger.warning(_("There will be no retries")) >>=20 >> There is a limit to the length of a line. It should be 80 characters >> and in difficult cases can be 120 characters. >>=20 >> This has been tried here before, but your patch removes it. Why? >>=20 >>> return True >>> @@ -248,8 +249,7 @@ class DDNSProvider(object): >>> if now < holdoff_end: >>> failure_message =3D >>> self.db.last_update_failure_message(self.hostname) >>>=20 >>> - logger.warning(_("An update has not been >>> performed because earlier updates failed for %s") \ >>> - % self.hostname) >>> + logger.warning(_("An update has not been >>> performed because earlier updates failed for %s") % self.hostname) >>=20 >> Likewise. >>=20 >>> if failure_message: >>> logger.warning(_("Last failure >>> message:")) >>> @@ -315,8 +315,8 @@ class DDNSProvider(object): >>> logger.debug("The holdoff time has expired for >>> %s" % self.hostname) >>> return True >>> else: >>> - logger.debug("Updates for %s are held off until >>> %s" % \ >>> - (self.hostname, holdoff_end)) >>> + logger.debug("Updates for %s are held off until >>> %s" % >>> + (self.hostname, holdoff_end)) >>> return False >>>=20 >>> def send_request(self, *args, **kwargs): >>> @@ -362,8 +362,8 @@ class DDNSProtocolDynDNS2(object): >>>=20 >>> def prepare_request_data(self, proto): >>> data =3D { >>> - "hostname" : self.hostname, >>> - "myip" : self.get_address(proto), >>> + "hostname": self.hostname, >>> + "myip": self.get_address(proto), >>> } >>=20 >> Why are those spaces removed here? >>=20 >> They make the patch very long and they actually do not change >> anything. >>=20 >>> return data >>> @@ -375,8 +375,7 @@ class DDNSProtocolDynDNS2(object): >>>=20 >>> def send_request(self, data): >>> # Send update to the server. >>> - response =3D DDNSProvider.send_request(self, self.url, >>> data=3Ddata, >>> - username=3Dself.username, password=3Dself.password) >>> + response =3D DDNSProvider.send_request(self, self.url, >>> data=3Ddata, username=3Dself.username, password=3Dself.password) >>=20 >> Again, a line that got "unwrapped". >>=20 >>> # Get the full response message. >>> output =3D response.read() >>> @@ -413,7 +412,7 @@ class DDNSResponseParserXML(object): >>> will be sent by various providers. This class uses the >>> python >>> shipped XML minidom module to walk through the XML tree >>> and return >>> a requested element. >>> - """ >>> + """ >>=20 >> This is allowed, because Python 3 will complain about the spaces. >>=20 >>> def get_xml_tag_value(self, document, content): >>> # Send input to the parser. >>> @@ -437,9 +436,9 @@ class DDNSResponseParserXML(object): >>>=20 >>>=20 >>> class DDNSProviderAllInkl(DDNSProvider): >>> - handle =3D "all-inkl.com" >>> - name =3D "All-inkl.com" >>> - website =3D "http://all-inkl.com/" >>> + handle =3D "all-inkl.com" >>> + name =3D "All-inkl.com" >>> + website =3D "http://all-inkl.com/" >>> protocols =3D ("ipv4",) >>=20 >> Spaces removed. Why? See above. And below... >>=20 >>> # There are only information provided by the vendor how to >>> @@ -467,8 +466,8 @@ class DDNSProviderAllInkl(DDNSProvider): >>>=20 >>>=20 >>> class DDNSProviderBindNsupdate(DDNSProvider): >>> - handle =3D "nsupdate" >>> - name =3D "BIND nsupdate utility" >>> + handle =3D "nsupdate" >>> + name =3D "BIND nsupdate utility" >>> website =3D "http://en.wikipedia.org/wiki/Nsupdate" >>>=20 >>> DEFAULT_TTL =3D 60 >>> @@ -494,9 +493,7 @@ class DDNSProviderBindNsupdate(DDNSProvider): >>> # -t sets the timeout >>> command =3D ["nsupdate", "-v", "-t", "60"] >>>=20 >>> - p =3D subprocess.Popen(command, shell=3DTrue, >>> - stdin=3Dsubprocess.PIPE, stdout=3Dsubprocess.PIPE, >>> stderr=3Dsubprocess.PIPE, >>> - ) >>> + p =3D subprocess.Popen(command, shell=3DTrue, >>> stdin=3Dsubprocess.PIPE, stdout=3Dsubprocess.PIPE, >>> stderr=3Dsubprocess.PIPE) >>> stdout, stderr =3D p.communicate(scriptlet) >>=20 >> More unwrapped lines. >>=20 >>> if p.returncode =3D=3D 0: >>> @@ -533,7 +530,7 @@ class DDNSProviderBindNsupdate(DDNSProvider): >>>=20 >>> scriptlet.append("update delete %s. %s" % >>> (self.hostname, rrtype)) >>> scriptlet.append("update add %s. %s %s %s" % \ >>> - (self.hostname, ttl, rrtype, address)) >>> + (self.hostname, ttl, rrtype, >>> address)) >>>=20 >>> # Send the actions to the server. >>> scriptlet.append("send") >>> @@ -551,9 +548,9 @@ class DDNSProviderBindNsupdate(DDNSProvider): >>>=20 >>>=20 >>> class DDNSProviderChangeIP(DDNSProvider): >>> - handle =3D "changeip.com" >>> - name =3D "ChangeIP.com" >>> - website =3D "https://changeip.com" >>> + handle =3D "changeip.com" >>> + name =3D "ChangeIP.com" >>> + website =3D "https://changeip.com" >>> protocols =3D ("ipv4",) >>>=20 >>> # Detailed information about the update api can be found here. >>> @@ -564,17 +561,16 @@ class DDNSProviderChangeIP(DDNSProvider): >>>=20 >>> def update_protocol(self, proto): >>> data =3D { >>> - "hostname" : self.hostname, >>> - "myip" : self.get_address(proto), >>> + "hostname": self.hostname, >>> + "myip": self.get_address(proto), >>> } >>>=20 >>> # Send update to the server. >>> try: >>> - response =3D self.send_request(self.url, >>> username=3Dself.username, password=3Dself.password, >>> - data=3Ddata) >>> + response =3D self.send_request(self.url, >>> username=3Dself.username, password=3Dself.password, data=3Ddata) >>>=20 >>> # Handle error codes. >>> - except urllib2.HTTPError, e: >>> + except urllib.error.HTTPError as e: >>> if e.code =3D=3D 422: >>> raise DDNSRequestError(_("Domain not >>> found.")) >>>=20 >>> @@ -585,13 +581,13 @@ class DDNSProviderChangeIP(DDNSProvider): >>> return >>>=20 >>> # If we got here, some other update error happened. >>> - raise DDNSUpdateError(_("Server response: %s") % >>> output) >>> + raise DDNSUpdateError(_("Server response: %s") % >>> response) >>>=20 >>>=20 >>> class DDNSProviderDesecIO(DDNSProtocolDynDNS2, DDNSProvider): >>> - handle =3D "desec.io" >>> - name =3D "desec.io" >>> - website =3D "https://www.desec.io" >>> + handle =3D "desec.io" >>> + name =3D "desec.io" >>> + website =3D "https://www.desec.io" >>> protocols =3D ("ipv6", "ipv4",) >>>=20 >>> # ipv4 / ipv6 records are automatically removed when the update >>> @@ -616,9 +612,9 @@ class DDNSProviderDesecIO(DDNSProtocolDynDNS2, >>> DDNSProvider): >>>=20 >>>=20 >>> class DDNSProviderDDNSS(DDNSProvider): >>> - handle =3D "ddnss.de" >>> - name =3D "DDNSS" >>> - website =3D "http://www.ddnss.de" >>> + handle =3D "ddnss.de" >>> + name =3D "DDNSS" >>> + website =3D "http://www.ddnss.de" >>> protocols =3D ("ipv4",) >>>=20 >>> # Detailed information about how to send the update request and >>> possible response >>> @@ -631,8 +627,8 @@ class DDNSProviderDDNSS(DDNSProvider): >>>=20 >>> def update_protocol(self, proto): >>> data =3D { >>> - "ip" : self.get_address(proto), >>> - "host" : self.hostname, >>> + "ip": self.get_address(proto), >>> + "host": self.hostname, >>> } >>>=20 >>> # Check if a token has been set. >>> @@ -642,8 +638,8 @@ class DDNSProviderDDNSS(DDNSProvider): >>> # Check if username and hostname are given. >>> elif self.username and self.password: >>> data.update({ >>> - "user" : self.username, >>> - "pwd" : self.password, >>> + "user": self.username, >>> + "pwd": self.password, >>> }) >>>=20 >>> # Raise an error if no auth details are given. >>> @@ -682,9 +678,9 @@ class DDNSProviderDDNSS(DDNSProvider): >>>=20 >>>=20 >>> class DDNSProviderDHS(DDNSProvider): >>> - handle =3D "dhs.org" >>> - name =3D "DHS International" >>> - website =3D "http://dhs.org/" >>> + handle =3D "dhs.org" >>> + name =3D "DHS International" >>> + website =3D "http://dhs.org/" >>> protocols =3D ("ipv4",) >>>=20 >>> # No information about the used update api provided on webpage, >>> @@ -695,16 +691,15 @@ class DDNSProviderDHS(DDNSProvider): >>>=20 >>> def update_protocol(self, proto): >>> data =3D { >>> - "domain" : self.hostname, >>> - "ip" : self.get_address(proto), >>> - "hostcmd" : "edit", >>> - "hostcmdstage" : "2", >>> - "type" : "4", >>> + "domain": self.hostname, >>> + "ip": self.get_address(proto), >>> + "hostcmd": "edit", >>> + "hostcmdstage": "2", >>> + "type": "4", >>> } >>>=20 >>> # Send update to the server. >>> - response =3D self.send_request(self.url, >>> username=3Dself.username, password=3Dself.password, >>> - data=3Ddata) >>> + response =3D self.send_request(self.url, >>> username=3Dself.username, password=3Dself.password, data=3Ddata) >>>=20 >>> # Handle success messages. >>> if response.code =3D=3D 200: >>> @@ -715,9 +710,9 @@ class DDNSProviderDHS(DDNSProvider): >>>=20 >>>=20 >>> class DDNSProviderDNSpark(DDNSProvider): >>> - handle =3D "dnspark.com" >>> - name =3D "DNS Park" >>> - website =3D "http://dnspark.com/" >>> + handle =3D "dnspark.com" >>> + name =3D "DNS Park" >>> + website =3D "http://dnspark.com/" >>> protocols =3D ("ipv4",) >>>=20 >>> # Informations to the used api can be found here: >>> @@ -728,13 +723,12 @@ class DDNSProviderDNSpark(DDNSProvider): >>>=20 >>> def update_protocol(self, proto): >>> data =3D { >>> - "domain" : self.hostname, >>> - "ip" : self.get_address(proto), >>> + "domain": self.hostname, >>> + "ip": self.get_address(proto), >>> } >>>=20 >>> # Send update to the server. >>> - response =3D self.send_request(self.url, >>> username=3Dself.username, password=3Dself.password, >>> - data=3Ddata) >>> + response =3D self.send_request(self.url, >>> username=3Dself.username, password=3Dself.password, data=3Ddata) >>>=20 >>> # Get the full response message. >>> output =3D response.read() >>> @@ -764,9 +758,9 @@ class DDNSProviderDNSpark(DDNSProvider): >>>=20 >>>=20 >>> class DDNSProviderDtDNS(DDNSProvider): >>> - handle =3D "dtdns.com" >>> - name =3D "DtDNS" >>> - website =3D "http://dtdns.com/" >>> + handle =3D "dtdns.com" >>> + name =3D "DtDNS" >>> + website =3D "http://dtdns.com/" >>> protocols =3D ("ipv4",) >>>=20 >>> # Information about the format of the HTTPS request is to be >>> found >>> @@ -777,9 +771,9 @@ class DDNSProviderDtDNS(DDNSProvider): >>>=20 >>> def update_protocol(self, proto): >>> data =3D { >>> - "ip" : self.get_address(proto), >>> - "id" : self.hostname, >>> - "pw" : self.password >>> + "ip": self.get_address(proto), >>> + "id": self.hostname, >>> + "pw": self.password >>> } >>>=20 >>> # Send update to the server. >>> @@ -819,9 +813,9 @@ class DDNSProviderDtDNS(DDNSProvider): >>>=20 >>>=20 >>> class DDNSProviderDuckDNS(DDNSProtocolDynDNS2, DDNSProvider): >>> - handle =3D "duckdns.org" >>> - name =3D "Duck DNS" >>> - website =3D "http://www.duckdns.org/" >>> + handle =3D "duckdns.org" >>> + name =3D "Duck DNS" >>> + website =3D "http://www.duckdns.org/" >>> protocols =3D ("ipv4",) >>>=20 >>> # Information about the format of the request is to be found >>> @@ -831,9 +825,9 @@ class DDNSProviderDuckDNS(DDNSProtocolDynDNS2, >>> DDNSProvider): >>>=20 >>>=20 >>> class DDNSProviderDyFi(DDNSProtocolDynDNS2, DDNSProvider): >>> - handle =3D "dy.fi" >>> - name =3D "dy.fi" >>> - website =3D "https://www.dy.fi/" >>> + handle =3D "dy.fi" >>> + name =3D "dy.fi" >>> + website =3D "https://www.dy.fi/" >>> protocols =3D ("ipv4",) >>>=20 >>> # Information about the format of the request is to be found >>> @@ -849,9 +843,9 @@ class DDNSProviderDyFi(DDNSProtocolDynDNS2, >>> DDNSProvider): >>>=20 >>>=20 >>> class DDNSProviderDynDNS(DDNSProtocolDynDNS2, DDNSProvider): >>> - handle =3D "dyndns.org" >>> - name =3D "Dyn" >>> - website =3D "http://dyn.com/dns/" >>> + handle =3D "dyndns.org" >>> + name =3D "Dyn" >>> + website =3D "http://dyn.com/dns/" >>> protocols =3D ("ipv4",) >>>=20 >>> # Information about the format of the request is to be found >>> @@ -862,9 +856,9 @@ class DDNSProviderDynDNS(DDNSProtocolDynDNS2, >>> DDNSProvider): >>>=20 >>>=20 >>> class DDNSProviderDomainOffensive(DDNSProtocolDynDNS2, >>> DDNSProvider): >>> - handle =3D "do.de" >>> - name =3D "Domain-Offensive" >>> - website =3D "https://www.do.de/" >>> + handle =3D "do.de" >>> + name =3D "Domain-Offensive" >>> + website =3D "https://www.do.de/" >>> protocols =3D ("ipv6", "ipv4") >>>=20 >>> # Detailed information about the request and response codes >>> @@ -873,10 +867,11 @@ class >>> DDNSProviderDomainOffensive(DDNSProtocolDynDNS2, DDNSProvider): >>>=20 >>> url =3D "https://ddns.do.de/" >>>=20 >>> + >>> class DDNSProviderDynUp(DDNSProvider): >>> - handle =3D "dynup.de" >>> - name =3D "DynUp.DE" >>> - website =3D "http://dynup.de/" >>> + handle =3D "dynup.de" >>> + name =3D "DynUp.DE" >>> + website =3D "http://dynup.de/" >>> protocols =3D ("ipv4",) >>>=20 >>> # Information about the format of the HTTPS request is to be >>> found >>> @@ -887,10 +882,10 @@ class DDNSProviderDynUp(DDNSProvider): >>>=20 >>> def update_protocol(self, proto): >>> data =3D { >>> - "username" : self.username, >>> - "password" : self.password, >>> - "hostname" : self.hostname, >>> - "print" : '1', >>> + "username": self.username, >>> + "password": self.password, >>> + "hostname": self.hostname, >>> + "print": '1', >>> } >>>=20 >>> # Send update to the server. >>> @@ -903,18 +898,17 @@ class DDNSProviderDynUp(DDNSProvider): >>> output =3D output.strip() >>>=20 >>> # Handle success messages. >>> - if output.startswith("I:OK") : >>> + if output.startswith("I:OK"): >>> return >>>=20 >>> # If we got here, some other update error happened. >>> raise DDNSUpdateError >>>=20 >>>=20 >>> - >>> class DDNSProviderDynU(DDNSProtocolDynDNS2, DDNSProvider): >>> - handle =3D "dynu.com" >>> - name =3D "Dynu" >>> - website =3D "http://dynu.com/" >>> + handle =3D "dynu.com" >>> + name =3D "Dynu" >>> + website =3D "http://dynu.com/" >>> protocols =3D ("ipv6", "ipv4",) >>>=20 >>> # Detailed information about the request and response codes >>> @@ -939,9 +933,9 @@ class DDNSProviderDynU(DDNSProtocolDynDNS2, >>> DDNSProvider): >>>=20 >>>=20 >>> class DDNSProviderEasyDNS(DDNSProvider): >>> - handle =3D "easydns.com" >>> - name =3D "EasyDNS" >>> - website =3D "http://www.easydns.com/" >>> + handle =3D "easydns.com" >>> + name =3D "EasyDNS" >>> + website =3D "http://www.easydns.com/" >>> protocols =3D ("ipv4",) >>>=20 >>> # Detailed information about the request and response codes >>> @@ -952,13 +946,12 @@ class DDNSProviderEasyDNS(DDNSProvider): >>>=20 >>> def update_protocol(self, proto): >>> data =3D { >>> - "myip" : self.get_address(proto, "-"), >>> - "hostname" : self.hostname, >>> + "myip": self.get_address(proto, "-"), >>> + "hostname": self.hostname, >>> } >>>=20 >>> # Send update to the server. >>> - response =3D self.send_request(self.url, data=3Ddata, >>> - username=3Dself.username, password=3Dself.password) >>> + response =3D self.send_request(self.url, data=3Ddata, >>> username=3Dself.username, password=3Dself.password) >>>=20 >>> # Get the full response message. >>> output =3D response.read() >>> @@ -988,9 +981,9 @@ class DDNSProviderEasyDNS(DDNSProvider): >>>=20 >>>=20 >>> class DDNSProviderDomopoli(DDNSProtocolDynDNS2, DDNSProvider): >>> - handle =3D "domopoli.de" >>> - name =3D "domopoli.de" >>> - website =3D "http://domopoli.de/" >>> + handle =3D "domopoli.de" >>> + name =3D "domopoli.de" >>> + website =3D "http://domopoli.de/" >>> protocols =3D ("ipv4",) >>>=20 >>> # https://www.domopoli.de/?page=3Dhowto#DynDns_start >>> @@ -999,9 +992,9 @@ class DDNSProviderDomopoli(DDNSProtocolDynDNS2, >>> DDNSProvider): >>>=20 >>>=20 >>> class DDNSProviderDynsNet(DDNSProvider): >>> - handle =3D "dyns.net" >>> - name =3D "DyNS" >>> - website =3D "http://www.dyns.net/" >>> + handle =3D "dyns.net" >>> + name =3D "DyNS" >>> + website =3D "http://www.dyns.net/" >>> protocols =3D ("ipv4",) >>> can_remove_records =3D False >>>=20 >>> @@ -1013,10 +1006,10 @@ class DDNSProviderDynsNet(DDNSProvider): >>>=20 >>> def update_protocol(self, proto): >>> data =3D { >>> - "ip" : self.get_address(proto), >>> - "host" : self.hostname, >>> - "username" : self.username, >>> - "password" : self.password, >>> + "ip": self.get_address(proto), >>> + "host": self.hostname, >>> + "username": self.username, >>> + "password": self.password, >>> } >>>=20 >>> # Send update to the server. >>> @@ -1044,9 +1037,9 @@ class DDNSProviderDynsNet(DDNSProvider): >>>=20 >>>=20 >>> class DDNSProviderEnomCom(DDNSResponseParserXML, DDNSProvider): >>> - handle =3D "enom.com" >>> - name =3D "eNom Inc." >>> - website =3D "http://www.enom.com/" >>> + handle =3D "enom.com" >>> + name =3D "eNom Inc." >>> + website =3D "http://www.enom.com/" >>> protocols =3D ("ipv4",) >>>=20 >>> # There are very detailed information about how to send an >>> update request and >>> @@ -1058,11 +1051,11 @@ class >>> DDNSProviderEnomCom(DDNSResponseParserXML, DDNSProvider): >>>=20 >>> def update_protocol(self, proto): >>> data =3D { >>> - "command" : "setdnshost", >>> - "responsetype" : "xml", >>> - "address" : self.get_address(proto), >>> - "domainpassword" : self.password, >>> - "zone" : self.hostname >>> + "command": "setdnshost", >>> + "responsetype": "xml", >>> + "address": self.get_address(proto), >>> + "domainpassword": self.password, >>> + "zone": self.hostname >>> } >>>=20 >>> # Send update to the server. >>> @@ -1088,9 +1081,9 @@ class >>> DDNSProviderEnomCom(DDNSResponseParserXML, DDNSProvider): >>>=20 >>>=20 >>> class DDNSProviderEntryDNS(DDNSProvider): >>> - handle =3D "entrydns.net" >>> - name =3D "EntryDNS" >>> - website =3D "http://entrydns.net/" >>> + handle =3D "entrydns.net" >>> + name =3D "EntryDNS" >>> + website =3D "http://entrydns.net/" >>> protocols =3D ("ipv4",) >>>=20 >>> # Some very tiny details about their so called "Simple API" can >>> be found >>> @@ -1100,7 +1093,7 @@ class DDNSProviderEntryDNS(DDNSProvider): >>>=20 >>> def update_protocol(self, proto): >>> data =3D { >>> - "ip" : self.get_address(proto), >>> + "ip": self.get_address(proto), >>> } >>>=20 >>> # Add auth token to the update url. >>> @@ -1111,7 +1104,7 @@ class DDNSProviderEntryDNS(DDNSProvider): >>> response =3D self.send_request(url, data=3Ddata) >>>=20 >>> # Handle error codes >>> - except urllib2.HTTPError, e: >>> + except urllib.error.HTTPError as e: >>> if e.code =3D=3D 404: >>> raise DDNSAuthenticationError >>>=20 >>> @@ -1129,9 +1122,9 @@ class DDNSProviderEntryDNS(DDNSProvider): >>>=20 >>>=20 >>> class DDNSProviderFreeDNSAfraidOrg(DDNSProvider): >>> - handle =3D "freedns.afraid.org" >>> - name =3D "freedns.afraid.org" >>> - website =3D "http://freedns.afraid.org/" >>> + handle =3D "freedns.afraid.org" >>> + name =3D "freedns.afraid.org" >>> + website =3D "http://freedns.afraid.org/" >>>=20 >>> # No information about the request or response could be found >>> on the vendor >>> # page. All used values have been collected by testing. >>> @@ -1140,7 +1133,7 @@ class >>> DDNSProviderFreeDNSAfraidOrg(DDNSProvider): >>>=20 >>> def update_protocol(self, proto): >>> data =3D { >>> - "address" : self.get_address(proto), >>> + "address": self.get_address(proto), >>> } >>>=20 >>> # Add auth token to the update url. >>> @@ -1167,59 +1160,59 @@ class >>> DDNSProviderFreeDNSAfraidOrg(DDNSProvider): >>>=20 >>>=20 >>> class DDNSProviderItsdns(DDNSProtocolDynDNS2, DDNSProvider): >>> - handle =3D "inwx.com" >>> - name =3D "INWX" >>> - website =3D "https://www.inwx.com" >>> - protocols =3D ("ipv6", "ipv4") >>> + handle =3D "inwx.com" >>> + name =3D "INWX" >>> + website =3D "https://www.inwx.com" >>> + protocols =3D ("ipv6", "ipv4") >>>=20 >>> - # Information about the format of the HTTP request is >>> to be found >>> - # here: https://www.inwx.com/en/nameserver2/dyndns >>> (requires login) >>> - # Notice: The URL is the same for: inwx.com|de|at|ch|es >>> + # Information about the format of the HTTP request is to be >>> found >>> + # here: https://www.inwx.com/en/nameserver2/dyndns (requires >>> login) >>> + # Notice: The URL is the same for: inwx.com|de|at|ch|es >>>=20 >>> - url =3D "https://dyndns.inwx.com/nic/update" >>> + url =3D "https://dyndns.inwx.com/nic/update" >>>=20 >>>=20 >>> class DDNSProviderItsdns(DDNSProtocolDynDNS2, DDNSProvider): >>> - handle =3D "itsdns.de" >>> - name =3D "it's DNS" >>> - website =3D "http://www.itsdns.de/" >>> - protocols =3D ("ipv6", "ipv4") >>> + handle =3D "itsdns.de" >>> + name =3D "it's DNS" >>> + website =3D "http://www.itsdns.de/" >>> + protocols =3D ("ipv6", "ipv4") >>>=20 >>> - # Information about the format of the HTTP request is >>> to be found >>> - # here: https://www.itsdns.de/dynupdatehelp.htm >>> + # Information about the format of the HTTP request is to be >>> found >>> + # here: https://www.itsdns.de/dynupdatehelp.htm >>>=20 >>> - url =3D "https://www.itsdns.de/update.php" >>> + url =3D "https://www.itsdns.de/update.php" >>>=20 >>>=20 >>> class DDNSProviderJoker(DDNSProtocolDynDNS2, DDNSProvider): >>> - handle =3D "joker.com" >>> - name =3D "Joker.com Dynamic DNS" >>> - website =3D "https://joker.com/" >>> - protocols =3D ("ipv4",) >>> + handle =3D "joker.com" >>> + name =3D "Joker.com Dynamic DNS" >>> + website =3D "https://joker.com/" >>> + protocols =3D ("ipv4",) >>>=20 >>> - # Information about the request can be found here: >>> - #=20 >>> https://joker.com/faq/content/11/427/en/what-is-dynamic-dns-dyndns.html >>> - # Using DynDNS V2 protocol over HTTPS here >>> + # Information about the request can be found here: >>> + #=20 >>> https://joker.com/faq/content/11/427/en/what-is-dynamic-dns-dyndns.html >>> + # Using DynDNS V2 protocol over HTTPS here >>>=20 >>> - url =3D "https://svc.joker.com/nic/update" >>> + url =3D "https://svc.joker.com/nic/update" >>>=20 >>>=20 >>> class DDNSProviderGoogle(DDNSProtocolDynDNS2, DDNSProvider): >>> - handle =3D "domains.google.com" >>> - name =3D "Google Domains" >>> - website =3D "https://domains.google.com/" >>> - protocols =3D ("ipv4",) >>> + handle =3D "domains.google.com" >>> + name =3D "Google Domains" >>> + website =3D "https://domains.google.com/" >>> + protocols =3D ("ipv4",) >>>=20 >>> - # Information about the format of the HTTP request is to >>> be found >>> - # here:=20 >>> https://support.google.com/domains/answer/6147083?hl=3Den >>> + # Information about the format of the HTTP request is to be >>> found >>> + # here: https://support.google.com/domains/answer/6147083?hl=3Den >>>=20 >>> - url =3D "https://domains.google.com/nic/update" >>> + url =3D "https://domains.google.com/nic/update" >>>=20 >>>=20 >>> class DDNSProviderLightningWireLabs(DDNSProvider): >>> - handle =3D "dns.lightningwirelabs.com" >>> - name =3D "Lightning Wire Labs DNS Service" >>> - website =3D "http://dns.lightningwirelabs.com/" >>> + handle =3D "dns.lightningwirelabs.com" >>> + name =3D "Lightning Wire Labs DNS Service" >>> + website =3D "http://dns.lightningwirelabs.com/" >>>=20 >>> # Information about the format of the HTTPS request is to be >>> found >>> # https://dns.lightningwirelabs.com/knowledge-base/api/ddns >>> @@ -1227,10 +1220,10 @@ class >>> DDNSProviderLightningWireLabs(DDNSProvider): >>> url =3D "https://dns.lightningwirelabs.com/update" >>>=20 >>> def update(self): >>> - data =3D { >>> - "hostname" : self.hostname, >>> - "address6" : self.get_address("ipv6", "-"), >>> - "address4" : self.get_address("ipv4", "-"), >>> + data =3D { >>> + "hostname": self.hostname, >>> + "address6": self.get_address("ipv6", "-"), >>> + "address4": self.get_address("ipv4", "-"), >>> } >>>=20 >>> # Check if a token has been set. >>> @@ -1240,8 +1233,8 @@ class >>> DDNSProviderLightningWireLabs(DDNSProvider): >>> # Check for username and password. >>> elif self.username and self.password: >>> data.update({ >>> - "username" : self.username, >>> - "password" : self.password, >>> + "username": self.username, >>> + "password": self.password, >>> }) >>>=20 >>> # Raise an error if no auth details are given. >>> @@ -1260,9 +1253,9 @@ class >>> DDNSProviderLightningWireLabs(DDNSProvider): >>>=20 >>>=20 >>> class DDNSProviderLoopia(DDNSProtocolDynDNS2, DDNSProvider): >>> - handle =3D "loopia.se" >>> - name =3D "Loopia AB" >>> - website =3D "https://www.loopia.com" >>> + handle =3D "loopia.se" >>> + name =3D "Loopia AB" >>> + website =3D "https://www.loopia.com" >>> protocols =3D ("ipv4",) >>>=20 >>> # Information about the format of the HTTP request is to be >>> found >>> @@ -1272,9 +1265,9 @@ class DDNSProviderLoopia(DDNSProtocolDynDNS2, >>> DDNSProvider): >>>=20 >>>=20 >>> class DDNSProviderMyOnlinePortal(DDNSProtocolDynDNS2, >>> DDNSProvider): >>> - handle =3D "myonlineportal.net" >>> - name =3D "myonlineportal.net" >>> - website =3D "https:/myonlineportal.net/" >>> + handle =3D "myonlineportal.net" >>> + name =3D "myonlineportal.net" >>> + website =3D "https:/myonlineportal.net/" >>>=20 >>> # Information about the request and response can be obtained >>> here: >>> # https://myonlineportal.net/howto_dyndns >>> @@ -1283,17 +1276,17 @@ class >>> DDNSProviderMyOnlinePortal(DDNSProtocolDynDNS2, DDNSProvider): >>>=20 >>> def prepare_request_data(self, proto): >>> data =3D { >>> - "hostname" : self.hostname, >>> - "ip" : self.get_address(proto), >>> + "hostname": self.hostname, >>> + "ip": self.get_address(proto), >>> } >>>=20 >>> return data >>>=20 >>>=20 >>> class DDNSProviderNamecheap(DDNSResponseParserXML, DDNSProvider): >>> - handle =3D "namecheap.com" >>> - name =3D "Namecheap" >>> - website =3D "http://namecheap.com" >>> + handle =3D "namecheap.com" >>> + name =3D "Namecheap" >>> + website =3D "http://namecheap.com" >>> protocols =3D ("ipv4",) >>>=20 >>> # Information about the format of the HTTP request is to be >>> found >>> @@ -1311,10 +1304,10 @@ class >>> DDNSProviderNamecheap(DDNSResponseParserXML, DDNSProvider): >>> address =3D self.get_address(proto) >>>=20 >>> data =3D { >>> - "ip" : address, >>> - "password" : self.password, >>> - "host" : host, >>> - "domain" : domain >>> + "ip": address, >>> + "password": self.password, >>> + "host": host, >>> + "domain": domain >>> } >>>=20 >>> # Send update to the server. >>> @@ -1344,9 +1337,9 @@ class >>> DDNSProviderNamecheap(DDNSResponseParserXML, DDNSProvider): >>>=20 >>>=20 >>> class DDNSProviderNOIP(DDNSProtocolDynDNS2, DDNSProvider): >>> - handle =3D "no-ip.com" >>> - name =3D "NoIP" >>> - website =3D "http://www.noip.com/" >>> + handle =3D "no-ip.com" >>> + name =3D "NoIP" >>> + website =3D "http://www.noip.com/" >>> protocols =3D ("ipv4",) >>>=20 >>> # Information about the format of the HTTP request is to be >>> found >>> @@ -1359,17 +1352,17 @@ class DDNSProviderNOIP(DDNSProtocolDynDNS2, >>> DDNSProvider): >>> assert proto =3D=3D "ipv4" >>>=20 >>> data =3D { >>> - "hostname" : self.hostname, >>> - "address" : self.get_address(proto), >>> + "hostname": self.hostname, >>> + "address": self.get_address(proto), >>> } >>>=20 >>> return data >>>=20 >>>=20 >>> class DDNSProviderNowDNS(DDNSProtocolDynDNS2, DDNSProvider): >>> - handle =3D "now-dns.com" >>> - name =3D "NOW-DNS" >>> - website =3D "http://now-dns.com/" >>> + handle =3D "now-dns.com" >>> + name =3D "NOW-DNS" >>> + website =3D "http://now-dns.com/" >>> protocols =3D ("ipv6", "ipv4") >>>=20 >>> # Information about the format of the request is to be found >>> @@ -1380,9 +1373,9 @@ class DDNSProviderNowDNS(DDNSProtocolDynDNS2, >>> DDNSProvider): >>>=20 >>>=20 >>> class DDNSProviderNsupdateINFO(DDNSProtocolDynDNS2, DDNSProvider): >>> - handle =3D "nsupdate.info" >>> - name =3D "nsupdate.info" >>> - website =3D "http://nsupdate.info/" >>> + handle =3D "nsupdate.info" >>> + name =3D "nsupdate.info" >>> + website =3D "http://nsupdate.info/" >>> protocols =3D ("ipv6", "ipv4",) >>>=20 >>> # Information about the format of the HTTP request can be found >>> @@ -1411,16 +1404,16 @@ class >>> DDNSProviderNsupdateINFO(DDNSProtocolDynDNS2, DDNSProvider): >>>=20 >>> def prepare_request_data(self, proto): >>> data =3D { >>> - "myip" : self.get_address(proto), >>> + "myip": self.get_address(proto), >>> } >>>=20 >>> return data >>>=20 >>>=20 >>> class DDNSProviderOpenDNS(DDNSProtocolDynDNS2, DDNSProvider): >>> - handle =3D "opendns.com" >>> - name =3D "OpenDNS" >>> - website =3D "http://www.opendns.com" >>> + handle =3D "opendns.com" >>> + name =3D "OpenDNS" >>> + website =3D "http://www.opendns.com" >>>=20 >>> # Detailed information about the update request and possible >>> # response codes can be obtained from here: >>> @@ -1430,17 +1423,17 @@ class >>> DDNSProviderOpenDNS(DDNSProtocolDynDNS2, DDNSProvider): >>>=20 >>> def prepare_request_data(self, proto): >>> data =3D { >>> - "hostname" : self.hostname, >>> - "myip" : self.get_address(proto), >>> + "hostname": self.hostname, >>> + "myip": self.get_address(proto), >>> } >>>=20 >>> return data >>>=20 >>>=20 >>> class DDNSProviderOVH(DDNSProtocolDynDNS2, DDNSProvider): >>> - handle =3D "ovh.com" >>> - name =3D "OVH" >>> - website =3D "http://www.ovh.com/" >>> + handle =3D "ovh.com" >>> + name =3D "OVH" >>> + website =3D "http://www.ovh.com/" >>> protocols =3D ("ipv4",) >>>=20 >>> # OVH only provides very limited information about how to >>> @@ -1454,15 +1447,15 @@ class DDNSProviderOVH(DDNSProtocolDynDNS2, >>> DDNSProvider): >>> def prepare_request_data(self, proto): >>> data =3D DDNSProtocolDynDNS2.prepare_request_data(self, >>> proto) >>> data.update({ >>> - "system" : "dyndns", >>> + "system": "dyndns", >>> }) >>>=20 >>> return data >>>=20 >>>=20 >>> class DDNSProviderRegfish(DDNSProvider): >>> - handle =3D "regfish.com" >>> - name =3D "Regfish GmbH" >>> + handle =3D "regfish.com" >>> + name =3D "Regfish GmbH" >>> website =3D "http://www.regfish.com/" >>>=20 >>> # A full documentation to the providers api can be found here >>> @@ -1474,7 +1467,7 @@ class DDNSProviderRegfish(DDNSProvider): >>>=20 >>> def update(self): >>> data =3D { >>> - "fqdn" : self.hostname, >>> + "fqdn": self.hostname, >>> } >>>=20 >>> # Check if we update an IPv6 address. >>> @@ -1488,7 +1481,7 @@ class DDNSProviderRegfish(DDNSProvider): >>> data["ipv4"] =3D address4 >>>=20 >>> # Raise an error if none address is given. >>> - if not data.has_key("ipv6") and not >>> data.has_key("ipv4"): >>> + if "ipv6" not in data and "ipv4" not in data: >>> raise DDNSConfigurationError >>>=20 >>> # Check if a token has been set. >>> @@ -1506,8 +1499,7 @@ class DDNSProviderRegfish(DDNSProvider): >>> response =3D self.send_request(self.url, >>> data=3Ddata) >>> else: >>> # Send update to the server. >>> - response =3D self.send_request(self.url, >>> username=3Dself.username, password=3Dself.password, >>> - data=3Ddata) >>> + response =3D self.send_request(self.url, >>> username=3Dself.username, password=3Dself.password, data=3Ddata) >>>=20 >>> # Get the full response message. >>> output =3D response.read() >>> @@ -1533,9 +1525,9 @@ class DDNSProviderRegfish(DDNSProvider): >>>=20 >>>=20 >>> class DDNSProviderSchokokeksDNS(DDNSProtocolDynDNS2, DDNSProvider): >>> - handle =3D "schokokeks.org" >>> - name =3D "Schokokeks" >>> - website =3D "http://www.schokokeks.org/" >>> + handle =3D "schokokeks.org" >>> + name =3D "Schokokeks" >>> + website =3D "http://www.schokokeks.org/" >>> protocols =3D ("ipv4",) >>>=20 >>> # Information about the format of the request is to be found >>> @@ -1544,9 +1536,9 @@ class >>> DDNSProviderSchokokeksDNS(DDNSProtocolDynDNS2, DDNSProvider): >>>=20 >>>=20 >>> class DDNSProviderSelfhost(DDNSProtocolDynDNS2, DDNSProvider): >>> - handle =3D "selfhost.de" >>> - name =3D "Selfhost.de" >>> - website =3D "http://www.selfhost.de/" >>> + handle =3D "selfhost.de" >>> + name =3D "Selfhost.de" >>> + website =3D "http://www.selfhost.de/" >>> protocols =3D ("ipv4",) >>>=20 >>> url =3D "https://carol.selfhost.de/nic/update" >>> @@ -1554,16 +1546,16 @@ class >>> DDNSProviderSelfhost(DDNSProtocolDynDNS2, DDNSProvider): >>> def prepare_request_data(self, proto): >>> data =3D DDNSProtocolDynDNS2.prepare_request_data(self, >>> proto) >>> data.update({ >>> - "hostname" : "1", >>> + "hostname": "1", >>> }) >>>=20 >>> return data >>>=20 >>>=20 >>> class DDNSProviderServercow(DDNSProvider): >>> - handle =3D "servercow.de" >>> - name =3D "servercow.de" >>> - website =3D "https://servercow.de/" >>> + handle =3D "servercow.de" >>> + name =3D "servercow.de" >>> + website =3D "https://servercow.de/" >>> protocols =3D ("ipv4", "ipv6") >>>=20 >>> url =3D "https://www.servercow.de/dnsupdate/update.php" >>> @@ -1571,10 +1563,10 @@ class DDNSProviderServercow(DDNSProvider): >>>=20 >>> def update_protocol(self, proto): >>> data =3D { >>> - "ipaddr" : self.get_address(proto), >>> - "hostname" : self.hostname, >>> - "username" : self.username, >>> - "pass" : self.password, >>> + "ipaddr": self.get_address(proto), >>> + "hostname": self.hostname, >>> + "username": self.username, >>> + "pass": self.password, >>> } >>>=20 >>> # Send request to provider >>> @@ -1596,9 +1588,9 @@ class DDNSProviderServercow(DDNSProvider): >>>=20 >>>=20 >>> class DDNSProviderSPDNS(DDNSProtocolDynDNS2, DDNSProvider): >>> - handle =3D "spdns.org" >>> - name =3D "SPDYN" >>> - website =3D "https://www.spdyn.de/" >>> + handle =3D "spdns.org" >>> + name =3D "SPDYN" >>> + website =3D "https://www.spdyn.de/" >>>=20 >>> # Detailed information about request and response codes are >>> provided >>> # by the vendor. They are using almost the same mechanism and >>> status >>> @@ -1619,9 +1611,9 @@ class DDNSProviderSPDNS(DDNSProtocolDynDNS2, >>> DDNSProvider): >>>=20 >>>=20 >>> class DDNSProviderStrato(DDNSProtocolDynDNS2, DDNSProvider): >>> - handle =3D "strato.com" >>> - name =3D "Strato AG" >>> - website =3D "http:/www.strato.com/" >>> + handle =3D "strato.com" >>> + name =3D "Strato AG" >>> + website =3D "http:/www.strato.com/" >>> protocols =3D ("ipv4",) >>>=20 >>> # Information about the request and response can be obtained >>> here: >>> @@ -1632,17 +1624,17 @@ class >>> DDNSProviderStrato(DDNSProtocolDynDNS2, DDNSProvider): >>> def prepare_request_data(self, proto): >>> data =3D DDNSProtocolDynDNS2.prepare_request_data(self, >>> proto) >>> data.update({ >>> - "mx" : "NOCHG", >>> - "backupmx" : "NOCHG" >>> + "mx": "NOCHG", >>> + "backupmx": "NOCHG" >>> }) >>>=20 >>> return data >>>=20 >>>=20 >>> class DDNSProviderTwoDNS(DDNSProtocolDynDNS2, DDNSProvider): >>> - handle =3D "twodns.de" >>> - name =3D "TwoDNS" >>> - website =3D "http://www.twodns.de" >>> + handle =3D "twodns.de" >>> + name =3D "TwoDNS" >>> + website =3D "http://www.twodns.de" >>> protocols =3D ("ipv4",) >>>=20 >>> # Detailed information about the request can be found here >>> @@ -1655,17 +1647,17 @@ class >>> DDNSProviderTwoDNS(DDNSProtocolDynDNS2, DDNSProvider): >>> assert proto =3D=3D "ipv4" >>>=20 >>> data =3D { >>> - "ip" : self.get_address(proto), >>> - "hostname" : self.hostname >>> + "ip": self.get_address(proto), >>> + "hostname": self.hostname >>> } >>>=20 >>> return data >>>=20 >>>=20 >>> class DDNSProviderUdmedia(DDNSProtocolDynDNS2, DDNSProvider): >>> - handle =3D "udmedia.de" >>> - name =3D "Udmedia GmbH" >>> - website =3D "http://www.udmedia.de" >>> + handle =3D "udmedia.de" >>> + name =3D "Udmedia GmbH" >>> + website =3D "http://www.udmedia.de" >>> protocols =3D ("ipv4",) >>>=20 >>> # Information about the request can be found here >>> @@ -1675,9 +1667,9 @@ class >>> DDNSProviderUdmedia(DDNSProtocolDynDNS2, DDNSProvider): >>>=20 >>>=20 >>> class DDNSProviderVariomedia(DDNSProtocolDynDNS2, DDNSProvider): >>> - handle =3D "variomedia.de" >>> - name =3D "Variomedia" >>> - website =3D "http://www.variomedia.de/" >>> + handle =3D "variomedia.de" >>> + name =3D "Variomedia" >>> + website =3D "http://www.variomedia.de/" >>> protocols =3D ("ipv6", "ipv4",) >>>=20 >>> # Detailed information about the request can be found here >>> @@ -1687,29 +1679,29 @@ class >>> DDNSProviderVariomedia(DDNSProtocolDynDNS2, DDNSProvider): >>>=20 >>> def prepare_request_data(self, proto): >>> data =3D { >>> - "hostname" : self.hostname, >>> - "myip" : self.get_address(proto), >>> + "hostname": self.hostname, >>> + "myip": self.get_address(proto), >>> } >>>=20 >>> return data >>>=20 >>>=20 >>> class DDNSProviderXLhost(DDNSProtocolDynDNS2, DDNSProvider): >>> - handle =3D "xlhost.de" >>> - name =3D "XLhost" >>> - website =3D "http://xlhost.de/" >>> - protocols =3D ("ipv4",) >>> + handle =3D "xlhost.de" >>> + name =3D "XLhost" >>> + website =3D "http://xlhost.de/" >>> + protocols =3D ("ipv4",) >>>=20 >>> - # Information about the format of the HTTP request is to >>> be found >>> - # here:=20 >>> https://xlhost.de/faq/index_html?topicId=3DCQA2ELIPO4SQ >>> + # Information about the format of the HTTP request is to be >>> found >>> + # here: https://xlhost.de/faq/index_html?topicId=3DCQA2ELIPO4SQ >>>=20 >>> - url =3D "https://nsupdate.xlhost.de/" >>> + url =3D "https://nsupdate.xlhost.de/" >>>=20 >>>=20 >>> class DDNSProviderZoneedit(DDNSProvider): >>> - handle =3D "zoneedit.com" >>> - name =3D "Zoneedit" >>> - website =3D "http://www.zoneedit.com" >>> + handle =3D "zoneedit.com" >>> + name =3D "Zoneedit" >>> + website =3D "http://www.zoneedit.com" >>> protocols =3D ("ipv4",) >>>=20 >>> # Detailed information about the request and the response codes >>> can be >>> @@ -1721,13 +1713,12 @@ class DDNSProviderZoneedit(DDNSProvider): >>>=20 >>> def update_protocol(self, proto): >>> data =3D { >>> - "dnsto" : self.get_address(proto), >>> - "host" : self.hostname >>> + "dnsto": self.get_address(proto), >>> + "host": self.hostname >>> } >>>=20 >>> # Send update to the server. >>> - response =3D self.send_request(self.url, >>> username=3Dself.username, password=3Dself.password, >>> - data=3Ddata) >>> + response =3D self.send_request(self.url, >>> username=3Dself.username, password=3Dself.password, data=3Ddata) >>>=20 >>> # Get the full response message. >>> output =3D response.read() >>> @@ -1749,9 +1740,9 @@ class DDNSProviderZoneedit(DDNSProvider): >>>=20 >>>=20 >>> class DDNSProviderDNSmadeEasy(DDNSProvider): >>> - handle =3D "dnsmadeeasy.com" >>> - name =3D "DNSmadeEasy.com" >>> - website =3D "http://www.dnsmadeeasy.com/" >>> + handle =3D "dnsmadeeasy.com" >>> + name =3D "DNSmadeEasy.com" >>> + website =3D "http://www.dnsmadeeasy.com/" >>> protocols =3D ("ipv4",) >>>=20 >>> # DNS Made Easy Nameserver Provider also offering Dynamic DNS >>> @@ -1763,10 +1754,10 @@ class >>> DDNSProviderDNSmadeEasy(DDNSProvider): >>>=20 >>> def update_protocol(self, proto): >>> data =3D { >>> - "ip" : self.get_address(proto), >>> - "id" : self.hostname, >>> - "username" : self.username, >>> - "password" : self.password, >>> + "ip": self.get_address(proto), >>> + "id": self.hostname, >>> + "username": self.username, >>> + "password": self.password, >>> } >>>=20 >>> # Send update to the server. >>> @@ -1797,9 +1788,9 @@ class DDNSProviderDNSmadeEasy(DDNSProvider): >>>=20 >>>=20 >>> class DDNSProviderZZZZ(DDNSProvider): >>> - handle =3D "zzzz.io" >>> - name =3D "zzzz" >>> - website =3D "https://zzzz.io" >>> + handle =3D "zzzz.io" >>> + name =3D "zzzz" >>> + website =3D "https://zzzz.io" >>> protocols =3D ("ipv6", "ipv4",) >>>=20 >>> # Detailed information about the update request can be found >>> here: >>> @@ -1813,8 +1804,8 @@ class DDNSProviderZZZZ(DDNSProvider): >>>=20 >>> def update_protocol(self, proto): >>> data =3D { >>> - "ip" : self.get_address(proto), >>> - "token" : self.token, >>> + "ip": self.get_address(proto), >>> + "token": self.token, >>> } >>>=20 >>> if proto =3D=3D "ipv6": >>> diff --git a/src/ddns/system.py b/src/ddns/system.py >>> index b7a51f6..59c0525 100644 >>> --- a/src/ddns/system.py >>> +++ b/src/ddns/system.py >>> @@ -1,8 +1,8 @@ >>> -#!/usr/bin/python >>> +#!/usr/bin/python3 >>> ################################################################### >>> ############ >>> # >>>=20 >>> # >>> # ddns - A dynamic DNS client for IPFire >>> # >>> -# Copyright (C) 2012 IPFire development team >>> # >>> +# Copyright (C) 2012-2019 IPFire development team >>> # >>> # >>>=20 >>> # >>> # This program is free software: you can redistribute it and/or >>> modify # >>> # it under the terms of the GNU General Public License as published >>> by # >>> @@ -23,18 +23,20 @@ import base64 >>> import re >>> import ssl >>> import socket >>> -import urllib >>> -import urllib2 >>> +import urllib.request >>> +import urllib.parse >>> +import urllib.error >>>=20 >>> -from __version__ import CLIENT_VERSION >>> +from .__version__ import CLIENT_VERSION >>> from .errors import * >>> -from i18n import _ >>> +from .i18n import _ >>>=20 >>> # Initialize the logger. >>> import logging >>> logger =3D logging.getLogger("ddns.system") >>> logger.propagate =3D 1 >>>=20 >>> + >>> class DDNSSystem(object): >>> """ >>> The DDNSSystem class adds a layer of abstraction >>> @@ -79,7 +81,7 @@ class DDNSSystem(object): >>> with open("/var/ipfire/red/local- >>> ipaddress") as f: >>> return f.readline() >>>=20 >>> - except IOError, e: >>> + except IOError as e: >>> # File not found >>> if e.errno =3D=3D 2: >>> return >>> @@ -137,7 +139,7 @@ class DDNSSystem(object): >>> if data: >>> logger.debug(" data: %s" % data) >>>=20 >>> - req =3D urllib2.Request(url, data=3Ddata) >>> + req =3D urllib.request.Request(url, data=3Ddata) >>>=20 >>> if username and password: >>> basic_auth_header =3D >>> self._make_basic_auth_header(username, password) >>> @@ -159,24 +161,24 @@ class DDNSSystem(object): >>> assert req.get_method() =3D=3D method >>>=20 >>> logger.debug(_("Request header:")) >>> - for k, v in req.headers.items(): >>> + for k, v in list(req.headers.items()): >>> logger.debug(" %s: %s" % (k, v)) >>>=20 >>> try: >>> - resp =3D urllib2.urlopen(req, timeout=3Dtimeout) >>> + resp =3D urllib.request.urlopen(req, >>> timeout=3Dtimeout) >>>=20 >>> # Log response header. >>> logger.debug(_("Response header (Status Code >>> %s):") % resp.code) >>> - for k, v in resp.info().items(): >>> + for k, v in list(resp.info().items()): >>> logger.debug(" %s: %s" % (k, v)) >>>=20 >>> # Return the entire response object. >>> return resp >>>=20 >>> - except urllib2.HTTPError, e: >>> + except urllib.error.HTTPError as e: >>> # Log response header. >>> logger.debug(_("Response header (Status Code >>> %s):") % e.code) >>> - for k, v in e.hdrs.items(): >>> + for k, v in list(e.hdrs.items()): >>> logger.debug(" %s: %s" % (k, v)) >>>=20 >>> # 400 - Bad request >>> @@ -209,7 +211,7 @@ class DDNSSystem(object): >>> # Raise all other unhandled exceptions. >>> raise >>>=20 >>> - except urllib2.URLError, e: >>> + except urllib.error.URLError as e: >>> if e.reason: >>> # Handle SSL errors >>> if isinstance(e.reason, ssl.SSLError): >>> @@ -240,7 +242,7 @@ class DDNSSystem(object): >>> # Raise all other unhandled exceptions. >>> raise >>>=20 >>> - except socket.timeout, e: >>> + except socket.timeout as e: >>> logger.debug(_("Connection timeout")) >>>=20 >>> raise DDNSConnectionTimeoutError >>> @@ -248,8 +250,8 @@ class DDNSSystem(object): >>> def _format_query_args(self, data): >>> args =3D [] >>>=20 >>> - for k, v in data.items(): >>> - arg =3D "%s=3D%s" % (k, urllib.quote(v)) >>> + for k, v in list(data.items()): >>> + arg =3D "%s=3D%s" % (k, urllib.parse.quote(v)) >>> args.append(arg) >>>=20 >>> return "&".join(args) >>> @@ -258,7 +260,7 @@ class DDNSSystem(object): >>> authstring =3D "%s:%s" % (username, password) >>>=20 >>> # Encode authorization data in base64. >>> - authstring =3D base64.encodestring(authstring) >>> + authstring =3D base64.encodebytes(authstring) >>>=20 >>> # Remove any newline characters. >>> authstring =3D authstring.replace("\n", "") >>> @@ -354,7 +356,7 @@ class DDNSSystem(object): >>> # Resolve the host address. >>> try: >>> response =3D socket.getaddrinfo(hostname, None, >>> family) >>> - except socket.gaierror, e: >>> + except socket.gaierror as e: >>> # Name or service not known >>> if e.errno =3D=3D -2: >>> return [] >>> @@ -418,7 +420,7 @@ class DDNSSystem(object): >>> """ >>> try: >>> f =3D open("/etc/os-release", "r") >>> - except IOError, e: >>> + except IOError as e: >>> # File not found >>> if e.errno =3D=3D 2: >>> return >>> @@ -447,7 +449,7 @@ class DDNSSystem(object): >>> """ >>> try: >>> f =3D open("/etc/system-release", "r") >>> - except IOError, e: >>> + except IOError as e: >>> # File not found >>> if e.errno =3D=3D 2: >>> return >>> --=20 >>> 2.24.1 >>=20 >> This patch is very very long and does not need to be. >>=20 >> There should be no changes in the code styling and all those empty >> lines that are being added make the code messy. >>=20 >> Please remove them, cleanup the patch and submit again. >>=20 >> Best, >> -Michael >>=20 >>>=20 >>>=20 >>> _______________________________________________ >>> ddns mailing list >>> ddns(a)lists.ipfire.org >>> https://lists.ipfire.org/mailman/listinfo/ddns >>=20 >> _______________________________________________ >> ddns mailing list >> ddns(a)lists.ipfire.org >> https://lists.ipfire.org/mailman/listinfo/ddns > _______________________________________________ > ddns mailing list > ddns(a)lists.ipfire.org > https://lists.ipfire.org/mailman/listinfo/ddns --===============3238552680399432557==--