diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/patman/cros_subprocess.py | 4 | ||||
| -rw-r--r-- | tools/patman/gitutil.py | 4 | ||||
| -rw-r--r-- | tools/patman/series.py | 2 | ||||
| -rw-r--r-- | tools/patman/terminal.py | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/tools/patman/cros_subprocess.py b/tools/patman/cros_subprocess.py index 0f0d60dfb7..efd0a5aaf7 100644 --- a/tools/patman/cros_subprocess.py +++ b/tools/patman/cros_subprocess.py @@ -6,11 +6,11 @@ # Licensed to PSF under a Contributor Agreement. # See http://www.python.org/2.4/license for licensing details. -"""Subprocress execution +"""Subprocess execution This module holds a subclass of subprocess.Popen with our own required features, mainly that we get access to the subprocess output while it -is running rather than just at the end. This makes it easiler to show +is running rather than just at the end. This makes it easier to show progress information and filter output in real time. """ diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py index dce7fa25b6..a2a225c6b9 100644 --- a/tools/patman/gitutil.py +++ b/tools/patman/gitutil.py @@ -23,7 +23,7 @@ def LogCmd(commit_range, git_dir=None, oneline=False, reverse=False, Args: commit_range: Range expression to use for log, None for none - git_dir: Path to git repositiory (None to use default) + git_dir: Path to git repository (None to use default) oneline: True to use --oneline, else False reverse: True to reverse the log (--reverse) count: Number of commits to list, or None for no limit @@ -166,7 +166,7 @@ def CountCommitsInRange(git_dir, range_expr): git_dir: Directory containing git repo range_expr: Range to check Return: - Number of patches that exist in the supplied rangem or None if none + Number of patches that exist in the supplied range or None if none were found """ pipe = [LogCmd(range_expr, git_dir=git_dir, oneline=True)] diff --git a/tools/patman/series.py b/tools/patman/series.py index 02a1113ad0..a15f7625ed 100644 --- a/tools/patman/series.py +++ b/tools/patman/series.py @@ -251,7 +251,7 @@ class Series(dict): cover_cc = [tools.FromUnicode(m) for m in cover_cc] cc_list = '\0'.join([tools.ToUnicode(x) for x in sorted(set(cover_cc + all_ccs))]) - print(cover_fname, cc_list.encode('utf-8'), file=fd) + print(cover_fname, cc_list, file=fd) fd.close() return fname diff --git a/tools/patman/terminal.py b/tools/patman/terminal.py index 4ceab189bf..7a3b658b00 100644 --- a/tools/patman/terminal.py +++ b/tools/patman/terminal.py @@ -128,7 +128,7 @@ class Color(object): return '' def Stop(self): - """Retruns a stop color code. + """Returns a stop color code. Returns: If color is enabled, returns an ANSI color reset sequence, |