[SCM] Samba Shared Repository - branch master updated
Noel Power
npower at samba.org
Tue Aug 11 18:01:02 UTC 2020
The branch, master has been updated
via 9aa6b0cd2e1 libsmb: Fix CID 1465860 Control flow issues (DEADCODE)
via f0860de5bb2 python compat: remove text_type
via ace5038031f python compat: remove binary_type
via bcaf076d30f python compat: reduce use of 'if PY3:'
via 4d9d63b000d python compat: remove StringIO
via 9cc65a552b0 python compat: remove string_types
via 323073f4e0f python compat: remove integer_types
from 32eb7f39667 Remove depracated "ldap ssl ads" smb.conf option
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 9aa6b0cd2e1936dd8ca68bbeec233fd42b89b98f
Author: Volker Lendecke <vl at samba.org>
Date: Tue Aug 11 09:51:39 2020 +0200
libsmb: Fix CID 1465860 Control flow issues (DEADCODE)
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Noel Power <npower at samba.org>
Autobuild-User(master): Noel Power <npower at samba.org>
Autobuild-Date(master): Tue Aug 11 18:00:26 UTC 2020 on sn-devel-184
commit f0860de5bb2e12ad0f91f5428410ea0346286c1e
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Sat Jul 4 14:27:06 2020 +1200
python compat: remove text_type
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Noel Power <npower at samba.org>
commit ace5038031f3b7f7017da2ad0076b9f8fca59d10
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Sat Jul 4 14:05:16 2020 +1200
python compat: remove binary_type
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Noel Power <npower at samba.org>
commit bcaf076d30f38cea4465be57d5270e9431951161
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Sat Jul 4 14:01:32 2020 +1200
python compat: reduce use of 'if PY3:'
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Noel Power <npower at samba.org>
commit 4d9d63b000db28c3b718f7f1dbddac5a94685687
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Sat Jul 4 13:53:34 2020 +1200
python compat: remove StringIO
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Noel Power <npower at samba.org>
commit 9cc65a552b0270db0ea08509ee6e9a3d5b9a1f10
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Sat Jul 4 13:47:44 2020 +1200
python compat: remove string_types
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Noel Power <npower at samba.org>
commit 323073f4e0feadcaaf0978604741660b6ef02a16
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Sat Jul 4 13:44:52 2020 +1200
python compat: remove integer_types
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Noel Power <npower at samba.org>
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/tests/test_abi.py | 2 +-
python/samba/__init__.py | 5 ++---
python/samba/compat.py | 8 --------
python/samba/gp_parse/gp_csv.py | 6 ++----
python/samba/gp_parse/gp_ini.py | 2 +-
python/samba/gpclass.py | 2 +-
python/samba/join.py | 3 +--
python/samba/ms_schema.py | 7 +++----
python/samba/netcmd/domain.py | 3 +--
python/samba/netcmd/user.py | 5 ++---
python/samba/netcmd/visualize.py | 3 +--
python/samba/provision/__init__.py | 8 +++-----
python/samba/samdb.py | 12 +++++-------
python/samba/tests/__init__.py | 4 +---
python/samba/tests/auth_log_netlogon.py | 3 +--
python/samba/tests/auth_log_samlogon.py | 3 +--
python/samba/tests/blackbox/samba_dnsupdate.py | 2 +-
python/samba/tests/credentials.py | 18 +++++-------------
python/samba/tests/dcerpc/raw_protocol.py | 5 ++---
python/samba/tests/dcerpc/raw_testcase.py | 1 -
python/samba/tests/dcerpc/testrpc.py | 3 +--
python/samba/tests/dcerpc/unix.py | 3 +--
python/samba/tests/dns_base.py | 7 +++----
python/samba/tests/emulate/traffic.py | 2 +-
python/samba/tests/messaging.py | 3 +--
python/samba/tests/netcmd.py | 2 +-
python/samba/tests/password_hash.py | 3 +--
python/samba/tests/password_hash_ldap.py | 3 +--
python/samba/tests/samba_tool/base.py | 2 +-
python/samba/tests/samba_tool/user_wdigest.py | 4 ++--
selftest/subunithelper.py | 3 +--
source3/libsmb/namequery.c | 2 +-
source4/dsdb/tests/python/sam.py | 4 ++--
source4/dsdb/tests/python/sort.py | 3 +--
source4/scripting/bin/samba_dnsupdate | 3 +--
source4/scripting/devel/pfm_verify.py | 4 ++--
source4/torture/drs/python/samba_tool_drs_showrepl.py | 3 +--
37 files changed, 56 insertions(+), 100 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/tests/test_abi.py b/buildtools/wafsamba/tests/test_abi.py
index 8521c49d8e8..ffd5a568e1b 100644
--- a/buildtools/wafsamba/tests/test_abi.py
+++ b/buildtools/wafsamba/tests/test_abi.py
@@ -21,7 +21,7 @@ from wafsamba.samba_abi import (
normalise_signature,
)
-from samba.compat import StringIO
+from io import StringIO
class NormaliseSignatureTests(TestCase):
diff --git a/python/samba/__init__.py b/python/samba/__init__.py
index 6272b3fb390..360918c49ad 100644
--- a/python/samba/__init__.py
+++ b/python/samba/__init__.py
@@ -29,7 +29,6 @@ import ldb
import samba.param
from samba import _glue
from samba._ldb import Ldb as _Ldb
-from samba.compat import string_types
def source_tree_topdir():
@@ -250,8 +249,8 @@ def substitute_var(text, values):
"""
for (name, value) in values.items():
- assert isinstance(name, string_types), "%r is not a string" % name
- assert isinstance(value, string_types), "Value %r for %s is not a string" % (value, name)
+ assert isinstance(name, str), "%r is not a string" % name
+ assert isinstance(value, str), "Value %r for %s is not a string" % (value, name)
text = text.replace("${%s}" % name, value)
return text
diff --git a/python/samba/compat.py b/python/samba/compat.py
index a6baa8dad1a..b517999defd 100644
--- a/python/samba/compat.py
+++ b/python/samba/compat.py
@@ -71,15 +71,7 @@ if PY3:
# compat functions
from functools import cmp_to_key as cmp_to_key_fn
- # compat types
- integer_types = int,
- string_types = str
- text_type = str
- binary_type = bytes
-
# alias
- import io
- StringIO = io.StringIO
def ConfigParser(defaults=None, dict_type=dict, allow_no_value=False):
from configparser import ConfigParser
return ConfigParser(defaults, dict_type, allow_no_value, interpolation=None)
diff --git a/python/samba/gp_parse/gp_csv.py b/python/samba/gp_parse/gp_csv.py
index e436c1b5bd2..ebe9c4b6fe5 100644
--- a/python/samba/gp_parse/gp_csv.py
+++ b/python/samba/gp_parse/gp_csv.py
@@ -23,9 +23,7 @@ import io
from io import BytesIO
from xml.etree.ElementTree import Element, SubElement
-from samba.compat import PY3
from samba.gp_parse import GPParser
-from samba.compat import text_type
# [MS-GPAC] Group Policy Audit Configuration
class GPAuditCsvParser(GPParser):
encoding = 'utf-8'
@@ -82,14 +80,14 @@ class GPAuditCsvParser(GPParser):
header = False
self.header = []
for v in r.findall('Value'):
- if not isinstance(v.text, text_type):
+ if not isinstance(v.text, str):
v.text = v.text.decode(self.output_encoding)
self.header.append(v.text)
else:
line = {}
for i, v in enumerate(r.findall('Value')):
line[self.header[i]] = v.text if v.text is not None else ''
- if not isinstance(self.header[i], text_type):
+ if not isinstance(self.header[i], str):
line[self.header[i]] = line[self.header[i]].decode(self.output_encoding)
self.lines.append(line)
diff --git a/python/samba/gp_parse/gp_ini.py b/python/samba/gp_parse/gp_ini.py
index 590b71b9a6c..d567addd3ea 100644
--- a/python/samba/gp_parse/gp_ini.py
+++ b/python/samba/gp_parse/gp_ini.py
@@ -23,7 +23,7 @@ import re
from xml.etree.ElementTree import Element, SubElement
from samba.compat import ConfigParser
-from samba.compat import StringIO
+from io import StringIO
from samba.gp_parse import GPParser, ENTITY_USER_ID
diff --git a/python/samba/gpclass.py b/python/samba/gpclass.py
index b100f87ff10..e8cefff9568 100644
--- a/python/samba/gpclass.py
+++ b/python/samba/gpclass.py
@@ -22,7 +22,7 @@ import tdb
sys.path.insert(0, "bin/python")
from samba import NTSTATUSError
from samba.compat import ConfigParser
-from samba.compat import StringIO
+from io import StringIO
from samba.compat import get_bytes
from abc import ABCMeta, abstractmethod
import xml.etree.ElementTree as etree
diff --git a/python/samba/join.py b/python/samba/join.py
index a35cf1d9a38..dca9ff634d5 100644
--- a/python/samba/join.py
+++ b/python/samba/join.py
@@ -49,7 +49,6 @@ import re
import os
import tempfile
from collections import OrderedDict
-from samba.compat import text_type
from samba.compat import get_string
from samba.netcmd import CommandError
@@ -505,7 +504,7 @@ class DCJoinContext(object):
v = [rec[a]]
else:
v = rec[a]
- v = [x.encode('utf8') if isinstance(x, text_type) else x for x in v]
+ v = [x.encode('utf8') if isinstance(x, str) else x for x in v]
rattr = ctx.tmp_samdb.dsdb_DsReplicaAttribute(ctx.tmp_samdb, a, v)
attrs.append(rattr)
diff --git a/python/samba/ms_schema.py b/python/samba/ms_schema.py
index 4946636cbd4..4b5c4a5df83 100644
--- a/python/samba/ms_schema.py
+++ b/python/samba/ms_schema.py
@@ -21,7 +21,6 @@ from __future__ import print_function
import re
import base64
import uuid
-from samba.compat import string_types
bitFields = {}
@@ -178,7 +177,7 @@ def fix_dn(dn):
def __convert_bitfield(key, value):
"""Evaluate the OR expression in 'value'"""
- assert(isinstance(value, string_types))
+ assert(isinstance(value, str))
value = value.replace("\n ", "")
value = value.replace(" ", "")
@@ -201,7 +200,7 @@ def __write_ldif_one(entry):
out = []
for l in entry:
- if isinstance(l[1], string_types):
+ if isinstance(l[1], str):
vl = [l[1]]
else:
vl = l[1]
@@ -254,7 +253,7 @@ def __transform_entry(entry, objectClass):
l[1] = oMObjectClassBER[l[1].strip()]
l[2] = True
- if isinstance(l[1], string_types):
+ if isinstance(l[1], str):
l[1] = fix_dn(l[1])
if key == 'dn':
diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py
index 8561188511e..238f3c306c1 100644
--- a/python/samba/netcmd/domain.py
+++ b/python/samba/netcmd/domain.py
@@ -101,7 +101,6 @@ from samba.provision.common import (
from samba.netcmd.pso import cmd_domain_passwordsettings_pso
from samba.netcmd.domain_backup import cmd_domain_backup
-from samba.compat import binary_type
from samba.compat import get_string
string_version_to_constant = {
@@ -536,7 +535,7 @@ class cmd_domain_provision(Command):
def _adminpass_issue(self, adminpass):
"""Returns error string for a bad administrator password,
or None if acceptable"""
- if isinstance(adminpass, binary_type):
+ if isinstance(adminpass, bytes):
adminpass = adminpass.decode('utf8')
if len(adminpass) < DEFAULT_MIN_PWD_LENGTH:
return "Administrator password does not meet the default minimum" \
diff --git a/python/samba/netcmd/user.py b/python/samba/netcmd/user.py
index 7d4464e2aa9..95c21f52a04 100644
--- a/python/samba/netcmd/user.py
+++ b/python/samba/netcmd/user.py
@@ -53,7 +53,6 @@ from samba.netcmd import (
SuperCommand,
Option,
)
-from samba.compat import text_type
from samba.compat import get_bytes
from samba.compat import get_string
from . import common
@@ -748,7 +747,7 @@ class cmd_user_password(Command):
self.outf.write("Sorry, passwords do not match.\n")
try:
- if not isinstance(password, text_type):
+ if not isinstance(password, str):
password = password.decode('utf8')
net.change_password(password)
except Exception as msg:
@@ -1283,7 +1282,7 @@ class GetPasswordCommand(Command):
def get_utf8(a, b, username):
try:
- u = text_type(get_bytes(b), 'utf-16-le')
+ u = str(get_bytes(b), 'utf-16-le')
except UnicodeDecodeError as e:
self.outf.write("WARNING: '%s': CLEARTEXT is invalid UTF-16-LE unable to generate %s\n" % (
username, a))
diff --git a/python/samba/netcmd/visualize.py b/python/samba/netcmd/visualize.py
index 3b99c6c6e02..45e62afbdc6 100644
--- a/python/samba/netcmd/visualize.py
+++ b/python/samba/netcmd/visualize.py
@@ -38,7 +38,6 @@ import time
import re
from samba.kcc import KCC, ldif_import_export
from samba.kcc.kcc_utils import KCCError
-from samba.compat import text_type
from samba.uptodateness import (
get_partition_maps,
get_partition,
@@ -198,7 +197,7 @@ def colour_hash(x):
given object."""
from hashlib import md5
tmp_str = str(x)
- if isinstance(tmp_str, text_type):
+ if isinstance(tmp_str, str):
tmp_str = tmp_str.encode('utf8')
c = int(md5(tmp_str).hexdigest()[:6], base=16) & 0x7f7f7f
return '#%06x' % c
diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py
index 3f176e00ba4..0706f39c581 100644
--- a/python/samba/provision/__init__.py
+++ b/python/samba/provision/__init__.py
@@ -27,8 +27,6 @@
__docformat__ = "restructuredText"
from urllib.parse import quote as urllib_quote
-from samba.compat import string_types
-from samba.compat import binary_type
from base64 import b64encode
import errno
import os
@@ -1606,7 +1604,7 @@ def fill_samdb(samdb, lp, names, logger, policyguid,
ntds_dn = "CN=NTDS Settings,%s" % names.serverdn
names.ntdsguid = samdb.searchone(basedn=ntds_dn,
attribute="objectGUID", expression="", scope=ldb.SCOPE_BASE).decode('utf8')
- assert isinstance(names.ntdsguid, string_types)
+ assert isinstance(names.ntdsguid, str)
return samdb
@@ -2014,7 +2012,7 @@ def provision_fill(samdb, secrets_ldb, logger, names, paths,
domainguid = samdb.searchone(basedn=samdb.get_default_basedn(),
attribute="objectGUID").decode('utf8')
- assert isinstance(domainguid, string_types)
+ assert isinstance(domainguid, str)
lastProvisionUSNs = get_last_provision_usn(samdb)
maxUSN = get_max_usn(samdb, str(names.rootdn))
@@ -2333,7 +2331,7 @@ def provision(logger, session_info, smbconf=None,
adminpass = samba.generate_random_password(12, 32)
adminpass_generated = True
else:
- if isinstance(adminpass, binary_type):
+ if isinstance(adminpass, bytes):
adminpass = adminpass.decode('utf-8')
adminpass_generated = False
diff --git a/python/samba/samdb.py b/python/samba/samdb.py
index d903babb406..6f5404e7f0a 100644
--- a/python/samba/samdb.py
+++ b/python/samba/samdb.py
@@ -32,8 +32,6 @@ from samba import dsdb, dsdb_dns
from samba.ndr import ndr_unpack, ndr_pack
from samba.dcerpc import drsblobs, misc
from samba.common import normalise_int32
-from samba.compat import text_type
-from samba.compat import binary_type
from samba.compat import get_bytes
from samba.dcerpc import security
@@ -773,7 +771,7 @@ member: %s
if len(res) > 1:
raise Exception('Matched %u multiple users with filter "%s"' % (len(res), search_filter))
user_dn = res[0].dn
- if not isinstance(password, text_type):
+ if not isinstance(password, str):
pw = password.decode('utf-8')
else:
pw = password
@@ -1098,7 +1096,7 @@ schemaUpdateNow: 1
return dn
def set_minPwdAge(self, value):
- if not isinstance(value, binary_type):
+ if not isinstance(value, bytes):
value = str(value).encode('utf8')
m = ldb.Message()
m.dn = ldb.Dn(self, self.domain_dn())
@@ -1115,7 +1113,7 @@ schemaUpdateNow: 1
return int(res[0]["minPwdAge"][0])
def set_maxPwdAge(self, value):
- if not isinstance(value, binary_type):
+ if not isinstance(value, bytes):
value = str(value).encode('utf8')
m = ldb.Message()
m.dn = ldb.Dn(self, self.domain_dn())
@@ -1132,7 +1130,7 @@ schemaUpdateNow: 1
return int(res[0]["maxPwdAge"][0])
def set_minPwdLength(self, value):
- if not isinstance(value, binary_type):
+ if not isinstance(value, bytes):
value = str(value).encode('utf8')
m = ldb.Message()
m.dn = ldb.Dn(self, self.domain_dn())
@@ -1149,7 +1147,7 @@ schemaUpdateNow: 1
return int(res[0]["minPwdLength"][0])
def set_pwdProperties(self, value):
- if not isinstance(value, binary_type):
+ if not isinstance(value, bytes):
value = str(value).encode('utf8')
m = ldb.Message()
m.dn = ldb.Dn(self, self.domain_dn())
diff --git a/python/samba/tests/__init__.py b/python/samba/tests/__init__.py
index 768231384d8..7f7e68d961c 100644
--- a/python/samba/tests/__init__.py
+++ b/python/samba/tests/__init__.py
@@ -34,8 +34,6 @@ import re
from enum import IntEnum, unique
import samba.auth
import samba.dcerpc.base
-from samba.compat import text_type
-from samba.compat import string_types
from random import randint
from random import SystemRandom
from contextlib import contextmanager
@@ -92,7 +90,7 @@ class TestCase(unittest.TestCase):
def hexdump(self, src):
N = 0
result = ''
- is_string = isinstance(src, string_types)
+ is_string = isinstance(src, str)
while src:
ll = src[:8]
lr = src[8:16]
diff --git a/python/samba/tests/auth_log_netlogon.py b/python/samba/tests/auth_log_netlogon.py
index 04bca03cc06..eabc4239a42 100644
--- a/python/samba/tests/auth_log_netlogon.py
+++ b/python/samba/tests/auth_log_netlogon.py
@@ -35,7 +35,6 @@ from samba.auth import system_session
from samba.tests import delete_force
from samba.dsdb import UF_WORKSTATION_TRUST_ACCOUNT, UF_PASSWD_NOTREQD
from samba.dcerpc.misc import SEC_CHAN_WKSTA
-from samba.compat import text_type
from samba.dcerpc.windows_event_ids import (
EVT_ID_SUCCESSFUL_LOGON,
EVT_LOGON_NETWORK
@@ -59,7 +58,7 @@ class AuthLogTestsNetLogon(samba.tests.auth_log_base.AuthLogTestBase):
self.base_dn = self.ldb.domain_dn()
self.dn = ("cn=%s,cn=users,%s" % (self.netbios_name, self.base_dn))
- utf16pw = text_type('"' + self.machinepass + '"').encode('utf-16-le')
+ utf16pw = ('"' + self.machinepass + '"').encode('utf-16-le')
self.ldb.add({
"dn": self.dn,
"objectclass": "computer",
diff --git a/python/samba/tests/auth_log_samlogon.py b/python/samba/tests/auth_log_samlogon.py
index 5999b9842ea..8e86c646a00 100644
--- a/python/samba/tests/auth_log_samlogon.py
+++ b/python/samba/tests/auth_log_samlogon.py
@@ -35,7 +35,6 @@ from samba.auth import system_session
from samba.tests import delete_force
from samba.dsdb import UF_WORKSTATION_TRUST_ACCOUNT, UF_PASSWD_NOTREQD
from samba.dcerpc.misc import SEC_CHAN_WKSTA
-from samba.compat import text_type
from samba.dcerpc.windows_event_ids import (
EVT_ID_SUCCESSFUL_LOGON,
EVT_LOGON_NETWORK
@@ -81,7 +80,7 @@ class AuthLogTestsSamLogon(samba.tests.auth_log_base.AuthLogTestBase):
else:
binding = "[schannel]"
- utf16pw = text_type('"' + self.machinepass + '"').encode('utf-16-le')
+ utf16pw = ('"' + self.machinepass + '"').encode('utf-16-le')
self.ldb.add({
"dn": self.samlogon_dn,
"objectclass": "computer",
diff --git a/python/samba/tests/blackbox/samba_dnsupdate.py b/python/samba/tests/blackbox/samba_dnsupdate.py
index 3e168bc00d9..4360f741217 100644
--- a/python/samba/tests/blackbox/samba_dnsupdate.py
+++ b/python/samba/tests/blackbox/samba_dnsupdate.py
@@ -17,7 +17,7 @@
#
import samba.tests
-from samba.compat import StringIO
+from io import StringIO
from samba.compat import get_string
from samba.netcmd.main import cmd_sambatool
from samba.credentials import Credentials
diff --git a/python/samba/tests/credentials.py b/python/samba/tests/credentials.py
index d2a81506de3..3df99ee783f 100644
--- a/python/samba/tests/credentials.py
+++ b/python/samba/tests/credentials.py
@@ -25,7 +25,6 @@ from samba import credentials
import samba.tests
import os
import binascii
-from samba.compat import PY3
from samba.dcerpc import misc
@@ -34,13 +33,6 @@ class CredentialsTests(samba.tests.TestCaseInTempDir):
def setUp(self):
super(CredentialsTests, self).setUp()
self.creds = credentials.Credentials()
- if PY3:
- # Because Python 2 does not support 'x' mode and Python 3
- # does not support 'wx' mode in open() function
- # for exclusive creation
- self.open_mode = 'x'
- else:
- self.open_mode = 'wx'
def test_set_username(self):
self.creds.set_username("somebody")
@@ -203,7 +195,7 @@ class CredentialsTests(samba.tests.TestCaseInTempDir):
username = "user"
passwd_file_name = os.path.join(self.tempdir, "parse_file")
- passwd_file_fd = open(passwd_file_name, self.open_mode)
+ passwd_file_fd = open(passwd_file_name, 'x')
passwd_file_fd.write("realm=%s\n" % realm)
passwd_file_fd.write("domain=%s\n" % domain)
passwd_file_fd.write("username=%s\n" % username)
@@ -226,7 +218,7 @@ class CredentialsTests(samba.tests.TestCaseInTempDir):
username = "user"
passwd_file_name = os.path.join(self.tempdir, "parse_file")
- passwd_file_fd = open(passwd_file_name, self.open_mode)
+ passwd_file_fd = open(passwd_file_name, 'x')
passwd_file_fd.write("realm=%s\n" % realm)
passwd_file_fd.write("domain=%s\n" % domain)
passwd_file_fd.write("username=%s\\%s\n" % (domain, username))
@@ -251,7 +243,7 @@ class CredentialsTests(samba.tests.TestCaseInTempDir):
userdom = "userdom"
passwd_file_name = os.path.join(self.tempdir, "parse_file")
- passwd_file_fd = open(passwd_file_name, self.open_mode)
+ passwd_file_fd = open(passwd_file_name, 'x')
passwd_file_fd.write("realm=%s\n" % realm)
passwd_file_fd.write("domain=%s\n" % domain)
passwd_file_fd.write("username=%s/%s\n" % (userdom, username))
@@ -274,7 +266,7 @@ class CredentialsTests(samba.tests.TestCaseInTempDir):
userdom = "userdom"
passwd_file_name = os.path.join(self.tempdir, "parse_file")
- passwd_file_fd = open(passwd_file_name, self.open_mode)
+ passwd_file_fd = open(passwd_file_name, 'x')
passwd_file_fd.write("username=%s\\%s%%%s\n" % (userdom, username, password))
passwd_file_fd.write("realm=ignorerealm\n")
passwd_file_fd.write("domain=ignoredomain\n")
@@ -297,7 +289,7 @@ class CredentialsTests(samba.tests.TestCaseInTempDir):
userdom = "userdom"
passwd_file_name = os.path.join(self.tempdir, "parse_file")
- passwd_file_fd = open(passwd_file_name, self.open_mode)
+ passwd_file_fd = open(passwd_file_name, 'x')
passwd_file_fd.write("realm=ignorerealm\n")
passwd_file_fd.write("username=%s\\%s%%%s\n" % (userdom, username, password))
passwd_file_fd.write("domain=ignoredomain\n")
diff --git a/python/samba/tests/dcerpc/raw_protocol.py b/python/samba/tests/dcerpc/raw_protocol.py
index f810cad3d2f..dc13d41c6a2 100755
--- a/python/samba/tests/dcerpc/raw_protocol.py
+++ b/python/samba/tests/dcerpc/raw_protocol.py
@@ -33,7 +33,6 @@ import samba.dcerpc.lsa
import struct
from samba import gensec
from samba.tests.dcerpc.raw_testcase import RawDCERPCTest
-from samba.compat import binary_type
--
Samba Shared Repository
More information about the samba-cvs
mailing list