Update automatic registration to work with Python 3

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>

diff --git a/src/ddns/providers.py b/src/ddns/providers.py
index eb66054dc35b8ddd9d5cf11e4b60264433caea32..d0c01e7867b0a937726aeb75fcd4b09466194046 100644 (file)
--- a/src/ddns/providers.py
+++ b/src/ddns/providers.py
@@ -73,24 +73,6 @@ class DDNSProvider(object):
        # Required to remove AAAA records if IPv6 is absent again.
        can_remove_records = True
 
        # Required to remove AAAA records if IPv6 is absent again.
        can_remove_records = True
 

-       # Automatically register all providers.
-       class __metaclass__(type):
-               def __init__(provider, name, bases, dict):
-                       type.__init__(provider, name, bases, dict)
-
-                       # The main class from which is inherited is not registered
-                       # as a provider.
-                       if name == "DDNSProvider":
-                               return
-
-                       if not all((provider.handle, provider.name, provider.website)):
-                               raise DDNSError(_("Provider is not properly configured"))
-
-                       assert provider.handle not in _providers, \
-                               "Provider '%s' has already been registered" % provider.handle
-
-                       _providers[provider.handle] = provider
-

        @staticmethod
        def supported():
                """
        @staticmethod
        def supported():
                """


@@ -107,6 +89,18 @@ class DDNSProvider(object):
                self.settings = self.DEFAULT_SETTINGS.copy()
                self.settings.update(settings)
 
                self.settings = self.DEFAULT_SETTINGS.copy()
                self.settings.update(settings)
 

+       def __init_subclass__(cls, **kwargs):
+               super().__init_subclass__(**kwargs)
+
+               if not all((cls.handle, cls.name, cls.website)):
+                       raise DDNSError(_("Provider is not properly configured"))
+
+               assert cls.handle not in _providers, \
+                       "Provider '%s' has already been registered" % cls.handle
+
+               # Register class
+               _providers[cls.handle] = cls
+

        def __repr__(self):
                return "<DDNS Provider %s (%s)>" % (self.name, self.handle)
 
        def __repr__(self):
                return "<DDNS Provider %s (%s)>" % (self.name, self.handle)