-
-
Notifications
You must be signed in to change notification settings - Fork 21.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
SCons: Format buildsystem files with psf/black
Configured for a max line length of 120 characters. psf/black is very opinionated and purposely doesn't leave much room for configuration. The output is mostly OK so that should be fine for us, but some things worth noting: - Manually wrapped strings will be reflowed, so by using a line length of 120 for the sake of preserving readability for our long command calls, it also means that some manually wrapped strings are back on the same line and should be manually merged again. - Code generators using string concatenation extensively look awful, since black puts each operand on a single line. We need to refactor these generators to use more pythonic string formatting, for which many options are available (`%`, `format` or f-strings). - CI checks and a pre-commit hook will be added to ensure that future buildsystem changes are well-formatted. (cherry picked from commit cd4e46e)
- Loading branch information
Showing
189 changed files
with
4,095 additions
and
3,360 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,68 +1,90 @@ | ||
| import sys | ||
|
|
||
| if sys.version_info < (3,): | ||
|
|
||
| def isbasestring(s): | ||
| return isinstance(s, basestring) | ||
|
|
||
| def open_utf8(filename, mode): | ||
| return open(filename, mode) | ||
|
|
||
| def byte_to_str(x): | ||
| return str(ord(x)) | ||
|
|
||
| import cStringIO | ||
|
|
||
| def StringIO(): | ||
| return cStringIO.StringIO() | ||
|
|
||
| def encode_utf8(x): | ||
| return x | ||
|
|
||
| def decode_utf8(x): | ||
| return x | ||
|
|
||
| def iteritems(d): | ||
| return d.iteritems() | ||
|
|
||
| def itervalues(d): | ||
| return d.itervalues() | ||
|
|
||
| def escape_string(s): | ||
| if isinstance(s, unicode): | ||
| s = s.encode('ascii') | ||
| result = '' | ||
| s = s.encode("ascii") | ||
| result = "" | ||
| for c in s: | ||
| if not (32 <= ord(c) < 127) or c in ('\\', '"'): | ||
| result += '\\%03o' % ord(c) | ||
| if not (32 <= ord(c) < 127) or c in ("\\", '"'): | ||
| result += "\\%03o" % ord(c) | ||
| else: | ||
| result += c | ||
| return result | ||
|
|
||
|
|
||
| else: | ||
|
|
||
| def isbasestring(s): | ||
| return isinstance(s, (str, bytes)) | ||
|
|
||
| def open_utf8(filename, mode): | ||
| return open(filename, mode, encoding="utf-8") | ||
|
|
||
| def byte_to_str(x): | ||
| return str(x) | ||
|
|
||
| import io | ||
|
|
||
| def StringIO(): | ||
| return io.StringIO() | ||
|
|
||
| import codecs | ||
|
|
||
| def encode_utf8(x): | ||
| return codecs.utf_8_encode(x)[0] | ||
|
|
||
| def decode_utf8(x): | ||
| return codecs.utf_8_decode(x)[0] | ||
|
|
||
| def iteritems(d): | ||
| return iter(d.items()) | ||
|
|
||
| def itervalues(d): | ||
| return iter(d.values()) | ||
|
|
||
| def charcode_to_c_escapes(c): | ||
| rev_result = [] | ||
| while c >= 256: | ||
| c, low = (c // 256, c % 256) | ||
| rev_result.append('\\%03o' % low) | ||
| rev_result.append('\\%03o' % c) | ||
| return ''.join(reversed(rev_result)) | ||
| rev_result.append("\\%03o" % low) | ||
| rev_result.append("\\%03o" % c) | ||
| return "".join(reversed(rev_result)) | ||
|
|
||
| def escape_string(s): | ||
| result = '' | ||
| result = "" | ||
| if isinstance(s, str): | ||
| s = s.encode('utf-8') | ||
| s = s.encode("utf-8") | ||
| for c in s: | ||
| if not(32 <= c < 127) or c in (ord('\\'), ord('"')): | ||
| if not (32 <= c < 127) or c in (ord("\\"), ord('"')): | ||
| result += charcode_to_c_escapes(c) | ||
| else: | ||
| result += chr(c) | ||
| return result | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| #!/usr/bin/env python | ||
|
|
||
| Import('env') | ||
| Import("env") | ||
|
|
||
| env.add_source_files(env.core_sources, "*.cpp") |
Oops, something went wrong.