fb-pdnstools 1.0.2__py3-none-any.whl → 1.1.1__py3-none-any.whl

fb_pdnstools/server.py

@@ -26,7 +26,7 @@ from .errors import PDNSApiNotFoundError, PDNSApiValidationError
 from .xlate import XLATOR
 from .zone import PowerDNSZone, PowerDNSZoneDict
 
-__version__ = '0.8.2'
+__version__ = "1.0.0"
 LOG = logging.getLogger(__name__)
 
 _ = XLATOR.gettext
@@ -39,20 +39,40 @@ class PowerDNSServer(BasePowerDNSHandler):
 
     # -------------------------------------------------------------------------
     def __init__(
-        self, appname=None, verbose=0, version=__version__, base_dir=None,
-            master_server=None, port=DEFAULT_PORT, key=None, use_https=False,
-            path_prefix=DEFAULT_API_PREFIX, simulate=None, force=None,
-            terminal_has_colors=False, initialized=False):
+        self,
+        appname=None,
+        verbose=0,
+        version=__version__,
+        base_dir=None,
+        master_server=None,
+        port=DEFAULT_PORT,
+        key=None,
+        use_https=False,
+        path_prefix=DEFAULT_API_PREFIX,
+        simulate=None,
+        force=None,
+        terminal_has_colors=False,
+        initialized=False,
+    ):
         """Initialize a PowerDNSServer record."""
         self._api_servername = self.default_api_servername
-        self._api_server_version = 'unknown'
+        self._api_server_version = "unknown"
         self.zones = None
 
         super(PowerDNSServer, self).__init__(
-            appname=appname, verbose=verbose, version=version, base_dir=base_dir,
-            master_server=master_server, port=port, key=key, use_https=use_https,
-            path_prefix=path_prefix, simulate=simulate, force=force,
-            terminal_has_colors=terminal_has_colors, initialized=False,
+            appname=appname,
+            verbose=verbose,
+            version=version,
+            base_dir=base_dir,
+            master_server=master_server,
+            port=port,
+            key=key,
+            use_https=use_https,
+            path_prefix=path_prefix,
+            simulate=simulate,
+            force=force,
+            terminal_has_colors=terminal_has_colors,
+            initialized=False,
         )
 
         self.initialized = initialized
@@ -70,8 +90,9 @@ class PowerDNSServer(BasePowerDNSHandler):
         self._simulate = to_bool(value)
 
         if self.initialized:
-            LOG.debug(_('Setting simulate of all subsequent objects to {!r} ...').format(
-                self.simulate))
+            LOG.debug(
+                _("Setting simulate of all subsequent objects to {!r} ...").format(self.simulate)
+            )
 
         if self.zones:
             for zone_name in self.zones:
@@ -89,60 +110,70 @@ class PowerDNSServer(BasePowerDNSHandler):
         @rtype:  dict
         """
         res = super(PowerDNSServer, self).as_dict(short=short)
-        res['api_server_version'] = self.api_server_version
+        res["api_server_version"] = self.api_server_version
 
         return res
 
     # -------------------------------------------------------------------------
     def get_api_server_version(self):
         """Retreive from PowerDNS API their server version."""
-        path = '/servers/{}'.format(self.api_servername)
+        path = "/servers/{}".format(self.api_servername)
         try:
             json_response = self.perform_request(path)
         except (PDNSApiNotFoundError, PDNSApiValidationError):
-            LOG.error(_('Could not found server info.'))
+            LOG.error(_("Could not found server info."))
             return None
         if self.verbose > 2:
-            LOG.debug(_('Got a response:') + '\n' + pp(json_response))
+            LOG.debug(_("Got a response:") + "\n" + pp(json_response))
 
-        if 'version' in json_response:
-            self._api_server_version = to_str(json_response['version'])
-            LOG.info(_('PowerDNS server version {!r}.').format(self.api_server_version))
+        if "version" in json_response:
+            self._api_server_version = to_str(json_response["version"])
+            LOG.info(_("PowerDNS server version {!r}.").format(self.api_server_version))
             return self.api_server_version
-        LOG.error(_('Did not found version info in server info:') + '\n' + pp(json_response))
+        LOG.error(_("Did not found version info in server info:") + "\n" + pp(json_response))
         return None
 
     # -------------------------------------------------------------------------
     def get_api_zones(self):
         """Pull from PowerDNS API a list of all zones and return them as a PowerDNSZoneDict."""
-        LOG.debug(_('Trying to get all zones from PDNS API ...'))
+        LOG.debug(_("Trying to get all zones from PDNS API ..."))
 
-        path = '/servers/{}/zones'.format(self.api_servername)
+        path = "/servers/{}/zones".format(self.api_servername)
         json_response = self.perform_request(path)
         if self.verbose > 3:
-            LOG.debug(_('Got a response:') + '\n' + pp(json_response))
+            LOG.debug(_("Got a response:") + "\n" + pp(json_response))
 
         self.zones = PowerDNSZoneDict()
 
         for data in json_response:
             zone = PowerDNSZone.init_from_dict(
-                data, appname=self.appname, verbose=self.verbose, base_dir=self.base_dir,
-                master_server=self.master_server, port=self.port, key=self.key,
-                use_https=self.use_https, timeout=self.timeout, path_prefix=self.path_prefix,
-                simulate=self.simulate, force=self.force, initialized=True)
+                data,
+                appname=self.appname,
+                verbose=self.verbose,
+                base_dir=self.base_dir,
+                master_server=self.master_server,
+                port=self.port,
+                key=self.key,
+                use_https=self.use_https,
+                timeout=self.timeout,
+                path_prefix=self.path_prefix,
+                simulate=self.simulate,
+                force=self.force,
+                initialized=True,
+            )
             self.zones.append(zone)
             if self.verbose > 3:
-                print('{!r}'.format(zone))
+                print("{!r}".format(zone))
 
         if self.verbose > 1:
-            msg = ngettext('Found a zone.', 'Found {n} zones.', len(self.zones))
+            msg = ngettext("Found a zone.", "Found {n} zones.", len(self.zones))
             LOG.debug(msg.format(n=len(self.zones)))
 
         if self.verbose > 2:
             if self.verbose > 3:
-                LOG.debug(_('Zones:') + '\n' + pp(self.zones.as_list()))
+                LOG.debug(_("Zones:") + "\n" + pp(self.zones.as_list()))
             else:
-                LOG.debug(_('Zones:') + '\n' + pp(list(self.zones.keys())))
+                LOG.debug(_("Zones:") + "\n" + pp(list(self.zones.keys())))
 
         return self.zones
 
@@ -157,20 +188,23 @@ class PowerDNSServer(BasePowerDNSHandler):
             return None
 
         if self.verbose > 2:
-            LOG.debug(_('Searching an appropriate zone for item {i!r} - FQDN {f!r} ...').format(
-                i=item, f=fqdn))
+            LOG.debug(
+                _("Searching an appropriate zone for item {i!r} - FQDN {f!r} ...").format(
+                    i=item, f=fqdn
+                )
+            )
 
         for zone_name in reversed(self.zones.keys()):
-            pattern = r'\.' + re.escape(zone_name) + '$'
+            pattern = r"\." + re.escape(zone_name) + "$"
             if self.verbose > 3:
-                LOG.debug(_('Search pattern: {}').format(pattern))
+                LOG.debug(_("Search pattern: {}").format(pattern))
             if re.search(pattern, fqdn):
                 return zone_name
             zone = self.zones[zone_name]
             if zone_name != zone.name_unicode:
-                pattern = r'\.' + re.escape(zone.name_unicode) + '$'
+                pattern = r"\." + re.escape(zone.name_unicode) + "$"
                 if self.verbose > 3:
-                    LOG.debug(_('Search pattern Unicode: {}').format(pattern))
+                    LOG.debug(_("Search pattern Unicode: {}").format(pattern))
                 if re.search(pattern, fqdn):
                     return zone_name
 
@@ -187,22 +221,25 @@ class PowerDNSServer(BasePowerDNSHandler):
             return []
 
         if self.verbose > 2:
-            LOG.debug(_('Searching all appropriate zones for item {i!r} - FQDN {f!r} ...').format(
-                i=item, f=fqdn))
+            LOG.debug(
+                _("Searching all appropriate zones for item {i!r} - FQDN {f!r} ...").format(
+                    i=item, f=fqdn
+                )
+            )
         zones = []
 
         for zone_name in self.zones.keys():
-            pattern = r'\.' + re.escape(zone_name) + '$'
+            pattern = r"\." + re.escape(zone_name) + "$"
             if self.verbose > 3:
-                LOG.debug(_('Search pattern: {}').format(pattern))
+                LOG.debug(_("Search pattern: {}").format(pattern))
             if re.search(pattern, fqdn):
                 zones.append(zone_name)
                 continue
             zone = self.zones[zone_name]
             if zone_name != zone.name_unicode:
-                pattern = r'\.' + re.escape(zone.name_unicode) + '$'
+                pattern = r"\." + re.escape(zone.name_unicode) + "$"
                 if self.verbose > 3:
-                    LOG.debug(_('Search pattern Unicode: {}').format(pattern))
+                    LOG.debug(_("Search pattern Unicode: {}").format(pattern))
                 if re.search(pattern, fqdn):
                     zones.append(zone_name)
 
@@ -210,7 +247,7 @@ class PowerDNSServer(BasePowerDNSHandler):
 
 
 # =============================================================================
-if __name__ == '__main__':
+if __name__ == "__main__":
 
     pass
 

fb_pdnstools/xlate.py

@@ -3,8 +3,7 @@
 """
 @summary: The module for i18n.
 
-          It provides translation object, usable from all other
-          modules in this package.
+          It provides translation object, usable from all other modules in this package.
 @author: Frank Brehm
 @contact: frank@brehm-online.com
 @copyright: © 2024 by Frank Brehm, Berlin
@@ -16,68 +15,78 @@ import copy
 import gettext
 import logging
 import sys
-try:
-    from pathlib import Path
-except ImportError:
-    from pathlib2 import Path
-try:
-    from packaging.version import Version
-except ImportError:
-    from distutils.version import LooseVersion as Version
+from pathlib import Path
 
 # Third party modules
 import babel
 import babel.lists
 from babel.support import Translations
 
-DOMAIN = 'fb_pdnstools'
+try:
+    from semver import Version
+except ImportError:
+    from semver import VersionInfo as Version
+
+DOMAIN = "fb_pdnstools"
 
 LOG = logging.getLogger(__name__)
 
-__version__ = '0.1.2'
+__version__ = "1.0.0"
 
 __me__ = Path(__file__).resolve()
 __module_dir__ = __me__.parent
 __lib_dir__ = __module_dir__.parent
 __base_dir__ = __lib_dir__.parent
-LOCALE_DIR = __base_dir__.joinpath('locale')
+
+LOCALE_DIR = __base_dir__ / "locale"
+
 if LOCALE_DIR.is_dir():
+    # Not installed, in development workdir
     LOCALE_DIR = str(LOCALE_DIR)
 else:
-    LOCALE_DIR = __module_dir__.joinpath('locale')
-    if LOCALE_DIR.is_dir():
-        LOCALE_DIR = str(LOCALE_DIR)
+    # Somehow installed
+    LOCALE_DIR = __module_dir__.joinpath("locale")
+    if sys.prefix == sys.base_prefix:
+        # installed as a package
+        LOCALE_DIR = sys.prefix + "/share/locale"
     else:
-        LOCALE_DIR = sys.prefix + '/share/locale'
-
-DEFAULT_LOCALE_DEF = 'en_US'
+        # Obviously in a virtual environment
+        __base_dir__ = Path(sys.prefix)
+        LOCALE_DIR = __base_dir__ / "share" / "locale"
+        if LOCALE_DIR.is_dir():
+            LOCALE_DIR = str(LOCALE_DIR.resolve())
+        else:
+            LOCALE_DIR = __module_dir__ / "locale"
+            if LOCALE_DIR.is_dir():
+                LOCALE_DIR = str(LOCALE_DIR)
+            else:
+                LOCALE_DIR = str(__base_dir__ / sys.prefix / "share" / "locale")
+
+DEFAULT_LOCALE_DEF = "en_US"
 DEFAULT_LOCALE = babel.core.default_locale()
 if not DEFAULT_LOCALE:
     DEFAULT_LOCALE = DEFAULT_LOCALE_DEF
 
-__mo_file__ = gettext.find(DOMAIN, str(LOCALE_DIR))
+__mo_file__ = gettext.find(DOMAIN, LOCALE_DIR)
 if __mo_file__:
     try:
-        with open(__mo_file__, 'rb') as F:
+        with open(__mo_file__, "rb") as F:
             XLATOR = Translations(F, DOMAIN)
     except IOError:
         XLATOR = gettext.NullTranslations()
 else:
     XLATOR = gettext.NullTranslations()
 
-CUR_BABEL_VERSION = Version(babel.__version__)
-NEWER_BABEL_VERSION = Version('2.6.0')
+CUR_BABEL_VERSION = Version.parse(babel.__version__)
+NEWER_BABEL_VERSION = Version.parse("2.6.0")
 
-SUPPORTED_LANGS = (
-    'de',
-    'en'
-)
+SUPPORTED_LANGS = ("de", "en")
 
 _ = XLATOR.gettext
 
 
 # =============================================================================
-def format_list(lst, do_repr=False, style='standard', locale=DEFAULT_LOCALE):
+def format_list(lst, do_repr=False, style="standard", locale=DEFAULT_LOCALE):
     """
     Format the items in `lst` as a list.
 
@@ -85,13 +94,13 @@ def format_list(lst, do_repr=False, style='standard', locale=DEFAULT_LOCALE):
     :param locale: the locale
     """
     if not lst:
-        return ''
+        return ""
 
     my_list = copy.copy(lst)
     if do_repr:
         my_list = []
         for item in lst:
-            my_list.append('{!r}'.format(item))
+            my_list.append("{!r}".format(item))
 
     if CUR_BABEL_VERSION < NEWER_BABEL_VERSION:
         return babel.lists.format_list(my_list, locale=locale)
@@ -100,13 +109,25 @@ def format_list(lst, do_repr=False, style='standard', locale=DEFAULT_LOCALE):
 
 # =============================================================================
 
-if __name__ == '__main__':
+if __name__ == "__main__":
+
+    out_list = []
+    out_list.append([_("Module directory:"), str(__module_dir__)])
+    out_list.append([_("Lib directory:"), str(__lib_dir__)])
+    out_list.append([_("Base directory:"), str(__base_dir__)])
+    out_list.append([_("Locale directory:"), LOCALE_DIR])
+    out_list.append([_("Locale domain:"), DOMAIN])
+    out_list.append([_("Found .mo-file:"), __mo_file__])
+
+    max_len = 1
+    for pair in out_list:
+        if len(pair[0]) > max_len:
+            max_len = len(pair[0])
+
+    template = "{{label:<{}}} {{val!r}}".format(max_len)
+    for pair in out_list:
+        print(template.format(label=pair[0], val=pair[1]))
 
-    print(_('Module directory: {!r}').format(__module_dir__))
-    print(_('Base directory: {!r}').format(__base_dir__))
-    print(_('Locale directory: {!r}').format(LOCALE_DIR))
-    print(_('Locale domain: {!r}').format(DOMAIN))
-    print(_('Found .mo-file: {!r}').format(__mo_file__))
 
 # =============================================================================