python-bareos: changes from code-review

Co-authored-by: Bruno Friedmann @bareos <89836284+bruno-at-bareos@users.noreply.github.com>
bareos · Jan 29, 2024 · 2872733 · 2872733
1 parent dfbd8b3
commit 2872733
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 11 deletions.
diff --git a/contrib/misc/bareos_pam_integration/pam_exec_add_bareos_user.py b/contrib/misc/bareos_pam_integration/pam_exec_add_bareos_user.py
@@ -7,8 +7,7 @@
 Requires Bareos >= 19.2.4.
 """
 
-from __future__ import print_function
-import bareos.util.argparse as argparse
+from bareos.util import argparse
 import bareos.bsock
 import bareos.exceptions
 import logging

diff --git a/contrib/misc/triggerjob/bareos-triggerjob.py b/contrib/misc/triggerjob/bareos-triggerjob.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 
-from __future__ import print_function
-import bareos.util.argparse as argparse
+from bareos.util import argparse
 import bareos.bsock
 import logging
 import sys

diff --git a/python-bareos/bin/bareos-fd-connect.py b/python-bareos/bin/bareos-fd-connect.py
@@ -19,7 +19,7 @@
 #   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #   02110-1301, USA.
 
-import bareos.util.argparse as argparse
+from bareos.util import argparse
 import bareos.bsock
 from bareos.bsock.filedaemon import FileDaemon
 import logging

diff --git a/python-bareos/bin/bareos-jsonrpc-server.py b/python-bareos/bin/bareos-jsonrpc-server.py
@@ -20,8 +20,7 @@
 #   02110-1301, USA.
 
 
-from __future__ import print_function
-import bareos.util.argparse as argparse
+from bareos.util import argparse
 import bareos.bsock
 import bareos.exceptions
 import inspect

diff --git a/python-bareos/bin/bconsole-json.py b/python-bareos/bin/bconsole-json.py
@@ -20,8 +20,7 @@
 #   02110-1301, USA.
 
 
-from __future__ import print_function
-import bareos.util.argparse as argparse
+from bareos.util import argparse
 import bareos.bsock
 import bareos.exceptions
 import logging

diff --git a/python-bareos/bin/bconsole.py b/python-bareos/bin/bconsole.py
@@ -19,8 +19,7 @@
 #   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #   02110-1301, USA.
 
-from __future__ import print_function
-import bareos.util.argparse as argparse
+from bareos.util import argparse
 import bareos.bsock
 import bareos.exceptions
 import logging