Transforming bin/check-dnsui-users to the new schema

diff --git a/bin/check-dnsui-users b/bin/check-dnsui-users
index f8af48e59871ae438aacb267eb5d9f185ff3d07c..4f019f92a638f4cd39ad50e2499fad179340f9eb 100755 (executable)
--- a/bin/check-dnsui-users
+++ b/bin/check-dnsui-users
@@ -1,27 +1,51 @@
 #!/usr/bin/env python3
 
+from __future__ import print_function
+
 # Standard modules
 import sys
+
+__exp_py_version_major__ = 3
+__min_py_version_minor__ = 4
+
+if sys.version_info[0] != __exp_py_version_major__:
+    print("This script is intended to use with Python {}.".format(
+            __exp_py_version_major__), file=sys.stderr)
+    print("You are using Python: {0}.{1}.{2}-{3}-{4}.".format(
+        *sys.version_info) + "\n", file=sys.stderr)
+    sys.exit(1)
+
+if sys.version_info[1] < __min_py_version_minor__:
+    print("A minimal Python version of {maj}.{min} is necessary to execute this script.".format(
+        maj=__exp_py_version_major__, min=__min_py_version_minor__), file=sys.stderr)
+    print("You are using Python: {0}.{1}.{2}-{3}-{4}.".format(
+        *sys.version_info) + "\n", file=sys.stderr)
+    sys.exit(1)
+
+# Standard modules
 import os
-import logging
 import locale
 
+try:
+    import pathlib
+    from pathlib import Path
+except ImportError:
+    from pathlib2 import Path
+    import pathlib2 as pathlib
+
 # own modules:
-cur_dir = os.getcwd()
-base_dir = cur_dir
-
-if sys.argv[0] != '' and sys.argv[0] != '-c':
-    bin_dir = os.path.dirname(os.path.realpath(sys.argv[0]))
-else:
-    bin_dir = os.path.dirname(os.path.realpath(__file__))
-base_dir = os.path.abspath(os.path.join(bin_dir, '..'))
-module_dir = os.path.join(base_dir, 'pp_lib')
-if os.path.exists(module_dir):
-    sys.path.insert(0, base_dir)
 
-from pp_lib.dnsui_users import DnsuiUsersApp
+my_path = Path(__file__)
+my_real_path = my_path.resolve()
+bin_path = my_real_path.parent
+base_dir = bin_path.parent
+lib_dir = base_dir.joinpath('lib')
+module_dir = lib_dir.joinpath('pp_lib')
 
-log = logging.getLogger(__name__)
+if module_dir.exists():
+    sys.path.insert(0, str(lib_dir))
+
+from pp_lib.dnsui_users import DnsuiUsersApp
 
 __author__ = 'Frank Brehm <frank.brehm@pixelpark.com>'
 __copyright__ = '(C) 2018 by Frank Brehm, Pixelpark GmbH, Berlin'

diff --git a/requirements.txt b/requirements.txt
index bc42c73dbf8296611a29155d96e04b22ef7fb2ff..a90700b8fd770fd30304a900471d1528f1b0b364 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,6 +2,7 @@ Babel
 flake8
 ldap3
 paramiko
+psycopg2
 pytz
 PyYAML
 requests