summaryrefslogtreecommitdiffstats
path: root/buildtools
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2014-06-02 02:53:01 +0200
committerAndrew Bartlett <abartlet@samba.org>2014-10-14 06:44:06 +0200
commit0c2408531709eb720a2e96f72afbc2ecbfe6b06d (patch)
tree119c0fdcd4da3f53f32a77f2e0389057e1ca9030 /buildtools
parent9a014d265b4e134fb5cea12aaca88ba5eb91cc05 (diff)
downloadsamba-0c2408531709eb720a2e96f72afbc2ecbfe6b06d.tar.gz
samba-0c2408531709eb720a2e96f72afbc2ecbfe6b06d.tar.xz
samba-0c2408531709eb720a2e96f72afbc2ecbfe6b06d.zip
Fix more pep8 issues in code I touched recently.
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Change-Id: I35f3204bdf5d00b3280d703427ded2fa2163a6f7
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/wafsamba/samba3.py9
-rw-r--r--buildtools/wafsamba/wafsamba.py3
2 files changed, 7 insertions, 5 deletions
diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py
index 571954de16..ffe678416e 100644
--- a/buildtools/wafsamba/samba3.py
+++ b/buildtools/wafsamba/samba3.py
@@ -6,16 +6,17 @@ from optparse import SUPPRESS_HELP
from samba_utils import os_path_relpath, TO_LIST
from samba_autoconf import library_flags
+
def SAMBA3_ADD_OPTION(opt, option, help=(), dest=None, default=True,
with_name="with", without_name="without"):
if default is None:
- default_str="auto"
+ default_str = "auto"
elif default is True:
- default_str="yes"
+ default_str = "yes"
elif default is False:
- default_str="no"
+ default_str = "no"
else:
- default_str=str(default)
+ default_str = str(default)
if help == ():
help = ("Build with %s support (default=%s)" % (option, default_str))
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index b36b47bbcb..b68b9d2dbf 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -726,7 +726,8 @@ 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"] is 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)