[PATCH] more python patches (unused variables)
Douglas Bagnall
douglas.bagnall at catalyst.net.nz
Sun Oct 28 22:11:01 UTC 2018
I thought I was finished, but I found these.
They are mostly to do with unused variables.
In review, you might want to consider whether these variables
*should* have been used, and these patches are heading in the
wrong direction.
Douglas
-------------- next part --------------
From 2e780d4e0e734783920b1134270cdd3339b46d89 Mon Sep 17 00:00:00 2001
From: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Sun, 28 Oct 2018 00:33:05 +1300
Subject: [PATCH 01/16] samba-tool rodc: remove unused variable
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
---
python/samba/netcmd/rodc.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/python/samba/netcmd/rodc.py b/python/samba/netcmd/rodc.py
index 060683345ee..5839bdd31c0 100644
--- a/python/samba/netcmd/rodc.py
+++ b/python/samba/netcmd/rodc.py
@@ -83,7 +83,6 @@ class cmd_rodc_preload(Command):
def run(self, *accounts, **kwargs):
sambaopts = kwargs.get("sambaopts")
credopts = kwargs.get("credopts")
- versionpts = kwargs.get("versionopts")
server = kwargs.get("server")
accounts_file = kwargs.get("file")
ignore_errors = kwargs.get("ignore_errors")
--
2.11.0
From e04a8df8ac0a88dfc3d3f0638f58b908e7d84bf0 Mon Sep 17 00:00:00 2001
From: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Sun, 28 Oct 2018 00:33:30 +1300
Subject: [PATCH 02/16] samba-tool spn: remove unused variables
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
---
python/samba/netcmd/spn.py | 2 --
1 file changed, 2 deletions(-)
diff --git a/python/samba/netcmd/spn.py b/python/samba/netcmd/spn.py
index 62884a4ec09..f0069460e3e 100644
--- a/python/samba/netcmd/spn.py
+++ b/python/samba/netcmd/spn.py
@@ -58,8 +58,6 @@ class cmd_spn_list(Command):
scope=ldb.SCOPE_SUBTREE, attrs=["servicePrincipalName"])
if len(res) > 0:
spns = res[0].get("servicePrincipalName")
- found = False
- flag = ldb.FLAG_MOD_ADD
if spns is not None:
self.outf.write(
"User %s has the following servicePrincipalName: \n" %
--
2.11.0
From 04f79cfe996626c4cdeaac24afe673544dbd119c Mon Sep 17 00:00:00 2001
From: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Thu, 11 Oct 2018 12:52:46 +1300
Subject: [PATCH 03/16] dbchecker: remove unused variables
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
---
python/samba/dbchecker.py | 4 ----
1 file changed, 4 deletions(-)
diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py
index dcdbb893095..565af7a46af 100644
--- a/python/samba/dbchecker.py
+++ b/python/samba/dbchecker.py
@@ -648,7 +648,6 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
def err_incorrect_binary_dn(self, dn, attrname, val, dsdb_dn, errstr):
"""handle an incorrect binary DN component"""
self.report("ERROR: %s binary component for %s in object %s - %s" % (errstr, attrname, dn, val))
- controls = ["extended_dn:1:1", "show_recycled:1"]
if not self.confirm_all('Change DN to %s?' % str(dsdb_dn), 'fix_all_binary_dn'):
self.report("Not fixing %s" % errstr)
@@ -1445,7 +1444,6 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
'''
repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob, val)
- obj = repl.ctr
for o in repl.ctr.array:
if o.attid == attid:
@@ -1463,7 +1461,6 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
in_schema_nc = dn.is_child_of(self.schema_dn)
repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob, val)
- obj = repl.ctr
for o in repl.ctr.array:
att = self.samdb_schema.get_lDAPDisplayName_by_attid(o.attid)
@@ -1653,7 +1650,6 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
'''re-write the SD due to not matching the default (optional mode for fixing an incorrect provision)'''
sd_attr = "nTSecurityDescriptor"
sd_val = ndr_pack(sd)
- sd_old_val = ndr_pack(sd_old)
sd_flags = security.SECINFO_DACL | security.SECINFO_SACL
if sd.owner_sid is not None:
sd_flags |= security.SECINFO_OWNER
--
2.11.0
From f17e3106a4a129f626a8950480806b855ed03577 Mon Sep 17 00:00:00 2001
From: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Thu, 11 Oct 2018 12:35:56 +1300
Subject: [PATCH 04/16] samba-tool dbcheck: remove unused variable
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
---
python/samba/netcmd/dbcheck.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/python/samba/netcmd/dbcheck.py b/python/samba/netcmd/dbcheck.py
index 6369e7fbb09..965288b4557 100644
--- a/python/samba/netcmd/dbcheck.py
+++ b/python/samba/netcmd/dbcheck.py
@@ -41,7 +41,6 @@ class cmd_dbcheck(Command):
def process_yes(option, opt, value, parser):
assert value is None
- done = 0
rargs = parser.rargs
if rargs:
arg = rargs[0]
--
2.11.0
From cd599c88bfe2db17c02bad13a89a04c29852063f Mon Sep 17 00:00:00 2001
From: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Thu, 11 Oct 2018 13:14:02 +1300
Subject: [PATCH 05/16] python/upgradehelpers: remove unused variable
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
---
python/samba/upgradehelpers.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/python/samba/upgradehelpers.py b/python/samba/upgradehelpers.py
index e3d1ce0124b..1f33f3bb1a9 100644
--- a/python/samba/upgradehelpers.py
+++ b/python/samba/upgradehelpers.py
@@ -487,7 +487,6 @@ def increment_calculated_keyversion_number(samdb, rootdn, hashDns):
scope=SCOPE_SUBTREE, attrs=["msDs-KeyVersionNumber"],
controls=["search_options:1:2"])
done = 0
- hashDone = {}
if len(entry) == 0:
raise ProvisioningError("Unable to find msDs-KeyVersionNumber")
else:
--
2.11.0
From 52c3d92098b095cd4e103219c5953c378392a5ff Mon Sep 17 00:00:00 2001
From: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Thu, 11 Oct 2018 13:14:32 +1300
Subject: [PATCH 06/16] python/xattr: remove unused variable
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
---
python/samba/xattr.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/python/samba/xattr.py b/python/samba/xattr.py
index 47126906f88..19eb67ab315 100644
--- a/python/samba/xattr.py
+++ b/python/samba/xattr.py
@@ -45,7 +45,6 @@ def copytree_with_xattrs(src, dst):
names = os.listdir(src)
os.makedirs(dst)
- errors = []
for name in names:
srcname = os.path.join(src, name)
dstname = os.path.join(dst, name)
--
2.11.0
From 1953afbb3df7342a45c3a436350798aa1143bc70 Mon Sep 17 00:00:00 2001
From: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Thu, 11 Oct 2018 13:41:23 +1300
Subject: [PATCH 07/16] python/tests/credentials: remove unused variables
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
---
python/samba/tests/credentials.py | 4 ----
1 file changed, 4 deletions(-)
diff --git a/python/samba/tests/credentials.py b/python/samba/tests/credentials.py
index a81bf219618..d2a81506de3 100644
--- a/python/samba/tests/credentials.py
+++ b/python/samba/tests/credentials.py
@@ -268,8 +268,6 @@ class CredentialsTests(samba.tests.TestCaseInTempDir):
os.unlink(passwd_file_name)
def test_parse_file_4(self):
- realm = "realm.example.com"
- domain = "domain"
password = "password"
username = "username"
@@ -293,8 +291,6 @@ class CredentialsTests(samba.tests.TestCaseInTempDir):
os.unlink(passwd_file_name)
def test_parse_file_5(self):
- realm = "realm.example.com"
- domain = "domain"
password = "password"
username = "username"
--
2.11.0
From ad7707f52719a89a0487889dcc1614142b8698ff Mon Sep 17 00:00:00 2001
From: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Thu, 11 Oct 2018 14:00:50 +1300
Subject: [PATCH 08/16] python/tests/source: remove useless local variable
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
---
python/samba/tests/source.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/python/samba/tests/source.py b/python/samba/tests/source.py
index 5a62dbf8a33..4bb652c4204 100644
--- a/python/samba/tests/source.py
+++ b/python/samba/tests/source.py
@@ -158,7 +158,6 @@ class TestSource(TestCase):
def _iter_source_files_lines(self):
for fname, text in get_source_file_contents():
lines = text.splitlines(True)
- last_line_no = len(lines) - 1
for line_no, line in enumerate(lines):
yield fname, line_no, line
--
2.11.0
From 3f6d771fdaa93b528a813d5a4a0a86f399798bf5 Mon Sep 17 00:00:00 2001
From: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Thu, 11 Oct 2018 16:03:22 +1300
Subject: [PATCH 09/16] autobuild: remove unused variables
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
---
script/autobuild.py | 2 --
1 file changed, 2 deletions(-)
diff --git a/script/autobuild.py b/script/autobuild.py
index 5a90b07afe9..989c69cfec9 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -825,7 +825,6 @@ def email_failure(status, failed_task, failed_stage, failed_tag, errstr,
elapsed_time, log_base=None, add_log_tail=True):
'''send an email to options.email about the failure'''
elapsed_minutes = elapsed_time / 60.0
- user = os.getenv("USER")
if log_base is None:
log_base = gitroot
text = '''
@@ -889,7 +888,6 @@ The last 50 lines of log messages:
def email_success(elapsed_time, log_base=None):
'''send an email to options.email about a successful build'''
- user = os.getenv("USER")
if log_base is None:
log_base = gitroot
text = '''
--
2.11.0
From 5e1a2803c534db050ac5513b5d516af3ee3a2756 Mon Sep 17 00:00:00 2001
From: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Sun, 28 Oct 2018 10:39:13 +1300
Subject: [PATCH 10/16] py/tests/dcerpc_integer: remove dup tests
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
---
python/samba/tests/dcerpc/integer.py | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/python/samba/tests/dcerpc/integer.py b/python/samba/tests/dcerpc/integer.py
index 42308b657ce..2825c670843 100644
--- a/python/samba/tests/dcerpc/integer.py
+++ b/python/samba/tests/dcerpc/integer.py
@@ -136,20 +136,6 @@ class IntegerTests(samba.tests.TestCase):
g.time_mid = -2
self.assertRaises(OverflowError, assign)
- def test_int_into_uint16(self):
- g = misc.GUID()
-
- def assign():
- g.time_mid = 200000
- self.assertRaises(OverflowError, assign)
-
- def test_negative_int_into_uint16(self):
- g = misc.GUID()
-
- def assign():
- g.time_mid = -2
- self.assertRaises(OverflowError, assign)
-
def test_enum_into_uint16(self):
g = misc.GUID()
g.time_mid = misc.SEC_CHAN_DOMAIN
--
2.11.0
From 524a276e0338be71a177781e38bf1850d932575f Mon Sep 17 00:00:00 2001
From: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Thu, 11 Oct 2018 12:36:58 +1300
Subject: [PATCH 11/16] samba-tool domain: remove unused variables
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
---
python/samba/netcmd/domain.py | 4 ----
1 file changed, 4 deletions(-)
diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py
index a85c16a179b..5e2fe0050f1 100644
--- a/python/samba/netcmd/domain.py
+++ b/python/samba/netcmd/domain.py
@@ -26,7 +26,6 @@ from __future__ import print_function
from __future__ import division
import samba.getopt as options
import ldb
-import string
import os
import sys
import ctypes
@@ -3879,7 +3878,6 @@ This command expunges tombstones from the database."""
def run(self, *ncs, **kwargs):
sambaopts = kwargs.get("sambaopts")
credopts = kwargs.get("credopts")
- versionpts = kwargs.get("versionopts")
H = kwargs.get("H")
current_time_string = kwargs.get("current_time")
tombstone_lifetime = kwargs.get("tombstone_lifetime")
@@ -4135,7 +4133,6 @@ class cmd_domain_schema_upgrade(Command):
updates_allowed_overriden = False
sambaopts = kwargs.get("sambaopts")
credopts = kwargs.get("credopts")
- versionpts = kwargs.get("versionopts")
lp = sambaopts.get_loadparm()
creds = credopts.get_credentials(lp)
H = kwargs.get("H")
@@ -4280,7 +4277,6 @@ class cmd_domain_functional_prep(Command):
updates_allowed_overriden = False
sambaopts = kwargs.get("sambaopts")
credopts = kwargs.get("credopts")
- versionpts = kwargs.get("versionopts")
lp = sambaopts.get_loadparm()
creds = credopts.get_credentials(lp)
H = kwargs.get("H")
--
2.11.0
From a1b965083655bd49ad8858e006130ed520b988ca Mon Sep 17 00:00:00 2001
From: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Thu, 11 Oct 2018 12:41:12 +1300
Subject: [PATCH 12/16] samba-tool processes: remove unused imports and
variables
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
---
python/samba/netcmd/processes.py | 3 ---
1 file changed, 3 deletions(-)
diff --git a/python/samba/netcmd/processes.py b/python/samba/netcmd/processes.py
index 68569857ca0..d04a548abd7 100644
--- a/python/samba/netcmd/processes.py
+++ b/python/samba/netcmd/processes.py
@@ -24,9 +24,6 @@
# Useful for a quick 'syntax check' of a configuration file.
#
-import os
-import sys
-
import samba
import samba.getopt as options
from samba.netcmd import Command, CommandError, Option
--
2.11.0
From c2bfb5a0dc649a0779c2915ef734e2d1072263d8 Mon Sep 17 00:00:00 2001
From: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Sun, 28 Oct 2018 10:29:06 +1300
Subject: [PATCH 13/16] python/upgradehelpers: remove unused provision imports
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
---
python/samba/upgradehelpers.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/python/samba/upgradehelpers.py b/python/samba/upgradehelpers.py
index 1f33f3bb1a9..672268af4df 100644
--- a/python/samba/upgradehelpers.py
+++ b/python/samba/upgradehelpers.py
@@ -33,9 +33,9 @@ from samba import Ldb, version, ntacls
from ldb import SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE
import ldb
from samba.provision import (provision_paths_from_lp,
- getpolicypath, set_gpos_acl, create_gpo_struct,
+ getpolicypath, create_gpo_struct,
provision, ProvisioningError,
- setsysvolacl, secretsdb_self_join)
+ secretsdb_self_join)
from samba.provision.common import FILL_FULL
from samba.dcerpc import xattr, drsblobs, security
from samba.dcerpc.misc import SEC_CHAN_BDC
--
2.11.0
From 4ed984745de6cd624a64560fed842777621c38dd Mon Sep 17 00:00:00 2001
From: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Thu, 11 Oct 2018 13:06:16 +1300
Subject: [PATCH 14/16] python/join: remove unused imports and variables
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
---
python/samba/join.py | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/python/samba/join.py b/python/samba/join.py
index 01636fe3840..6d9847dba05 100644
--- a/python/samba/join.py
+++ b/python/samba/join.py
@@ -24,7 +24,6 @@ from samba.samdb import SamDB
from samba import gensec, Ldb, drs_utils, arcfour_encrypt, string_to_byte_array
import ldb
import samba
-import sys
import uuid
from samba.ndr import ndr_pack, ndr_unpack
from samba.dcerpc import security, drsuapi, misc, nbt, lsa, drsblobs, dnsserver, dnsp
@@ -41,10 +40,9 @@ from samba import read_and_sub_file
from samba import werror
from base64 import b64encode
from samba import WERRORError, NTSTATUSError
-from samba.dnsserver import ARecord, AAAARecord, PTRRecord, CNameRecord, NSRecord, MXRecord, SOARecord, SRVRecord, TXTRecord
from samba import sd_utils
+from samba.dnsserver import ARecord, AAAARecord, CNameRecord
import logging
-import talloc
import random
import time
import re
@@ -1083,7 +1081,6 @@ class DCJoinContext(object):
"""
client_version = dnsserver.DNS_CLIENT_VERSION_LONGHORN
- record_type = dnsp.DNS_TYPE_A
select_flags = dnsserver.DNS_RPC_VIEW_AUTHORITY_DATA |\
dnsserver.DNS_RPC_VIEW_NO_CHILDREN
--
2.11.0
From 25891bef6bc6f604a5ce8db2ee2e43f0494dd7e8 Mon Sep 17 00:00:00 2001
From: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Thu, 11 Oct 2018 13:42:45 +1300
Subject: [PATCH 15/16] python/tests/docs: remove unused import, variables
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
---
python/samba/tests/docs.py | 4 ----
1 file changed, 4 deletions(-)
diff --git a/python/samba/tests/docs.py b/python/samba/tests/docs.py
index e54c754a62a..e11ebd1d26a 100644
--- a/python/samba/tests/docs.py
+++ b/python/samba/tests/docs.py
@@ -23,7 +23,6 @@ import samba
import samba.tests
import os
-import re
import subprocess
import xml.etree.ElementTree as ET
@@ -183,7 +182,6 @@ class SmbDotConfTests(TestCase):
program = [os.environ["PYTHON"]] + program
failset = set()
- count = 0
for tuples in self.defaults:
param, default, context, param_type = tuples
@@ -225,7 +223,6 @@ class SmbDotConfTests(TestCase):
program = [os.environ["PYTHON"]] + program
failset = set()
- count = 0
for tuples in self.defaults:
param, default, context, param_type = tuples
@@ -282,7 +279,6 @@ class SmbDotConfTests(TestCase):
'enum': '', 'boolean-auto': '', 'char': 'b', 'list': 'd, e, f'}
failset = set()
- count = 0
for tuples in self.defaults_all:
param, default, context, param_type = tuples
--
2.11.0
From 06576757ac506ba1ace9020abc3786b5160f9fff Mon Sep 17 00:00:00 2001
From: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Thu, 11 Oct 2018 12:40:50 +1300
Subject: [PATCH 16/16] samba-tool ntacl: remove unused imports and variables
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
---
python/samba/netcmd/ntacl.py | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/python/samba/netcmd/ntacl.py b/python/samba/netcmd/ntacl.py
index 323add7243c..b5dbc1fcf54 100644
--- a/python/samba/netcmd/ntacl.py
+++ b/python/samba/netcmd/ntacl.py
@@ -26,14 +26,12 @@ from samba.samdb import SamDB
from samba.samba3 import param as s3param, passdb, smbd
from samba import provision
-from ldb import SCOPE_BASE
-import os
-
from samba.auth import (
system_session,
session_info_fill_unix,
copy_session_info,
)
+
from samba.netcmd import (
Command,
CommandError,
@@ -236,7 +234,6 @@ class cmd_ntacl_sysvolreset(Command):
def run(self, use_ntvfs=False, use_s3fs=False,
credopts=None, sambaopts=None, versionopts=None):
lp = sambaopts.get_loadparm()
- path = lp.private_path("secrets.ldb")
creds = credopts.get_credentials(lp)
creds.set_kerberos_state(DONT_USE_KERBEROS)
logger = self.get_logger()
@@ -298,7 +295,6 @@ class cmd_ntacl_sysvolcheck(Command):
def run(self, credopts=None, sambaopts=None, versionopts=None):
lp = sambaopts.get_loadparm()
- path = lp.private_path("secrets.ldb")
creds = credopts.get_credentials(lp)
creds.set_kerberos_state(DONT_USE_KERBEROS)
logger = self.get_logger()
--
2.11.0
More information about the samba-technical
mailing list