python: Remove unused imports

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

python/samba/__init__.py

@@ -23,7 +23,6 @@
 __docformat__ = "restructuredText"
 
 import os
-import sys
 import time
 import ldb
 import samba.param

python/samba/domain_update.py

@@ -17,12 +17,9 @@
 #
 
 import ldb
-import samba
 from base64 import b64encode
 from samba import sd_utils
-from samba.ndr import ndr_unpack, ndr_pack
 from samba.dcerpc import security
-from samba.dcerpc.security import SECINFO_DACL
 from samba.descriptor import (
     get_managed_service_accounts_descriptor,
 )

python/samba/forest_update.py

@@ -19,9 +19,7 @@
 import ldb
 import samba
 from samba import sd_utils
-from samba.ndr import ndr_unpack, ndr_pack
 from samba.dcerpc import security
-from samba.dcerpc.security import SECINFO_DACL
 from samba.provision.common import setup_path
 from samba.dsdb import (
     DS_DOMAIN_FUNCTION_2008,

python/samba/gp/gp_centrify_crontab_ext.py

@@ -14,13 +14,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import os, re
+import os
-from subprocess import Popen, PIPE
 from samba.gp.gpclass import gp_pol_ext, drop_privileges, gp_file_applier, \
     gp_misc_applier
 from tempfile import NamedTemporaryFile
-from samba.gp.gp_scripts_ext import fetch_crontab, install_crontab, \
+from samba.gp.gp_scripts_ext import fetch_crontab, install_user_crontab
-    install_user_crontab
 
 intro = '''
 ### autogenerated by samba

python/samba/gp/gp_centrify_sudoers_ext.py

@@ -17,7 +17,6 @@
 import os
 from samba.gp.gpclass import gp_pol_ext, gp_file_applier
 from samba.gp.gp_sudoers_ext import sudo_applier_func
-from samba.gp.util.logging import log
 
 def ext_enabled(entries):
     section = 'Software\\Policies\\Centrify\\UnixSettings'

python/samba/gp/gp_gnome_settings_ext.py

@@ -20,7 +20,7 @@ from tempfile import NamedTemporaryFile
 import shutil
 from configparser import ConfigParser
 from subprocess import Popen, PIPE
-from samba.common import get_bytes, get_string
+from samba.common import get_string
 from glob import glob
 import xml.etree.ElementTree as etree
 from samba.gp.util.logging import log

python/samba/gp/gp_smb_conf_ext.py

@@ -14,7 +14,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/>.
 
-import os, re, numbers
+import os, numbers
 from samba.gp.gpclass import gp_pol_ext, gp_misc_applier
 from tempfile import NamedTemporaryFile
 from samba.gp.util.logging import log

python/samba/gp/gpclass.py

@@ -21,7 +21,7 @@ import errno
 import tdb
 import pwd
 sys.path.insert(0, "bin/python")
-from samba import NTSTATUSError, WERRORError
+from samba import WERRORError
 from configparser import ConfigParser
 from io import StringIO
 import traceback
@@ -33,12 +33,10 @@ from samba.net import Net
 from samba.dcerpc import nbt
 from samba.samba3 import libsmb_samba_internal as libsmb
 import samba.gpo as gpo
-from samba.param import LoadParm
 from uuid import UUID
 from tempfile import NamedTemporaryFile
 from samba.dcerpc import preg
-from samba.dcerpc import misc
+from samba.ndr import ndr_unpack
-from samba.ndr import ndr_pack, ndr_unpack
 from samba.credentials import SMB_SIGNING_REQUIRED
 from samba.gp.util.logging import log
 from hashlib import blake2b
@@ -47,7 +45,7 @@ from samba.common import get_string
 from samba.samdb import SamDB
 from samba.auth import system_session
 import ldb
-from samba.dsdb import UF_WORKSTATION_TRUST_ACCOUNT, UF_SERVER_TRUST_ACCOUNT, GPLINK_OPT_ENFORCE, GPLINK_OPT_DISABLE, GPO_INHERIT, GPO_BLOCK_INHERITANCE
+from samba.dsdb import UF_WORKSTATION_TRUST_ACCOUNT, UF_SERVER_TRUST_ACCOUNT, GPLINK_OPT_ENFORCE, GPLINK_OPT_DISABLE, GPO_BLOCK_INHERITANCE
 from samba.auth import AUTH_SESSION_INFO_DEFAULT_GROUPS, AUTH_SESSION_INFO_AUTHENTICATED, AUTH_SESSION_INFO_SIMPLE_PRIVILEGES
 from samba.dcerpc import security
 import samba.security

python/samba/gp/util/logging.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/>.
 
-import json
 import datetime
 import logging
 import gettext

python/samba/gp/vgp_access_ext.py

@@ -17,7 +17,6 @@
 import os, re
 from samba.gp.gpclass import gp_xml_ext, gp_file_applier
 from tempfile import NamedTemporaryFile
-from samba.common import get_bytes
 from samba.gp.util.logging import log
 
 intro = '''

python/samba/gp/vgp_openssh_ext.py

@@ -17,8 +17,7 @@
 import os
 from io import BytesIO
 from samba.gp.gpclass import gp_xml_ext, gp_file_applier
-from tempfile import NamedTemporaryFile
+from samba.common import get_bytes
-from samba.common import get_bytes, get_string
 
 intro = b'''
 ### autogenerated by samba

python/samba/gp/vgp_startup_scripts_ext.py

@@ -18,7 +18,7 @@ import os
 from samba.gp.gpclass import gp_xml_ext, check_safe_path, gp_file_applier
 from tempfile import NamedTemporaryFile
 from samba.common import get_bytes
-from subprocess import Popen, PIPE
+from subprocess import Popen
 
 intro = b'''
 ### autogenerated by samba

python/samba/gp/vgp_sudoers_ext.py

@@ -17,7 +17,6 @@
 import os
 from samba.gp.gpclass import gp_xml_ext, gp_file_applier
 from samba.gp.gp_sudoers_ext import sudo_applier_func
-from samba.gp.util.logging import log
 
 class vgp_sudoers_ext(gp_xml_ext, gp_file_applier):
     def __str__(self):

python/samba/gp/vgp_symlink_ext.py

@@ -16,8 +16,6 @@
 
 import os
 from samba.gp.gpclass import gp_xml_ext, gp_file_applier
-from tempfile import NamedTemporaryFile
-from subprocess import Popen, PIPE
 from samba.gp.util.logging import log
 
 class vgp_symlink_ext(gp_xml_ext, gp_file_applier):

python/samba/join.py

@@ -26,7 +26,6 @@ import samba
 import uuid
 from samba.ndr import ndr_pack, ndr_unpack
 from samba.dcerpc import security, drsuapi, misc, nbt, lsa, drsblobs, dnsserver, dnsp
-from samba.dsdb import DS_DOMAIN_FUNCTION_2003
 from samba.credentials import Credentials, DONT_USE_KERBEROS
 from samba.provision import (secretsdb_self_join, provision, provision_fill,
                              FILL_DRS, FILL_SUBDOMAIN, DEFAULTSITE)
@@ -41,7 +40,6 @@ from base64 import b64encode
 from samba import WERRORError, NTSTATUSError
 from samba import sd_utils
 from samba.dnsserver import ARecord, AAAARecord, CNAMERecord
-import logging
 import random
 import time
 import re

python/samba/mdb_util.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/>.
 
-import samba
 import subprocess
 import os
 from samba.netcmd import CommandError

python/samba/policies.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/>.
 
-import json
 from io import StringIO
 import ldb
 from samba.ndr import ndr_unpack, ndr_pack

python/samba/provision/__init__.py

@@ -66,7 +66,6 @@ from samba.dcerpc.misc import (
 )
 from samba.dsdb import (
     DS_DOMAIN_FUNCTION_2000,
-    DS_DOMAIN_FUNCTION_2003,
     DS_DOMAIN_FUNCTION_2008,
     DS_DOMAIN_FUNCTION_2008_R2,
     DS_DOMAIN_FUNCTION_2012,
@@ -82,7 +81,6 @@ from samba.provision.backend import (
     LDBBackend,
 )
 from samba.descriptor import (
-    get_empty_descriptor,
     get_config_descriptor,
     get_config_partitions_descriptor,
     get_config_sites_descriptor,
@@ -98,9 +96,6 @@ from samba.descriptor import (
     get_domain_controllers_descriptor,
     get_domain_delete_protected1_descriptor,
     get_domain_delete_protected2_descriptor,
-    get_dns_partition_descriptor,
-    get_dns_forest_microsoft_dns_descriptor,
-    get_dns_domain_microsoft_dns_descriptor,
     get_managed_service_accounts_descriptor,
 )
 from samba.provision.common import (
@@ -109,7 +104,6 @@ from samba.provision.common import (
     setup_modify_ldif,
     FILL_FULL,
     FILL_SUBDOMAIN,
-    FILL_NT4SYNC,
     FILL_DRS
 )
 from samba.provision.sambadns import (

python/samba/provision/sambadns.py

@@ -36,8 +36,6 @@ from samba.dcerpc import dnsp, misc, security
 from samba.dsdb import (
     DS_DOMAIN_FUNCTION_2000,
     DS_DOMAIN_FUNCTION_2003,
-    DS_DOMAIN_FUNCTION_2008_R2,
-    DS_DOMAIN_FUNCTION_2012_R2,
     DS_DOMAIN_FUNCTION_2016,
     DS_GUID_USERS_CONTAINER
 )
@@ -56,8 +54,6 @@ from samba.provision.common import (
     setup_ldb,
     FILL_FULL,
     FILL_SUBDOMAIN,
-    FILL_NT4SYNC,
-    FILL_DRS,
 )
 
 from samba.samdb import get_default_backend_store

python/samba/safe_tarfile.py

@@ -18,7 +18,7 @@
 import os
 import tarfile
 from pathlib import Path
-from tarfile import ExtractError, TarInfo, TarFile as UnsafeTarFile
+from tarfile import ExtractError, TarFile as UnsafeTarFile
 
 
 class TarFile(UnsafeTarFile):

python/samba/subunit/__init__.py

@@ -17,7 +17,6 @@
 
 """Subunit test protocol."""
 
-import samba
 import unittest
 
 

python/samba/tests/common.py

@@ -21,7 +21,7 @@ import samba
 import os
 import samba.tests
 from samba.common import normalise_int32
-from samba.samdb import SamDB, dsdb_Dn
+from samba.samdb import dsdb_Dn
 
 
 class CommonTests(samba.tests.TestCaseInTempDir):

python/samba/tests/compression.py

@@ -14,9 +14,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 unittest import TestSuite
 import os
-import random
 
 from samba.tests import TestCase
 from samba import compression

python/samba/tests/dcerpc/samr_change_password.py

@@ -18,7 +18,6 @@
 
 """Tests for samba.dcerpc.samr.password"""
 
-import os
 import ctypes
 import samba.tests
 

python/samba/tests/dns_aging.py

@@ -26,7 +26,7 @@ import ldb
 from samba import credentials
 from samba.dcerpc import dns, dnsp, dnsserver
 from samba.dnsserver import TXTRecord, ARecord
-from samba.dnsserver import recbuf_from_string, ipv6_normalise
+from samba.dnsserver import ipv6_normalise
 from samba.tests.subunitrun import SubunitOptions, TestProgram
 from samba import werror, WERRORError
 from samba.tests.dns_base import DNSTest

python/samba/tests/dns_forwarder.py

@@ -25,7 +25,7 @@ import errno
 import samba.ndr as ndr
 from samba import credentials
 from samba.tests import TestCase
-from samba.dcerpc import dns, dnsp
+from samba.dcerpc import dns
 from samba.tests.subunitrun import SubunitOptions, TestProgram
 import samba.getopt as options
 import optparse

python/samba/tests/domain_backup_offline.py

@@ -21,9 +21,6 @@ import tempfile
 from samba.tests import BlackboxTestCase, BlackboxProcessError
 from samba.netcmd import CommandError
 from samba.param import LoadParm
-from samba.join import join_DC
-from samba.credentials import Credentials
-from samba.logger import get_samba_logger
 from samba import safe_tarfile as tarfile
 
 

python/samba/tests/dsdb_dns.py

@@ -16,7 +16,6 @@
 #
 from samba.tests import TestCase
 from samba import dsdb_dns
-import time
 
 
 def unix2nttime(t):

python/samba/tests/dsdb_lock.py

@@ -21,7 +21,6 @@ from samba.tests.samdb import SamDBTestCase
 from samba.samdb import SamDB
 import ldb
 import os
-import samba
 import gc
 import time
 

python/samba/tests/getdcname.py

@@ -19,7 +19,6 @@
     Tests GetDCNameEx calls in NETLOGON
 """
 
-from samba import auth
 from samba import WERRORError, werror
 import samba.tests
 import os

python/samba/tests/gpo.py

@@ -27,7 +27,7 @@ from tempfile import NamedTemporaryFile, TemporaryDirectory
 from samba.gp import gpclass
 # Disable privilege dropping for testing
 gpclass.drop_privileges = lambda _, func, *args : func(*args)
-from samba.gp.gp_sec_ext import gp_krb_ext, gp_access_ext
+from samba.gp.gp_sec_ext import gp_krb_ext
 from samba.gp.gp_scripts_ext import gp_scripts_ext, gp_user_scripts_ext
 from samba.gp.gp_sudoers_ext import gp_sudoers_ext
 from samba.gp.vgp_sudoers_ext import vgp_sudoers_ext

python/samba/tests/gpo_member.py

@@ -18,9 +18,7 @@ import os
 from samba import tests
 from samba.gp.gpclass import GPOStorage
 from samba.param import LoadParm
-from samba.credentials import Credentials
 from samba.gp.gp_sec_ext import gp_access_ext
-import logging
 
 class GPOTests(tests.TestCase):
     def setUp(self):

python/samba/tests/krb5_credentials.py

@@ -26,7 +26,7 @@ from samba.credentials import (
 from samba.dsdb import (
     UF_WORKSTATION_TRUST_ACCOUNT,
     UF_PASSWD_NOTREQD,
-    UF_NORMAL_ACCOUNT)
+)
 from samba.samdb import SamDB
 
 """KRB5 Integration tests for pycredentials.

python/samba/tests/ldap_upn_sam_account.py

@@ -26,7 +26,7 @@ from samba.tests import TestCase, ldb_err
 from samba.tests import DynamicTestCase
 import samba.getopt as options
 import optparse
-from samba.colour import c_RED, c_GREEN, c_DARK_YELLOW
+from samba.colour import c_DARK_YELLOW
 import re
 import pprint
 from samba.dsdb import (

python/samba/tests/ldap_whoami.py

@@ -16,7 +16,7 @@
 
 from samba import Ldb,tests
 from samba.samba3 import param as s3param
-from samba import (credentials,NTSTATUSError)
+from samba import credentials
 import os
 
 class LdapWhoami(tests.TestCase):

python/samba/tests/netlogonsvc.py

@@ -18,7 +18,6 @@
 from samba.tests import TestCase
 import os
 
-import samba
 from samba.credentials import Credentials
 from samba.dcerpc import netlogon
 from samba import NTSTATUSError, ntstatus

python/samba/tests/password_hash_ldap.py

@@ -39,7 +39,6 @@ from samba.tests.password_hash import (
     PassWordHashTests,
     get_package,
     USER_NAME,
-    USER_PASS
 )
 from samba.samdb import SamDB
 from samba.ndr import ndr_unpack

python/samba/tests/safe_tarfile.py

@@ -15,7 +15,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import tarfile
 from samba import safe_tarfile
-import tempfile
 
 import os
 from samba.tests import TestCaseInTempDir

python/samba/tests/samba_startup_fl_change.py

@@ -20,10 +20,9 @@
 from samba.credentials import Credentials
 from samba.samdb import SamDB
 from samba.auth import system_session
-from samba.tests import TestCase
 from samba.param import LoadParm
 from samba import dsdb, functional_level
-import ldb, samba
+import ldb
 
 
 from samba.tests.samba_tool.base import SambaToolCmdTest

python/samba/tests/samba_tool/gpo.py

@@ -30,10 +30,8 @@ from samba.dcerpc import preg
 from samba.ndr import ndr_pack, ndr_unpack
 from samba.common import get_string
 from configparser import ConfigParser
-from io import StringIO
 import xml.etree.ElementTree as etree
 from tempfile import NamedTemporaryFile
-from time import sleep
 import re
 from samba.gp.gpclass import check_guid
 from samba.gp_parse.gp_ini import GPTIniParser

python/samba/tests/samdb_api.py

@@ -19,7 +19,6 @@
 from samba.tests import TestCaseInTempDir
 from samba.samdb import SamDB
 from ldb import LdbError, ERR_OPERATIONS_ERROR
-import os
 import errno
 
 

python/samba/tests/security_descriptors.py

@@ -28,7 +28,6 @@ from samba.colour import colourdiff
 from hashlib import md5
 import gzip
 
-import os
 import json
 from pathlib import Path
 

python/samba/tests/smb-notify.py

@@ -24,7 +24,6 @@ os.environ["PYTHONUNBUFFERED"] = "1"
 import samba
 import random
 from samba.tests import TestCase
-from samba import NTSTATUSError
 from samba import credentials
 from samba.ntstatus import NT_STATUS_NOTIFY_CLEANUP
 from samba.samba3 import libsmb_samba_internal as libsmb

python/samba/tests/smb1posix.py

@@ -17,7 +17,6 @@
 
 from samba.samba3 import libsmb_samba_internal as libsmb
 from samba import (ntstatus,NTSTATUSError)
-from samba.dcerpc import security as sec
 import samba.tests.libsmb
 import stat
 

python/samba/upgrade.py

@@ -25,7 +25,6 @@ import time
 import pwd
 
 from samba import Ldb, registry
-from samba.param import LoadParm
 from samba.provision import provision, ProvisioningError, setsysvolacl
 from samba.provision.common import FILL_FULL
 from samba.samba3 import passdb

python/samba/upgradehelpers.py

@@ -27,7 +27,7 @@ import shutil
 import samba
 
 from samba.common import cmp
-from samba import Ldb, version, ntacls
+from samba import Ldb, version
 from ldb import SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE
 import ldb
 from samba.provision import (provision_paths_from_lp,