summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2014-06-02 02:36:13 +0200
committerAndrew Bartlett <abartlet@samba.org>2014-10-14 06:44:06 +0200
commitbd6faaf56a6237874cc84ddb8be0f09a9b742a54 (patch)
treee6fa05fda6d7cb4747937e4c05b8ff0a166012d6
parentb605d152de80889925c7b7a3e723a3581fe5e21a (diff)
downloadsamba-bd6faaf56a6237874cc84ddb8be0f09a9b742a54.tar.gz
samba-bd6faaf56a6237874cc84ddb8be0f09a9b742a54.tar.xz
samba-bd6faaf56a6237874cc84ddb8be0f09a9b742a54.zip
Remove last instances of pep8 error E712 (use 'is' rather than '==' for booleans)
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Change-Id: I43b394a6225b4c2049d979fda75548c82d781f67
-rw-r--r--buildtools/wafsamba/samba3.py4
-rw-r--r--buildtools/wafsamba/wafsamba.py6
-rwxr-xr-xsource4/scripting/bin/samba_upgradeprovision2
3 files changed, 6 insertions, 6 deletions
diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py
index 64cd8c7453..571954de16 100644
--- a/buildtools/wafsamba/samba3.py
+++ b/buildtools/wafsamba/samba3.py
@@ -10,9 +10,9 @@ def SAMBA3_ADD_OPTION(opt, option, help=(), dest=None, default=True,
with_name="with", without_name="without"):
if default is None:
default_str="auto"
- elif default == True:
+ elif default is True:
default_str="yes"
- elif default == False:
+ elif default is False:
default_str="no"
else:
default_str=str(default)
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index f86ac61d8a..b36b47bbcb 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -349,10 +349,10 @@ def SAMBA_BINARY(bld, binname, source,
# only specify PIE flags for binaries
pie_cflags = cflags
pie_ldflags = TO_LIST(ldflags)
- if bld.env['ENABLE_PIE'] == True:
+ if bld.env['ENABLE_PIE'] is True:
pie_cflags += ' -fPIE'
pie_ldflags.extend(TO_LIST('-pie'))
- if bld.env['ENABLE_RELRO'] == True:
+ if bld.env['ENABLE_RELRO'] is True:
pie_ldflags.extend(TO_LIST('-Wl,-z,relro,-z,now'))
# first create a target for building the object files for this binary
@@ -726,7 +726,7 @@ sys.path.insert(1, "%s")""" % (task.env["PYTHONARCHDIR"], task.env["PYTHONDIR"])
lineno = 0
for line in source_file:
newline = line
- if lineno == 0 and task.env["PYTHON_SPECIFIED"] == True and line[:2] == "#!":
+ if lineno == 0 and task.env["PYTHON_SPECIFIED"] is True and line[:2] == "#!":
newline = replacement_shebang
elif pattern in line:
newline = line.replace(pattern, replacement)
diff --git a/source4/scripting/bin/samba_upgradeprovision b/source4/scripting/bin/samba_upgradeprovision
index c4a0f79329..1893d03eea 100755
--- a/source4/scripting/bin/samba_upgradeprovision
+++ b/source4/scripting/bin/samba_upgradeprovision
@@ -1786,7 +1786,7 @@ if __name__ == '__main__':
# as we are assured that on this DNs we will have differences !
# Also the check must be done in a clever way as for the moment we just
# compare SDDL
- if dnNotToRecalculateFound == False and (opts.debugchangesd or opts.debugall):
+ if dnNotToRecalculateFound is False and (opts.debugchangesd or opts.debugall):
message(CHANGESD, "Checking recalculated SDs")
check_updated_sd(new_ldbs.sam, ldbs.sam, names)