Fix cathing errors.

[oddments/ddns.git] / src / ddns / __init__.py

diff --git a/src/ddns/__init__.py b/src/ddns/__init__.py
index a2e1666910892af24112dfc29498ea2ec6bf43e3..4e4093e2690d731376f2a0ca2603be18f5bd03ac 100644 (file)
--- a/src/ddns/__init__.py
+++ b/src/ddns/__init__.py
@@ -28,7 +28,9 @@ from i18n import _
 logger = logging.getLogger("ddns.core")
 logger.propagate = 1
 
-from .providers import *
+import providers
+
+from .errors import *
 from .system import DDNSSystem
 
 # Setup the logger.
@@ -54,8 +56,6 @@ class DDNSCore(object):
                if debug:
                        rootlogger = logging.getLogger("ddns")
                        rootlogger.setLevel(logging.DEBUG)
-                       for handler in rootlogger.handlers:
-                               handler.setLevel(logging.DEBUG)
 
                        logger.debug(_("Debugging mode enabled"))
 
@@ -63,8 +63,10 @@ class DDNSCore(object):
                self.settings = {}
 
                # Dict with all providers, that are supported.
-               self.providers = {}
-               self.register_all_providers()
+               self.providers = providers.get()
+
+               for handle, provider in sorted(self.providers.items()):
+                       logger.debug("Registered new provider: %s (%s)" % (provider.name, provider.handle))
 
                # List of configuration entries.
                self.entries = []
@@ -72,49 +74,6 @@ class DDNSCore(object):
                # Add the system class.
                self.system = DDNSSystem(self)
 
-       def register_provider(self, provider):
-               """
-                       Registers a new provider.
-               """
-               assert issubclass(provider, DDNSProvider)
-
-               if not all((provider.handle, provider.name, provider.website)):
-                       raise DDNSError(_("Provider is not properly configured"))
-
-               assert not self.providers.has_key(provider.handle), \
-                       "Provider '%s' has already been registered" % provider.handle
-
-               logger.debug("Registered new provider: %s (%s)" % (provider.name, provider.handle))
-               self.providers[provider.handle] = provider
-
-       def register_all_providers(self):
-               """
-                       Simply registers all providers.
-               """
-               for provider in (
-                       DDNSProviderAllInkl,
-                       DDNSProviderDHS,
-                       DDNSProviderDNSpark,
-                       DDNSProviderDtDNS,
-                       DDNSProviderDynDNS,
-                       DDNSProviderDynU,
-                       DDNSProviderEasyDNS,
-                       DDNSProviderFreeDNSAfraidOrg,
-                       DDNSProviderNamecheap,
-                       DDNSProviderNOIP,
-                       DDNSProviderLightningWireLabs,
-                       DDNSProviderOVH,
-                       DDNSProviderRegfish,
-                       DDNSProviderSelfhost,
-                       DDNSProviderSPDNS,
-                       DDNSProviderStrato,
-                       DDNSProviderTwoDNS,
-                       DDNSProviderUdmedia,
-                       DDNSProviderVariomedia,
-                       DDNSProviderZoneedit,
-               ):
-                       self.register_provider(provider)
-
        def get_provider_names(self):
                """
                        Returns a list of names of all registered providers.
@@ -128,8 +87,13 @@ class DDNSCore(object):
                configs.read([filename,])
 
                # First apply all global configuration settings.
-               for k, v in configs.items("config"):
-                       self.settings[k] = v
+               try:
+                       for k, v in configs.items("config"):
+                               self.settings[k] = v
+
+               # Allow missing config section
+               except ConfigParser.NoSectionError:
+                       pass
 
                for entry in configs.sections():
                        # Skip the special config section.