diff options
author | Alexander Bokovoy <ab@samba.org> | 2018-01-31 11:48:43 +0200 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2018-09-05 06:37:22 +0200 |
commit | 4e65b33c1d40bb2c243f775f388056aed31d8671 (patch) | |
tree | 5a41b6ddef7ce1c0b6a93bcc16ef89da10f080e8 /third_party/waf/waflib/extras/review.py | |
parent | faef27506977db01cc4619140a71652463914378 (diff) | |
download | samba-4e65b33c1d40bb2c243f775f388056aed31d8671.tar.gz |
third_party:waf: update to upstream 2.0.4 release
Update third_party/waf/ to 2.0.4 to bring us closer to Python 3
This change requires a number of changes in buildtools/ too.
Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'third_party/waf/waflib/extras/review.py')
-rw-r--r-- | third_party/waf/waflib/extras/review.py | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/third_party/waf/waflib/extras/review.py b/third_party/waf/waflib/extras/review.py index 34796cb6236..8d167c15e13 100644 --- a/third_party/waf/waflib/extras/review.py +++ b/third_party/waf/waflib/extras/review.py @@ -1,3 +1,7 @@ +#! /usr/bin/env python +# encoding: utf-8 +# WARNING! Do not edit! https://waf.io/book/index.html#_obtaining_the_waf_file + #!/usr/bin/env python # encoding: utf-8 # Laurent Birtz, 2011 @@ -242,7 +246,8 @@ class ReviewContext(Context.Context): """ Return true if the review sets specified are equal. """ - if len(set1.keys()) != len(set2.keys()): return False + if len(set1.keys()) != len(set2.keys()): + return False for key in set1.keys(): if not key in set2 or set1[key] != set2[key]: return False @@ -259,7 +264,8 @@ class ReviewContext(Context.Context): name = ", ".join(opt._short_opts + opt._long_opts) help = opt.help actual = None - if dest in review_set: actual = review_set[dest] + if dest in review_set: + actual = review_set[dest] default = review_defaults[dest] lines.append(self.format_option(name, help, actual, default, term_width)) return "Configuration:\n\n" + "\n\n".join(lines) + "\n" @@ -278,7 +284,8 @@ class ReviewContext(Context.Context): w = textwrap.TextWrapper() w.width = term_width - 1 - if w.width < 60: w.width = 60 + if w.width < 60: + w.width = 60 out = "" @@ -319,3 +326,4 @@ def new_configure_execute(self): old_configure_execute(self) Context.create_context('review').store_review_set(new_review_set) Configure.ConfigurationContext.execute = new_configure_execute + |