All of lore.kernel.org
 help / color / mirror / Atom feed
From: Simon Glass <sjg@chromium.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v9 02/14] patman: Fix indentation in terminal.py
Date: Mon, 25 Aug 2014 09:58:23 -0600	[thread overview]
Message-ID: <1408982315-18610-3-git-send-email-sjg@chromium.org> (raw)
In-Reply-To: <1408982315-18610-1-git-send-email-sjg@chromium.org>

This code came from a different project with 2-character indentation. Fix
it for U-Boot.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

Changes in v9: None
Changes in v8: None
Changes in v7: None
Changes in v6:
- Add new patch to fix indentation in teminal.py

Changes in v5: None

 tools/patman/terminal.py | 108 ++++++++++++++++++++++++-----------------------
 1 file changed, 55 insertions(+), 53 deletions(-)

diff --git a/tools/patman/terminal.py b/tools/patman/terminal.py
index 597d526..11f80d8 100644
--- a/tools/patman/terminal.py
+++ b/tools/patman/terminal.py
@@ -15,66 +15,68 @@ import sys
 COLOR_IF_TERMINAL, COLOR_ALWAYS, COLOR_NEVER = range(3)
 
 class Color(object):
-  """Conditionally wraps text in ANSI color escape sequences."""
-  BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = range(8)
-  BOLD = -1
-  BRIGHT_START = '\033[1;%dm'
-  NORMAL_START = '\033[22;%dm'
-  BOLD_START = '\033[1m'
-  RESET = '\033[0m'
+    """Conditionally wraps text in ANSI color escape sequences."""
+    BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = range(8)
+    BOLD = -1
+    BRIGHT_START = '\033[1;%dm'
+    NORMAL_START = '\033[22;%dm'
+    BOLD_START = '\033[1m'
+    RESET = '\033[0m'
 
-  def __init__(self, colored=COLOR_IF_TERMINAL):
-    """Create a new Color object, optionally disabling color output.
+    def __init__(self, colored=COLOR_IF_TERMINAL):
+        """Create a new Color object, optionally disabling color output.
 
-    Args:
-      enabled: True if color output should be enabled. If False then this
-        class will not add color codes at all.
-    """
-    self._enabled = (colored == COLOR_ALWAYS or
-        (colored == COLOR_IF_TERMINAL and os.isatty(sys.stdout.fileno())))
+        Args:
+          enabled: True if color output should be enabled. If False then this
+            class will not add color codes at all.
+        """
+        self._enabled = (colored == COLOR_ALWAYS or
+            (colored == COLOR_IF_TERMINAL and os.isatty(sys.stdout.fileno())))
 
-  def Start(self, color, bright=True):
-    """Returns a start color code.
+    def Start(self, color, bright=True):
+        """Returns a start color code.
 
-    Args:
-      color: Color to use, .e.g BLACK, RED, etc.
+        Args:
+          color: Color to use, .e.g BLACK, RED, etc.
 
-    Returns:
-      If color is enabled, returns an ANSI sequence to start the given color,
-      otherwise returns empty string
-    """
-    if self._enabled:
-        base = self.BRIGHT_START if bright else self.NORMAL_START
-        return base % (color + 30)
-    return ''
+        Returns:
+          If color is enabled, returns an ANSI sequence to start the given
+          color, otherwise returns empty string
+        """
+        if self._enabled:
+            base = self.BRIGHT_START if bright else self.NORMAL_START
+            return base % (color + 30)
+        return ''
 
-  def Stop(self):
-    """Retruns a stop color code.
+    def Stop(self):
+        """Retruns a stop color code.
 
-    Returns:
-      If color is enabled, returns an ANSI color reset sequence, otherwise
-      returns empty string
-    """
-    if self._enabled:
-        return self.RESET
-    return ''
+        Returns:
+          If color is enabled, returns an ANSI color reset sequence,
+          otherwise returns empty string
+        """
+        if self._enabled:
+            return self.RESET
+        return ''
 
-  def Color(self, color, text, bright=True):
-    """Returns text with conditionally added color escape sequences.
+    def Color(self, color, text, bright=True):
+        """Returns text with conditionally added color escape sequences.
 
-    Keyword arguments:
-      color: Text color -- one of the color constants defined in this class.
-      text: The text to color.
+        Keyword arguments:
+          color: Text color -- one of the color constants defined in this
+                  class.
+          text: The text to color.
 
-    Returns:
-      If self._enabled is False, returns the original text. If it's True,
-      returns text with color escape sequences based on the value of color.
-    """
-    if not self._enabled:
-        return text
-    if color == self.BOLD:
-        start = self.BOLD_START
-    else:
-        base = self.BRIGHT_START if bright else self.NORMAL_START
-        start = base % (color + 30)
-    return start + text + self.RESET
+        Returns:
+          If self._enabled is False, returns the original text. If it's True,
+          returns text with color escape sequences based on the value of
+          color.
+        """
+        if not self._enabled:
+            return text
+        if color == self.BOLD:
+            start = self.BOLD_START
+        else:
+            base = self.BRIGHT_START if bright else self.NORMAL_START
+            start = base % (color + 30)
+        return start + text + self.RESET
-- 
2.1.0.rc2.206.gedb03e5

  parent reply	other threads:[~2014-08-25 15:58 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-25 15:58 [U-Boot] [PATCH v9 0/14] Add some missing buildman features and deprecate MAKEALL Simon Glass
2014-08-25 15:58 ` [U-Boot] [PATCH v9 01/14] patman: Support the 'reverse' option for 'git log' Simon Glass
2014-08-25 15:58 ` Simon Glass [this message]
2014-08-25 15:58 ` [U-Boot] [PATCH v9 03/14] patman: Correct unit tests to run correctly Simon Glass
2014-08-25 15:58 ` [U-Boot] [PATCH v9 04/14] patman: Remove the -a option Simon Glass
2014-08-25 15:58 ` [U-Boot] [PATCH v9 05/14] patman: Use --no-pager' to stop git from forking a pager Simon Glass
2014-08-25 15:58 ` [U-Boot] [PATCH v9 06/14] patman: Avoid changing the order of tags Simon Glass
2014-08-25 15:58 ` [U-Boot] [PATCH v9 07/14] buildman: Set the return code to indicate build result Simon Glass
2014-08-25 15:58 ` [U-Boot] [PATCH v9 08/14] buildman: Allow make-flags variables to include '-' and '_' Simon Glass
2014-08-25 15:58 ` [U-Boot] [PATCH v9 09/14] buildman: Implement an option to exclude boards from the build Simon Glass
2014-08-25 15:58 ` [U-Boot] [PATCH v9 10/14] buildman: Remove the directory prefix from each error line Simon Glass
2014-08-26 14:13   ` Tom Rini
2014-08-27  3:00     ` Simon Glass
2014-08-25 15:58 ` [U-Boot] [PATCH v9 11/14] buildman: Add an option to show which boards caused which errors Simon Glass
2014-08-25 19:14   ` Tom Rini
2014-08-26 14:09     ` Tom Rini
2014-08-27  2:59     ` Simon Glass
2014-08-28 12:51       ` Tom Rini
2014-09-01  5:09         ` Simon Glass
2014-09-01 11:23           ` Tom Rini
2014-09-02  0:18             ` Simon Glass
2014-08-25 15:58 ` [U-Boot] [PATCH v9 12/14] buildman: Separate out display of warnings and errors Simon Glass
2014-08-25 15:58 ` [U-Boot] [PATCH v9 13/14] patman: Fix detection of git version Simon Glass
2014-08-25 15:58 ` [U-Boot] [PATCH v9 14/14] RFC: Deprecate MAKEALL Simon Glass
2014-08-25 18:54 ` [U-Boot] [PATCH v9 0/14] Add some missing buildman features and deprecate MAKEALL Tom Rini
2014-08-25 19:00   ` Simon Glass
2014-08-25 20:21     ` Tom Rini
2014-08-27  2:54       ` Simon Glass
2014-08-28 12:48         ` Tom Rini
2014-09-01  5:07           ` Simon Glass
2014-09-04 18:25             ` Simon Glass

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1408982315-18610-3-git-send-email-sjg@chromium.org \
    --to=sjg@chromium.org \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.