diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-python/ansi2html/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.xz |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-python/ansi2html/files')
-rw-r--r-- | dev-python/ansi2html/files/ansi2html-0.9.1-fix-0-control-code.patch | 28 | ||||
-rw-r--r-- | dev-python/ansi2html/files/ansi2html-0.9.1-fix-sys-argv-in-tests.patch | 27 |
2 files changed, 55 insertions, 0 deletions
diff --git a/dev-python/ansi2html/files/ansi2html-0.9.1-fix-0-control-code.patch b/dev-python/ansi2html/files/ansi2html-0.9.1-fix-0-control-code.patch new file mode 100644 index 00000000000..6e51d3f1d97 --- /dev/null +++ b/dev-python/ansi2html/files/ansi2html-0.9.1-fix-0-control-code.patch @@ -0,0 +1,28 @@ +From f4371f16fd9ba9bffdd32a877b32f78222aef87c Mon Sep 17 00:00:00 2001 +From: Corentin Chary <corentin.chary@gmail.com> +Date: Sun, 22 Jul 2012 09:25:15 +0200 +Subject: [PATCH 3/3] The 0 control code could be at the end of a sequence + +Example: u"\x1b[32;01m * \x1b[39;49;00m *" +Note that here 39 and 49 "reset to default" codes are still +not handled. +--- + ansi2html/converter.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ansi2html/converter.py b/ansi2html/converter.py +index 0609a9e..23be2d0 100755 +--- a/ansi2html/converter.py ++++ b/ansi2html/converter.py +@@ -147,7 +147,7 @@ class Ansi2HTMLConverter(object): + if params[0] in [38, 48]: + params = ["%i-%i" % (params[0], params[2])] + params[3:] + +- if params == [0]: ++ if 0 in params: + # If the control code 0 is present, close all tags we've + # opened so far. i.e. reset all attributes + yield '</span>' * n_open +-- +1.7.9.5 + diff --git a/dev-python/ansi2html/files/ansi2html-0.9.1-fix-sys-argv-in-tests.patch b/dev-python/ansi2html/files/ansi2html-0.9.1-fix-sys-argv-in-tests.patch new file mode 100644 index 00000000000..9e8fbe38c0f --- /dev/null +++ b/dev-python/ansi2html/files/ansi2html-0.9.1-fix-sys-argv-in-tests.patch @@ -0,0 +1,27 @@ +From d70863b135d959a6e79cf3019700cac302336abe Mon Sep 17 00:00:00 2001 +From: Corentin Chary <corentin.chary@gmail.com> +Date: Sun, 22 Jul 2012 09:24:52 +0200 +Subject: [PATCH 2/3] Always patch sys.argv when calling main() + +--- + tests/test_ansi2html.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/test_ansi2html.py b/tests/test_ansi2html.py +index 00b794f..c961859 100644 +--- a/tests/test_ansi2html.py ++++ b/tests/test_ansi2html.py +@@ -45,8 +45,9 @@ class TestAnsi2HTML(unittest.TestCase): + actual = html[idx].strip() + self.assertEqual(expected, actual) + ++ @patch("sys.argv", new_callable=lambda: ["ansi2html"]) + @patch("sys.stdout", new_callable=six.StringIO) +- def test_conversion_as_command(self, mock_stdout): ++ def test_conversion_as_command(self, mock_stdout, mock_argv): + with open(join(_here, "ansicolor.txt"), "rb") as input: + test_data = "".join(read_to_unicode(input)) + +-- +1.7.9.5 + |