diff options
author | Corentin Chary <iksaif@gentoo.org> | 2012-07-22 07:37:10 +0000 |
---|---|---|
committer | Corentin Chary <iksaif@gentoo.org> | 2012-07-22 07:37:10 +0000 |
commit | 0f506e3609f070b0069563620243873bc318d713 (patch) | |
tree | 7c5251b8e2920d198029d887e355285f8bc72f5f /dev-python/ansi2html | |
parent | Remove old versions. (diff) | |
download | gentoo-2-0f506e3609f070b0069563620243873bc318d713.tar.gz gentoo-2-0f506e3609f070b0069563620243873bc318d713.tar.bz2 gentoo-2-0f506e3609f070b0069563620243873bc318d713.zip |
New ebuild for ansi2html.
(Portage version: 2.1.11.7/cvs/Linux x86_64)
Diffstat (limited to 'dev-python/ansi2html')
-rw-r--r-- | dev-python/ansi2html/ChangeLog | 10 | ||||
-rw-r--r-- | dev-python/ansi2html/ansi2html-0.9.1.ebuild | 44 | ||||
-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 | ||||
-rw-r--r-- | dev-python/ansi2html/metadata.xml | 13 |
5 files changed, 122 insertions, 0 deletions
diff --git a/dev-python/ansi2html/ChangeLog b/dev-python/ansi2html/ChangeLog new file mode 100644 index 000000000000..d6fd819087cf --- /dev/null +++ b/dev-python/ansi2html/ChangeLog @@ -0,0 +1,10 @@ +# ChangeLog for dev-python/ansi2html +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/ansi2html/ChangeLog,v 1.1 2012/07/22 07:37:10 iksaif Exp $ + +*ansi2html-0.9.1 (22 Jul 2012) + + 22 Jul 2012; Corentin Chary <iksaif@gentoo.org> +ansi2html-0.9.1.ebuild, + +files/ansi2html-0.9.1-fix-0-control-code.patch, + +files/ansi2html-0.9.1-fix-sys-argv-in-tests.patch, +metadata.xml: + New ebuild for ansi2html. diff --git a/dev-python/ansi2html/ansi2html-0.9.1.ebuild b/dev-python/ansi2html/ansi2html-0.9.1.ebuild new file mode 100644 index 000000000000..b97225cf2b80 --- /dev/null +++ b/dev-python/ansi2html/ansi2html-0.9.1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/ansi2html/ansi2html-0.9.1.ebuild,v 1.1 2012/07/22 07:37:10 iksaif Exp $ + +EAPI="4" + +# ordereddict is need for < 2.7, but it's not packaged (yet) +PYTHON_DEPEND="*:2.7" +SUPPORT_PYTHON_ABIS="1" +DISTUTILS_SRC_TEST="nosetests" + +inherit distutils eutils + +DESCRIPTION="Convert text with ANSI color codes to HTML" +HOMEPAGE="http://pypi.python.org/pypi/ansi2html https://github.com/ralphbean/ansi2html" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RDEPEND="dev-python/six" +DEPEND="${RDEPEND} + test? ( + dev-python/nose + dev-python/mock + ) + dev-python/setuptools" + +src_prepare() { + if use test; then + epatch "${FILESDIR}/${PN}-0.9.1-fix-0-control-code.patch" + epatch "${FILESDIR}/${PN}-0.9.1-fix-sys-argv-in-tests.patch" + fi +} + +src_test() { + # Workaround for https://github.com/ralphbean/ansi2html/issues/17 + testing() { + nosetests + } + python_execute_function testing +} 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 000000000000..6e51d3f1d975 --- /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 000000000000..9e8fbe38c0fc --- /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 + diff --git a/dev-python/ansi2html/metadata.xml b/dev-python/ansi2html/metadata.xml new file mode 100644 index 000000000000..633a9baf58a2 --- /dev/null +++ b/dev-python/ansi2html/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>python</herd> + <maintainer> + <email>iksaif@gentoo.org</email> + <name>Corentin Chary</name> + </maintainer> + <upstream> + <remote-id type="pypi">ansi2html</remote-id> + <remote-id type="github">ralphbean/ansi2html</remote-id> + </upstream> +</pkgmetadata> |