diff options
Diffstat (limited to 'python/samba')
48 files changed, 2 insertions, 57 deletions
diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py index d10d765434c..b2d029db9f2 100644 --- a/python/samba/dbchecker.py +++ b/python/samba/dbchecker.py @@ -17,7 +17,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from __future__ import print_function import ldb import samba import time diff --git a/python/samba/emulate/traffic.py b/python/samba/emulate/traffic.py index 9b6bdb6af57..87efca61eca 100644 --- a/python/samba/emulate/traffic.py +++ b/python/samba/emulate/traffic.py @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from __future__ import print_function, division +from __future__ import division import time import os diff --git a/python/samba/graph.py b/python/samba/graph.py index c8d5f9230d0..0cfe951d7f7 100644 --- a/python/samba/graph.py +++ b/python/samba/graph.py @@ -18,7 +18,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from __future__ import print_function from __future__ import division from samba import colour import sys diff --git a/python/samba/join.py b/python/samba/join.py index 97745a3901a..e7563ef9cb8 100644 --- a/python/samba/join.py +++ b/python/samba/join.py @@ -16,7 +16,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from __future__ import print_function """Joining a domain.""" from samba.auth import system_session diff --git a/python/samba/kcc/graph_utils.py b/python/samba/kcc/graph_utils.py index 65f5ee67207..c89d06ad3b7 100644 --- a/python/samba/kcc/graph_utils.py +++ b/python/samba/kcc/graph_utils.py @@ -18,7 +18,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from __future__ import print_function import os import itertools diff --git a/python/samba/kcc/kcc_utils.py b/python/samba/kcc/kcc_utils.py index 9b4a894b743..bc2838e3933 100644 --- a/python/samba/kcc/kcc_utils.py +++ b/python/samba/kcc/kcc_utils.py @@ -19,7 +19,6 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from __future__ import print_function import sys import ldb import uuid diff --git a/python/samba/ms_display_specifiers.py b/python/samba/ms_display_specifiers.py index 7488b197a4a..be9891d7437 100644 --- a/python/samba/ms_display_specifiers.py +++ b/python/samba/ms_display_specifiers.py @@ -17,7 +17,6 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from __future__ import print_function import re diff --git a/python/samba/ms_forest_updates_markdown.py b/python/samba/ms_forest_updates_markdown.py index e219211d027..6d30576d37e 100644 --- a/python/samba/ms_forest_updates_markdown.py +++ b/python/samba/ms_forest_updates_markdown.py @@ -20,7 +20,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from __future__ import print_function """Generate LDIF from Github documentation.""" import re diff --git a/python/samba/ms_schema.py b/python/samba/ms_schema.py index 4b5c4a5df83..b9ca3c61b72 100644 --- a/python/samba/ms_schema.py +++ b/python/samba/ms_schema.py @@ -15,7 +15,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from __future__ import print_function """Generate LDIF from WSPP documentation.""" import re diff --git a/python/samba/ms_schema_markdown.py b/python/samba/ms_schema_markdown.py index ff1afb1a588..86c4b694405 100644 --- a/python/samba/ms_schema_markdown.py +++ b/python/samba/ms_schema_markdown.py @@ -18,7 +18,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from __future__ import print_function """Generate LDIF from Github documentation.""" import re diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py index 3c1e8956982..841372de254 100644 --- a/python/samba/netcmd/domain.py +++ b/python/samba/netcmd/domain.py @@ -22,7 +22,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from __future__ import print_function from __future__ import division import samba.getopt as options import ldb diff --git a/python/samba/netcmd/drs.py b/python/samba/netcmd/drs.py index 5b439f8e6e1..52620090a64 100644 --- a/python/samba/netcmd/drs.py +++ b/python/samba/netcmd/drs.py @@ -18,7 +18,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from __future__ import print_function import samba.getopt as options import ldb diff --git a/python/samba/netcmd/gpo.py b/python/samba/netcmd/gpo.py index bd2db9b1ab2..03a04b76074 100644 --- a/python/samba/netcmd/gpo.py +++ b/python/samba/netcmd/gpo.py @@ -18,7 +18,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from __future__ import print_function import os import samba.getopt as options import ldb diff --git a/python/samba/netcmd/sites.py b/python/samba/netcmd/sites.py index b5a2508ee3a..c85acc75813 100644 --- a/python/samba/netcmd/sites.py +++ b/python/samba/netcmd/sites.py @@ -16,7 +16,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from __future__ import print_function from samba import sites, subnets from samba.samdb import SamDB import samba.getopt as options diff --git a/python/samba/netcmd/visualize.py b/python/samba/netcmd/visualize.py index 45e62afbdc6..d81bafe52ba 100644 --- a/python/samba/netcmd/visualize.py +++ b/python/samba/netcmd/visualize.py @@ -17,8 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from __future__ import print_function - import os import sys from collections import defaultdict diff --git a/python/samba/ntacls.py b/python/samba/ntacls.py index 1bcb755c952..89e64b7dc5a 100644 --- a/python/samba/ntacls.py +++ b/python/samba/ntacls.py @@ -15,8 +15,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. # - -from __future__ import print_function """NT Acls.""" diff --git a/python/samba/tests/__init__.py b/python/samba/tests/__init__.py index a5a8acdcc41..7efd7807a22 100644 --- a/python/samba/tests/__init__.py +++ b/python/samba/tests/__init__.py @@ -17,7 +17,6 @@ # """Samba Python tests.""" -from __future__ import print_function import os import tempfile import warnings diff --git a/python/samba/tests/audit_log_base.py b/python/samba/tests/audit_log_base.py index f328b615df6..c791a1a8ca8 100644 --- a/python/samba/tests/audit_log_base.py +++ b/python/samba/tests/audit_log_base.py @@ -14,8 +14,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. # - -from __future__ import print_function """Tests for DSDB audit logging. """ diff --git a/python/samba/tests/audit_log_dsdb.py b/python/samba/tests/audit_log_dsdb.py index 5de25502087..33884bf5407 100644 --- a/python/samba/tests/audit_log_dsdb.py +++ b/python/samba/tests/audit_log_dsdb.py @@ -15,7 +15,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from __future__ import print_function """Tests for the SamDb logging of password changes. """ diff --git a/python/samba/tests/audit_log_pass_change.py b/python/samba/tests/audit_log_pass_change.py index 04bb850fa4f..7c3e622de99 100644 --- a/python/samba/tests/audit_log_pass_change.py +++ b/python/samba/tests/audit_log_pass_change.py @@ -15,7 +15,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from __future__ import print_function """Tests for the SamDb logging of password changes. """ diff --git a/python/samba/tests/auth_log.py b/python/samba/tests/auth_log.py index 3c56bc48e7f..d57d765a83a 100644 --- a/python/samba/tests/auth_log.py +++ b/python/samba/tests/auth_log.py @@ -15,7 +15,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from __future__ import print_function """Tests for the Auth and AuthZ logging. """ import samba.tests diff --git a/python/samba/tests/auth_log_base.py b/python/samba/tests/auth_log_base.py index 09a8df0a4dc..58bc817440d 100644 --- a/python/samba/tests/auth_log_base.py +++ b/python/samba/tests/auth_log_base.py @@ -15,7 +15,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from __future__ import print_function """Tests for the Auth and AuthZ logging. """ diff --git a/python/samba/tests/auth_log_pass_change.py b/python/samba/tests/auth_log_pass_change.py index ee646722b20..f19512deaf8 100644 --- a/python/samba/tests/auth_log_pass_change.py +++ b/python/samba/tests/auth_log_pass_change.py @@ -15,7 +15,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from __future__ import print_function """Tests for the Auth and AuthZ logging of password changes. """ diff --git a/python/samba/tests/blackbox/downgradedatabase.py b/python/samba/tests/blackbox/downgradedatabase.py index 3d230609efc..bb45e32bae2 100644 --- a/python/samba/tests/blackbox/downgradedatabase.py +++ b/python/samba/tests/blackbox/downgradedatabase.py @@ -15,7 +15,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from __future__ import print_function from samba.tests import BlackboxTestCase import os import ldb diff --git a/python/samba/tests/blackbox/ndrdump.py b/python/samba/tests/blackbox/ndrdump.py index a33229e4740..91ac076fd3a 100644 --- a/python/samba/tests/blackbox/ndrdump.py +++ b/python/samba/tests/blackbox/ndrdump.py @@ -18,7 +18,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from __future__ import print_function """Blackbox tests for ndrdump.""" import os diff --git a/python/samba/tests/blackbox/smbcacls.py b/python/samba/tests/blackbox/smbcacls.py index 3eca9602005..172cc56e73d 100644 --- a/python/samba/tests/blackbox/smbcacls.py +++ b/python/samba/tests/blackbox/smbcacls.py @@ -15,7 +15,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from __future__ import print_function from samba.tests import BlackboxTestCase, BlackboxProcessError from samba.samba3 import param as s3param diff --git a/python/samba/tests/blackbox/smbcacls_basic.py b/python/samba/tests/blackbox/smbcacls_basic.py index 3562157e701..355ce86f42a 100644 --- a/python/samba/tests/blackbox/smbcacls_basic.py +++ b/python/samba/tests/blackbox/smbcacls_basic.py @@ -15,7 +15,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from __future__ import print_function from samba.tests.blackbox.smbcacls import SmbCaclsBlockboxTestBase from samba.tests import BlackboxProcessError diff --git a/python/samba/tests/blackbox/smbcacls_dfs_propagate_inherit.py b/python/samba/tests/blackbox/smbcacls_dfs_propagate_inherit.py index 1df60149176..36c29c8ccca 100644 --- a/python/samba/tests/blackbox/smbcacls_dfs_propagate_inherit.py +++ b/python/samba/tests/blackbox/smbcacls_dfs_propagate_inherit.py @@ -15,7 +15,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from __future__ import print_function from samba.tests import BlackboxProcessError import os from samba.tests.blackbox.smbcacls_propagate_inhertance import InheritanceSmbCaclsTests diff --git a/python/samba/tests/blackbox/smbcacls_propagate_inhertance.py b/python/samba/tests/blackbox/smbcacls_propagate_inhertance.py index d4577805f4f..ed8455a6bf8 100644 --- a/python/samba/tests/blackbox/smbcacls_propagate_inhertance.py +++ b/python/samba/tests/blackbox/smbcacls_propagate_inhertance.py @@ -15,7 +15,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from __future__ import print_function from samba.tests.blackbox.smbcacls import SmbCaclsBlockboxTestBase from samba.tests import BlackboxProcessError import os diff --git a/python/samba/tests/blackbox/smbcontrol.py b/python/samba/tests/blackbox/smbcontrol.py index e923efb71a5..cfd9d4d77e2 100644 --- a/python/samba/tests/blackbox/smbcontrol.py +++ b/python/samba/tests/blackbox/smbcontrol.py @@ -15,7 +15,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from __future__ import print_function from samba.tests import BlackboxTestCase, BlackboxProcessError from samba.messaging import Messaging diff --git a/python/samba/tests/blackbox/smbcontrol_process.py b/python/samba/tests/blackbox/smbcontrol_process.py index b4ccc4c455c..bff2e06adba 100644 --- a/python/samba/tests/blackbox/smbcontrol_process.py +++ b/python/samba/tests/blackbox/smbcontrol_process.py @@ -19,7 +19,6 @@ # in the preforkrestartdc test environment to prevent them impacting other # tests. # -from __future__ import print_function import time from samba.tests import BlackboxTestCase, BlackboxProcessError from samba.messaging import Messaging diff --git a/python/samba/tests/complex_expressions.py b/python/samba/tests/complex_expressions.py index 5657bf6b276..25be67c74d4 100644 --- a/python/samba/tests/complex_expressions.py +++ b/python/samba/tests/complex_expressions.py @@ -16,7 +16,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from __future__ import print_function import optparse import samba import samba.getopt as options diff --git a/python/samba/tests/dcerpc/dnsserver.py b/python/samba/tests/dcerpc/dnsserver.py index 5f7aa378575..340bb454324 100644 --- a/python/samba/tests/dcerpc/dnsserver.py +++ b/python/samba/tests/dcerpc/dnsserver.py @@ -15,7 +15,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from __future__ import print_function """Tests for samba.dcerpc.dnsserver""" import os diff --git a/python/samba/tests/dcerpc/testrpc.py b/python/samba/tests/dcerpc/testrpc.py index d4fc39e51f8..fcc3b0477dc 100644 --- a/python/samba/tests/dcerpc/testrpc.py +++ b/python/samba/tests/dcerpc/testrpc.py @@ -14,7 +14,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from __future__ import print_function import sys sys.path.insert(0, "bin/python") diff --git a/python/samba/tests/dns.py b/python/samba/tests/dns.py index bb25b09d9f6..1a05634725a 100644 --- a/python/samba/tests/dns.py +++ b/python/samba/tests/dns.py @@ -15,8 +15,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from __future__ import print_function - from samba import dsdb from samba.ndr import ndr_unpack, ndr_pack from samba.samdb import SamDB diff --git a/python/samba/tests/dns_base.py b/python/samba/tests/dns_base.py index 5c0d6201b06..e522120b932 100644 --- a/python/samba/tests/dns_base.py +++ b/python/samba/tests/dns_base.py @@ -16,7 +16,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from __future__ import print_function from samba.tests import TestCaseInTempDir from samba.dcerpc import dns, dnsp from samba import gensec, tests diff --git a/python/samba/tests/dns_forwarder.py b/python/samba/tests/dns_forwarder.py index 403b9623a73..52511033abd 100644 --- a/python/samba/tests/dns_forwarder.py +++ b/python/samba/tests/dns_forwarder.py @@ -15,7 +15,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from __future__ import print_function import os import sys import random diff --git a/python/samba/tests/dns_forwarder_helpers/server.py b/python/samba/tests/dns_forwarder_helpers/server.py index 803372f73c1..5637b42a37e 100644 --- a/python/samba/tests/dns_forwarder_helpers/server.py +++ b/python/samba/tests/dns_forwarder_helpers/server.py @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # # Based on the EchoServer example from python docs -from __future__ import print_function + import socketserver as SocketServer import sys from threading import Timer diff --git a/python/samba/tests/graph.py b/python/samba/tests/graph.py index efbe75955a4..be1bf58e3c0 100644 --- a/python/samba/tests/graph.py +++ b/python/samba/tests/graph.py @@ -20,8 +20,6 @@ """Tests for samba.graph""" -from __future__ import print_function - import samba import samba.tests from samba import graph diff --git a/python/samba/tests/group_audit.py b/python/samba/tests/group_audit.py index 8af61340584..a032a8ecd70 100644 --- a/python/samba/tests/group_audit.py +++ b/python/samba/tests/group_audit.py @@ -14,8 +14,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. # - -from __future__ import print_function """Tests for the SamDb logging of password changes. """ diff --git a/python/samba/tests/ldap_referrals.py b/python/samba/tests/ldap_referrals.py index 86a39d4e602..b3f980e0301 100644 --- a/python/samba/tests/ldap_referrals.py +++ b/python/samba/tests/ldap_referrals.py @@ -18,7 +18,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from __future__ import print_function import optparse import os import sys diff --git a/python/samba/tests/prefork_restart.py b/python/samba/tests/prefork_restart.py index 2acbcc9befc..7d762196b58 100644 --- a/python/samba/tests/prefork_restart.py +++ b/python/samba/tests/prefork_restart.py @@ -15,8 +15,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. # - -from __future__ import print_function """Tests process restarting in the pre-fork process model. NOTE: As this test kills samba processes it won't play nicely with other tests, so needs to be run in it's own environment. diff --git a/python/samba/tests/process_limits.py b/python/samba/tests/process_limits.py index b62906e294f..b1997acad67 100644 --- a/python/samba/tests/process_limits.py +++ b/python/samba/tests/process_limits.py @@ -15,8 +15,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. # - -from __future__ import print_function """Tests limits on processes forked by fork on accept in the standard process model. NOTE: This test runs in an environment with an artificially low setting for diff --git a/python/samba/tests/samba3sam.py b/python/samba/tests/samba3sam.py index 17bb4a7b7bc..01d274da7be 100644 --- a/python/samba/tests/samba3sam.py +++ b/python/samba/tests/samba3sam.py @@ -17,8 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. # - -from __future__ import print_function """Tests for the samba3sam LDB module, which maps Samba3 LDAP to AD LDAP.""" import os diff --git a/python/samba/tests/samba_tool/visualize.py b/python/samba/tests/samba_tool/visualize.py index bc1c91c9b56..03a29ffc1d0 100644 --- a/python/samba/tests/samba_tool/visualize.py +++ b/python/samba/tests/samba_tool/visualize.py @@ -24,7 +24,6 @@ We don't test samba-tool visualize reps here because repsTo and repsFrom are not replicated, and there are actual remote servers to query. """ -from __future__ import print_function import samba import os import tempfile diff --git a/python/samba/tests/samba_tool/visualize_drs.py b/python/samba/tests/samba_tool/visualize_drs.py index 3eda02783f6..9a2ca25039b 100644 --- a/python/samba/tests/samba_tool/visualize_drs.py +++ b/python/samba/tests/samba_tool/visualize_drs.py @@ -24,7 +24,6 @@ others we try to grasp control of replication and make more specific assertions. """ -from __future__ import print_function import os import re import json diff --git a/python/samba/upgradehelpers.py b/python/samba/upgradehelpers.py index 69f6e3675e8..d012cea5bd2 100644 --- a/python/samba/upgradehelpers.py +++ b/python/samba/upgradehelpers.py @@ -19,7 +19,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from __future__ import print_function from __future__ import division """Helpers used for upgrading between different database formats.""" diff --git a/python/samba/uptodateness.py b/python/samba/uptodateness.py index 7914c47b845..db1ba53885b 100644 --- a/python/samba/uptodateness.py +++ b/python/samba/uptodateness.py @@ -16,7 +16,6 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from __future__ import print_function import sys import time |