diff options
author | Joe Guo <joeg@catalyst.net.nz> | 2018-07-30 18:18:03 +1200 |
---|---|---|
committer | Douglas Bagnall <dbagnall@samba.org> | 2018-08-24 07:49:28 +0200 |
commit | 32266d2d48c1c38e54bcfaf1cad36f09e9cff355 (patch) | |
tree | 2cd1a3ea1d5c789d770dc2ce18f488464907b5ca /source3 | |
parent | fb5ea356dd2dcf7651ff2b0fb861042ed828821c (diff) | |
download | samba-32266d2d48c1c38e54bcfaf1cad36f09e9cff355.tar.gz |
PEP8: fix E225: missing whitespace around operator
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Diffstat (limited to 'source3')
-rw-r--r-- | source3/build/charset.py | 12 | ||||
-rwxr-xr-x | source3/script/tests/test_wbinfo_sids2xids_int.py | 6 | ||||
-rwxr-xr-x | source3/selftest/tests.py | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/source3/build/charset.py b/source3/build/charset.py index 75981379577..1a23405448f 100644 --- a/source3/build/charset.py +++ b/source3/build/charset.py @@ -7,19 +7,19 @@ def CHECK_SAMBA3_CHARSET(conf, crossbuild=False): '''Check for default charsets for Samba3 ''' if conf.CHECK_ICONV(define='HAVE_NATIVE_ICONV'): - default_dos_charset=False - default_unix_charset=False + default_dos_charset = False + default_unix_charset = False # check for default dos charset name for charset in ['CP850', 'IBM850']: if conf.CHECK_CHARSET_EXISTS(charset, headers='iconv.h'): - default_dos_charset=charset + default_dos_charset = charset break # check for default unix charset name for charset in ['UTF-8', 'UTF8']: if conf.CHECK_CHARSET_EXISTS(charset, headers='iconv.h'): - default_unix_charset=charset + default_unix_charset = charset break # At this point, we have a libiconv candidate. We know that @@ -29,8 +29,8 @@ def CHECK_SAMBA3_CHARSET(conf, crossbuild=False): # deal, since we can't guarantee that the results we get now will # match the results we get at runtime anyway. if crossbuild: - default_dos_charset="CP850" - default_unix_charset="UTF-8" + default_dos_charset = "CP850" + default_unix_charset = "UTF-8" # TODO: this used to warn about the set charset on cross builds if default_dos_charset is False or default_unix_charset is False: diff --git a/source3/script/tests/test_wbinfo_sids2xids_int.py b/source3/script/tests/test_wbinfo_sids2xids_int.py index a460d8abce6..8e2be886c97 100755 --- a/source3/script/tests/test_wbinfo_sids2xids_int.py +++ b/source3/script/tests/test_wbinfo_sids2xids_int.py @@ -35,15 +35,15 @@ domsid = domsid.split(' ')[0] #print domain #print domsid -sids=[domsid + '-512', 'S-1-5-32-545', domsid + '-513', 'S-1-1-0', 'S-1-3-1', 'S-1-5-1'] +sids = [domsid + '-512', 'S-1-5-32-545', domsid + '-513', 'S-1-1-0', 'S-1-3-1', 'S-1-5-1'] flush_cache(sids=sids) sids2xids = subprocess.Popen([wbinfo, '--sids-to-unix-ids=' + ','.join(sids)], stdout=subprocess.PIPE).communicate()[0].strip() -gids=[] -uids=[] +gids = [] +uids = [] idtypes = [] for line in sids2xids.split('\n'): diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 393b0d9f60a..889d49dd405 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -209,13 +209,13 @@ for options in ["--option=clientntlmv2auth=no", "--option=clientusespnego=no --o plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) %s" % (env, options), env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$DC_USERNAME', '$DC_PASSWORD', smbclient3, configuration, options]) plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) %s member creds" % (env, options), env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$SERVER/$USERNAME', '$PASSWORD', smbclient3, configuration, options]) -env="ad_dc" +env = "ad_dc" plantestsuite("samba3.blackbox.smbspool", env, [os.path.join(samba3srcdir, "script/tests/test_smbspool.sh"), '$SERVER', '$SERVER_IP', '$DC_USERNAME', '$DC_PASSWORD', env]) for env in ["ad_member:local", "nt4_dc:local"]: plantestsuite("samba3.blackbox.smbpasswd", env, [os.path.join(samba3srcdir, "script/tests/test_smbpasswd.sh"), '$SERVER', '$SERVER_IP', '$DC_USERNAME', '$DC_PASSWORD']) -env="nt4_dc" +env = "nt4_dc" plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) ipv6" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IPV6', '$SERVER/$USERNAME', '$PASSWORD', smbclient3, configuration]) for env in ["nt4_member", "ad_member"]: @@ -432,7 +432,7 @@ libsmbclient = ["libsmbclient"] vfs = ["vfs.fruit", "vfs.acl_xattr", "vfs.fruit_netatalk", "vfs.fruit_file_id", "vfs.fruit_timemachine"] -tests= base + raw + smb2 + rpc + unix + local + rap + nbt + libsmbclient + idmap + vfs +tests = base + raw + smb2 + rpc + unix + local + rap + nbt + libsmbclient + idmap + vfs for t in tests: if t == "base.delaywrite" or t == "base.deny1" or t == "base.deny2": |