diff options
Diffstat (limited to 'source4')
51 files changed, 0 insertions, 52 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py b/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py index ab13b14b3a8..d28be8f70d3 100755 --- a/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py +++ b/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py @@ -17,7 +17,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from __future__ import print_function """Tests the possibleInferiors generation in the schema_fsmo ldb module""" import optparse diff --git a/source4/dsdb/tests/python/acl.py b/source4/dsdb/tests/python/acl.py index a859196ee94..2cb6303dce3 100755 --- a/source4/dsdb/tests/python/acl.py +++ b/source4/dsdb/tests/python/acl.py @@ -2,7 +2,6 @@ # -*- coding: utf-8 -*- # This is unit with tests for LDAP access checks -from __future__ import print_function import optparse import sys import base64 diff --git a/source4/dsdb/tests/python/ad_dc_medley_performance.py b/source4/dsdb/tests/python/ad_dc_medley_performance.py index e0f0e19651a..ebd63136639 100644 --- a/source4/dsdb/tests/python/ad_dc_medley_performance.py +++ b/source4/dsdb/tests/python/ad_dc_medley_performance.py @@ -1,6 +1,5 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -from __future__ import print_function import optparse import sys diff --git a/source4/dsdb/tests/python/ad_dc_performance.py b/source4/dsdb/tests/python/ad_dc_performance.py index 595ea681409..6ff84e4389e 100644 --- a/source4/dsdb/tests/python/ad_dc_performance.py +++ b/source4/dsdb/tests/python/ad_dc_performance.py @@ -1,6 +1,5 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -from __future__ import print_function import optparse import sys diff --git a/source4/dsdb/tests/python/ad_dc_search_performance.py b/source4/dsdb/tests/python/ad_dc_search_performance.py index 2e36218fc48..27f6cb3545c 100644 --- a/source4/dsdb/tests/python/ad_dc_search_performance.py +++ b/source4/dsdb/tests/python/ad_dc_search_performance.py @@ -1,6 +1,5 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -from __future__ import print_function import optparse import sys diff --git a/source4/dsdb/tests/python/attr_from_server.py b/source4/dsdb/tests/python/attr_from_server.py index 1a0112d4ed5..aca356bd733 100644 --- a/source4/dsdb/tests/python/attr_from_server.py +++ b/source4/dsdb/tests/python/attr_from_server.py @@ -22,7 +22,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 sys sys.path.insert(0, "bin/python") diff --git a/source4/dsdb/tests/python/deletetest.py b/source4/dsdb/tests/python/deletetest.py index 612396002d6..7375f26e895 100755 --- a/source4/dsdb/tests/python/deletetest.py +++ b/source4/dsdb/tests/python/deletetest.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -from __future__ import print_function import optparse import sys import os diff --git a/source4/dsdb/tests/python/dirsync.py b/source4/dsdb/tests/python/dirsync.py index 0ed0c7c9787..1ac719e4332 100755 --- a/source4/dsdb/tests/python/dirsync.py +++ b/source4/dsdb/tests/python/dirsync.py @@ -18,7 +18,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -from __future__ import print_function import optparse import sys sys.path.insert(0, "bin/python") diff --git a/source4/dsdb/tests/python/large_ldap.py b/source4/dsdb/tests/python/large_ldap.py index cce9d41862f..0bf73f988d8 100644 --- a/source4/dsdb/tests/python/large_ldap.py +++ b/source4/dsdb/tests/python/large_ldap.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 optparse import sys import os diff --git a/source4/dsdb/tests/python/ldap.py b/source4/dsdb/tests/python/ldap.py index 9c836c04267..0c90a0bbd79 100755 --- a/source4/dsdb/tests/python/ldap.py +++ b/source4/dsdb/tests/python/ldap.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 optparse import sys import time diff --git a/source4/dsdb/tests/python/ldap_modify_order.py b/source4/dsdb/tests/python/ldap_modify_order.py index 8b3f6c7be57..54f89597eab 100644 --- a/source4/dsdb/tests/python/ldap_modify_order.py +++ b/source4/dsdb/tests/python/ldap_modify_order.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 optparse import sys import os diff --git a/source4/dsdb/tests/python/ldap_schema.py b/source4/dsdb/tests/python/ldap_schema.py index 75115e1e251..b08aa7f6859 100755 --- a/source4/dsdb/tests/python/ldap_schema.py +++ b/source4/dsdb/tests/python/ldap_schema.py @@ -19,7 +19,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -from __future__ import print_function import optparse import sys import time diff --git a/source4/dsdb/tests/python/linked_attributes.py b/source4/dsdb/tests/python/linked_attributes.py index 533fa943736..e66a1fdd0d7 100644 --- a/source4/dsdb/tests/python/linked_attributes.py +++ b/source4/dsdb/tests/python/linked_attributes.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- # Originally based on ./sam.py -from __future__ import print_function import optparse import sys import os diff --git a/source4/dsdb/tests/python/login_basics.py b/source4/dsdb/tests/python/login_basics.py index d265441826d..09f8ea36ec8 100755 --- a/source4/dsdb/tests/python/login_basics.py +++ b/source4/dsdb/tests/python/login_basics.py @@ -7,7 +7,6 @@ # # Copyright Andrew Bartlett 2018 # -from __future__ import print_function import optparse import sys from samba.tests.subunitrun import TestProgram, SubunitOptions diff --git a/source4/dsdb/tests/python/notification.py b/source4/dsdb/tests/python/notification.py index 9d463eee258..b9e10324de5 100755 --- a/source4/dsdb/tests/python/notification.py +++ b/source4/dsdb/tests/python/notification.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 optparse import sys import os diff --git a/source4/dsdb/tests/python/password_lockout.py b/source4/dsdb/tests/python/password_lockout.py index 445944862b8..959c6489857 100755 --- a/source4/dsdb/tests/python/password_lockout.py +++ b/source4/dsdb/tests/python/password_lockout.py @@ -7,7 +7,6 @@ # Copyright Stefan Metzmacher 2014 # -from __future__ import print_function import optparse import sys import base64 diff --git a/source4/dsdb/tests/python/password_lockout_base.py b/source4/dsdb/tests/python/password_lockout_base.py index 0f9617da1e6..ad2a2ad1602 100644 --- a/source4/dsdb/tests/python/password_lockout_base.py +++ b/source4/dsdb/tests/python/password_lockout_base.py @@ -1,4 +1,3 @@ -from __future__ import print_function import samba from samba.auth import system_session diff --git a/source4/dsdb/tests/python/passwords.py b/source4/dsdb/tests/python/passwords.py index 5025962e6ea..27107f3d130 100755 --- a/source4/dsdb/tests/python/passwords.py +++ b/source4/dsdb/tests/python/passwords.py @@ -8,7 +8,6 @@ # secured enough (SASL with a minimum of 128 Bit encryption) - consider # MS-ADTS 3.1.1.3.1.5 -from __future__ import print_function import optparse import sys import base64 diff --git a/source4/dsdb/tests/python/rodc.py b/source4/dsdb/tests/python/rodc.py index ec2c55d7957..1a4b0f9b7ee 100755 --- a/source4/dsdb/tests/python/rodc.py +++ b/source4/dsdb/tests/python/rodc.py @@ -1,7 +1,6 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -from __future__ import print_function import optparse import sys import os diff --git a/source4/dsdb/tests/python/rodc_rwdc.py b/source4/dsdb/tests/python/rodc_rwdc.py index a09d16a0163..d628c609d8c 100644 --- a/source4/dsdb/tests/python/rodc_rwdc.py +++ b/source4/dsdb/tests/python/rodc_rwdc.py @@ -1,6 +1,5 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -from __future__ import print_function """Test communication of credentials etc, between an RODC and a RWDC. How does it work when the password is changed on the RWDC? diff --git a/source4/dsdb/tests/python/sam.py b/source4/dsdb/tests/python/sam.py index 41c348bce5f..1417505c4f5 100755 --- a/source4/dsdb/tests/python/sam.py +++ b/source4/dsdb/tests/python/sam.py @@ -2,7 +2,6 @@ # -*- coding: utf-8 -*- # This is a port of the original in testprogs/ejs/ldap.js -from __future__ import print_function import optparse import sys import os diff --git a/source4/dsdb/tests/python/sec_descriptor.py b/source4/dsdb/tests/python/sec_descriptor.py index 8edf5e092d7..b67bf33b5f7 100755 --- a/source4/dsdb/tests/python/sec_descriptor.py +++ b/source4/dsdb/tests/python/sec_descriptor.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -from __future__ import print_function import optparse import sys import os diff --git a/source4/dsdb/tests/python/sites.py b/source4/dsdb/tests/python/sites.py index 783b896caf9..f6efdaebc05 100755 --- a/source4/dsdb/tests/python/sites.py +++ b/source4/dsdb/tests/python/sites.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 optparse import sys diff --git a/source4/dsdb/tests/python/sort.py b/source4/dsdb/tests/python/sort.py index 51d797af38d..a4d7b72f744 100644 --- a/source4/dsdb/tests/python/sort.py +++ b/source4/dsdb/tests/python/sort.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- # Originally based on ./sam.py -from __future__ import print_function from unicodedata import normalize import locale locale.setlocale(locale.LC_ALL, ('en_US', 'UTF-8')) diff --git a/source4/dsdb/tests/python/subtree_rename.py b/source4/dsdb/tests/python/subtree_rename.py index c4f6bc7a160..df85d05eb4b 100644 --- a/source4/dsdb/tests/python/subtree_rename.py +++ b/source4/dsdb/tests/python/subtree_rename.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- # Originally based on ./sam.py -from __future__ import print_function import optparse import sys import os diff --git a/source4/dsdb/tests/python/token_group.py b/source4/dsdb/tests/python/token_group.py index 7e314627a32..3a9e535a085 100755 --- a/source4/dsdb/tests/python/token_group.py +++ b/source4/dsdb/tests/python/token_group.py @@ -2,7 +2,6 @@ # -*- coding: utf-8 -*- # test tokengroups attribute against internal token calculation -from __future__ import print_function import optparse import sys import os diff --git a/source4/dsdb/tests/python/tombstone_reanimation.py b/source4/dsdb/tests/python/tombstone_reanimation.py index ad2ef80c09e..453e378332b 100755 --- a/source4/dsdb/tests/python/tombstone_reanimation.py +++ b/source4/dsdb/tests/python/tombstone_reanimation.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 sys import unittest diff --git a/source4/dsdb/tests/python/urgent_replication.py b/source4/dsdb/tests/python/urgent_replication.py index 6ec698d0bbb..485b1fd8df5 100755 --- a/source4/dsdb/tests/python/urgent_replication.py +++ b/source4/dsdb/tests/python/urgent_replication.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -from __future__ import print_function import optparse import sys sys.path.insert(0, "bin/python") diff --git a/source4/dsdb/tests/python/user_account_control.py b/source4/dsdb/tests/python/user_account_control.py index 2d62d4c32b1..02805ff3adc 100755 --- a/source4/dsdb/tests/python/user_account_control.py +++ b/source4/dsdb/tests/python/user_account_control.py @@ -8,7 +8,6 @@ # Licenced under the GPLv3 # -from __future__ import print_function import optparse import sys import unittest diff --git a/source4/dsdb/tests/python/vlv.py b/source4/dsdb/tests/python/vlv.py index c7578c6f04b..3d5782b02ec 100644 --- a/source4/dsdb/tests/python/vlv.py +++ b/source4/dsdb/tests/python/vlv.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- # Originally based on ./sam.py -from __future__ import print_function import optparse import sys import os diff --git a/source4/script/depfilter.py b/source4/script/depfilter.py index 1f741f746e0..ee2ce9d706a 100755 --- a/source4/script/depfilter.py +++ b/source4/script/depfilter.py @@ -6,7 +6,6 @@ # Command line stuff -from __future__ import print_function import sys import re diff --git a/source4/scripting/bin/gen_hresult.py b/source4/scripting/bin/gen_hresult.py index 5fbf419a547..9bde42911f5 100755 --- a/source4/scripting/bin/gen_hresult.py +++ b/source4/scripting/bin/gen_hresult.py @@ -22,7 +22,6 @@ # -from __future__ import print_function import sys, os.path, io, string # parsed error data diff --git a/source4/scripting/bin/get-descriptors b/source4/scripting/bin/get-descriptors index bed01e7ceb3..f9b9cd7d170 100755 --- a/source4/scripting/bin/get-descriptors +++ b/source4/scripting/bin/get-descriptors @@ -26,7 +26,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 sys diff --git a/source4/scripting/bin/rebuildextendeddn b/source4/scripting/bin/rebuildextendeddn index 3c0e46d4fef..f5137f979d6 100755 --- a/source4/scripting/bin/rebuildextendeddn +++ b/source4/scripting/bin/rebuildextendeddn @@ -21,7 +21,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/source4/scripting/bin/samba_downgrade_db b/source4/scripting/bin/samba_downgrade_db index 87a989bfd6a..43a803c4e82 100755 --- a/source4/scripting/bin/samba_downgrade_db +++ b/source4/scripting/bin/samba_downgrade_db @@ -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 optparse import sys diff --git a/source4/scripting/bin/samba_kcc b/source4/scripting/bin/samba_kcc index 122a5ed2c5e..67d801ea917 100755 --- a/source4/scripting/bin/samba_kcc +++ b/source4/scripting/bin/samba_kcc @@ -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 import os import sys diff --git a/source4/scripting/devel/addlotscontacts b/source4/scripting/devel/addlotscontacts index aff14092021..8e6b27802ce 100644 --- a/source4/scripting/devel/addlotscontacts +++ b/source4/scripting/devel/addlotscontacts @@ -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 __docformat__ = "restructuredText" diff --git a/source4/scripting/devel/crackname b/source4/scripting/devel/crackname index 4dbe47227aa..021adfa0515 100755 --- a/source4/scripting/devel/crackname +++ b/source4/scripting/devel/crackname @@ -3,7 +3,6 @@ # Copyright Matthieu Patou <mat@matws.net> 2011 # script to call a DRSUAPI crackname # this is useful for plugfest testing and replication debug -from __future__ import print_function import sys from optparse import OptionParser diff --git a/source4/scripting/devel/demodirsync.py b/source4/scripting/devel/demodirsync.py index e615c0fb865..ec548ae2147 100755 --- a/source4/scripting/devel/demodirsync.py +++ b/source4/scripting/devel/demodirsync.py @@ -1,7 +1,5 @@ #!/usr/bin/python - -from __future__ import print_function import optparse import sys import base64 diff --git a/source4/scripting/devel/getncchanges b/source4/scripting/devel/getncchanges index 3c132f5f0d3..a1a4d14d621 100755 --- a/source4/scripting/devel/getncchanges +++ b/source4/scripting/devel/getncchanges @@ -2,7 +2,6 @@ # script to call a DRS GetNCChanges from the command line # this is useful for plugfest testing -from __future__ import print_function import sys from optparse import OptionParser diff --git a/source4/scripting/devel/pfm_verify.py b/source4/scripting/devel/pfm_verify.py index 496a7a97d4d..2fe2aca65bc 100755 --- a/source4/scripting/devel/pfm_verify.py +++ b/source4/scripting/devel/pfm_verify.py @@ -20,7 +20,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from __future__ import print_function import os import sys from optparse import OptionParser diff --git a/source4/scripting/devel/repl_cleartext_pwd.py b/source4/scripting/devel/repl_cleartext_pwd.py index 6fc1e162591..64392919f5b 100755 --- a/source4/scripting/devel/repl_cleartext_pwd.py +++ b/source4/scripting/devel/repl_cleartext_pwd.py @@ -36,7 +36,6 @@ # $ # -from __future__ import print_function import sys # Find right direction when running from source tree diff --git a/source4/scripting/devel/speedtest.py b/source4/scripting/devel/speedtest.py index 8a6acfd0a72..8c044c47925 100755 --- a/source4/scripting/devel/speedtest.py +++ b/source4/scripting/devel/speedtest.py @@ -22,7 +22,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from __future__ import print_function import optparse import sys import time diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index fa0f0043424..cdaced0e1c1 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -17,7 +17,6 @@ # by the name of the test, the environment it needs and the command to run, all # three separated by newlines. All other lines in the output are considered # comments. -from __future__ import print_function import os import sys diff --git a/source4/torture/drs/python/delete_object.py b/source4/torture/drs/python/delete_object.py index 395877ad76a..3db0d0b51f3 100644 --- a/source4/torture/drs/python/delete_object.py +++ b/source4/torture/drs/python/delete_object.py @@ -26,7 +26,6 @@ # PYTHONPATH="$PYTHONPATH:$samba4srcdir/torture/drs/python" $SUBUNITRUN delete_object -U"$DOMAIN/$DC_USERNAME"%"$DC_PASSWORD" # -from __future__ import print_function import time diff --git a/source4/torture/drs/python/drs_base.py b/source4/torture/drs/python/drs_base.py index 0046ae235f1..eea5a7ef907 100644 --- a/source4/torture/drs/python/drs_base.py +++ b/source4/torture/drs/python/drs_base.py @@ -20,7 +20,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from __future__ import print_function import sys import time import os diff --git a/source4/torture/drs/python/fsmo.py b/source4/torture/drs/python/fsmo.py index b548fbca26a..3562b4522f7 100644 --- a/source4/torture/drs/python/fsmo.py +++ b/source4/torture/drs/python/fsmo.py @@ -25,7 +25,6 @@ # PYTHONPATH="$PYTHONPATH:$samba4srcdir/torture/drs/python" $SUBUNITRUN fsmo -U"$DOMAIN/$DC_USERNAME"%"$DC_PASSWORD" # -from __future__ import print_function import sys import time import os diff --git a/source4/torture/drs/python/getncchanges.py b/source4/torture/drs/python/getncchanges.py index 7bb6e4d14aa..a35e86088dc 100644 --- a/source4/torture/drs/python/getncchanges.py +++ b/source4/torture/drs/python/getncchanges.py @@ -28,7 +28,6 @@ # getncchanges -U"$DOMAIN/$DC_USERNAME"%"$DC_PASSWORD" # -from __future__ import print_function import drs_base import samba.tests import ldb diff --git a/source4/torture/drs/python/repl_move.py b/source4/torture/drs/python/repl_move.py index 31dec3849a7..19389cdb8af 100644 --- a/source4/torture/drs/python/repl_move.py +++ b/source4/torture/drs/python/repl_move.py @@ -27,7 +27,6 @@ # PYTHONPATH="$PYTHONPATH:$samba4srcdir/torture/drs/python" $SUBUNITRUN repl_move -U"$DOMAIN/$DC_USERNAME"%"$DC_PASSWORD" # -from __future__ import print_function import time import uuid import samba.tests diff --git a/source4/torture/drs/python/replica_sync.py b/source4/torture/drs/python/replica_sync.py index ad03d1b061e..b078e90cb3e 100644 --- a/source4/torture/drs/python/replica_sync.py +++ b/source4/torture/drs/python/replica_sync.py @@ -27,7 +27,6 @@ # PYTHONPATH="$PYTHONPATH:$samba4srcdir/torture/drs/python" $SUBUNITRUN replica_sync -U"$DOMAIN/$DC_USERNAME"%"$DC_PASSWORD" # -from __future__ import print_function import drs_base import samba.tests import time diff --git a/source4/torture/drs/python/samba_tool_drs_showrepl.py b/source4/torture/drs/python/samba_tool_drs_showrepl.py index e77f15d2b54..707b1fb3a75 100644 --- a/source4/torture/drs/python/samba_tool_drs_showrepl.py +++ b/source4/torture/drs/python/samba_tool_drs_showrepl.py @@ -17,7 +17,6 @@ # """Blackbox tests for samba-tool drs showrepl.""" -from __future__ import print_function import samba.tests import drs_base from samba.dcerpc import drsuapi |