diff options
| author | setrofim <setrofim@gmail.com> | 2017-10-10 08:37:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-10 08:37:08 +0100 |
| commit | dc453ad8916cfb914c9dafaad8b0b440d3a4b443 (patch) | |
| tree | c254eab4c01cf60f6d0a42e75d96b8d4fa674fe2 | |
| parent | b0457f7ed75e9717fc2dcb4a1540a25315eb81e7 (diff) | |
| parent | 1072a1a9f0fd9594e2259ea37b52fe07f6d81f8f (diff) | |
| download | devlib-dc453ad8916cfb914c9dafaad8b0b440d3a4b443.tar.gz | |
Merge pull request #184 from setrofim/master
ANSI escape sequences stripping fixes for gem5
| -rw-r--r-- | devlib/utils/misc.py | 4 | ||||
| -rw-r--r-- | devlib/utils/ssh.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/devlib/utils/misc.py b/devlib/utils/misc.py index 8cfd59f..9565f47 100644 --- a/devlib/utils/misc.py +++ b/devlib/utils/misc.py @@ -474,8 +474,8 @@ def which(name): return None -_bash_color_regex = re.compile('\x1b\\[[0-9;]+m') - +# This matches most ANSI escape sequences, not just colors +_bash_color_regex = re.compile(r'\x1b\[[0-9;]*[a-zA-Z]') def strip_bash_colors(text): return _bash_color_regex.sub('', text) diff --git a/devlib/utils/ssh.py b/devlib/utils/ssh.py index aaab2dd..27c52d2 100644 --- a/devlib/utils/ssh.py +++ b/devlib/utils/ssh.py @@ -444,7 +444,7 @@ class Gem5Connection(TelnetConnection): self._check_ready() result = self._gem5_shell("ls {}".format(source)) - files = result.split() + files = strip_bash_colors(result).split() for filename in files: dest_file = os.path.basename(filename) |