mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-03-01 12:56:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #444 from Carreau/strip-ansi

Browse Source 
Strip more ANSI escape sequence.
This commit is contained in:
Min RK 2015-09-17 11:18:04 +02:00
commit 2f0f3987b1
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
notebook/static/base/js/utils.js
View File

@ -348,7 +348,7 @@ define([
// Strip all ANSI codes that are not color related. Matches // Strip all ANSI codes that are not color related. Matches
// all ANSI codes that do not end with "m". // all ANSI codes that do not end with "m".
var ignored_re = /(?=(\033\[[\d;=]*[a-ln-zA-Z]{1}))\1(?!m)/g; var ignored_re = /(?=(\033\[[?\d;=]*[a-ln-zA-Z]{1}))\1(?!m)/g;
txt = txt.replace(ignored_re, ""); txt = txt.replace(ignored_re, "");
// color ansi codes // color ansi codes

3
notebook/tests/base/utils.js
View File

@ -1,10 +1,12 @@
casper.notebook_test(function () { casper.notebook_test(function () {
// Note, \033 is the octal notation of \u001b
var input = [ var input = [
"\033[0m[\033[0minfo\033[0m] \033[0mtext\033[0m", "\033[0m[\033[0minfo\033[0m] \033[0mtext\033[0m",
"\033[0m[\033[33mwarn\033[0m] \033[0m\tmore text\033[0m", "\033[0m[\033[33mwarn\033[0m] \033[0m\tmore text\033[0m",
"\033[0m[\033[33mwarn\033[0m] \033[0m https://some/url/to/a/file.ext\033[0m", "\033[0m[\033[33mwarn\033[0m] \033[0m https://some/url/to/a/file.ext\033[0m",
"\033[0m[\033[31merror\033[0m] \033[0m\033[0m", "\033[0m[\033[31merror\033[0m] \033[0m\033[0m",
"\033[0m[\033[31merror\033[0m] \033[0m\teven more text\033[0m", "\033[0m[\033[31merror\033[0m] \033[0m\teven more text\033[0m",
"\u001b[?25hBuilding wheels for collected packages: scipy",
"\033[0m[\033[31merror\033[0m] \033[0m\t\tand more more text\033[0m"].join("\n"); "\033[0m[\033[31merror\033[0m] \033[0m\t\tand more more text\033[0m"].join("\n");
var output = [ var output = [
@ -13,6 +15,7 @@ casper.notebook_test(function () {
"[<span class=\"ansiyellow\">warn</span>] https://some/url/to/a/file.ext", "[<span class=\"ansiyellow\">warn</span>] https://some/url/to/a/file.ext",
"[<span class=\"ansired\">error</span>] ", "[<span class=\"ansired\">error</span>] ",
"[<span class=\"ansired\">error</span>] \teven more text", "[<span class=\"ansired\">error</span>] \teven more text",
"Building wheels for collected packages: scipy",
"[<span class=\"ansired\">error</span>] \t\tand more more text"].join("\n"); "[<span class=\"ansired\">error</span>] \t\tand more more text"].join("\n");
var result = this.evaluate(function (input) { var result = this.evaluate(function (input) {