diff options
author | Alastair Tse <liquidx@gentoo.org> | 2004-02-14 15:44:28 +0000 |
---|---|---|
committer | Alastair Tse <liquidx@gentoo.org> | 2004-02-14 15:44:28 +0000 |
commit | a58d29fd7a4141ecaefe7a17b0686d0c9f85c4c1 (patch) | |
tree | fca4872655b1ce624181c935f476262cf651c1a8 /dev-python/csv | |
parent | Unapply the last "fix" as it breaks other things. I'll have to figure out a ... (diff) | |
download | gentoo-2-a58d29fd7a4141ecaefe7a17b0686d0c9f85c4c1.tar.gz gentoo-2-a58d29fd7a4141ecaefe7a17b0686d0c9f85c4c1.tar.bz2 gentoo-2-a58d29fd7a4141ecaefe7a17b0686d0c9f85c4c1.zip |
renamed csv.so to csv2.so to avoid conflicts with python-2.3's built in csv module. (#40429)
Diffstat (limited to 'dev-python/csv')
-rw-r--r-- | dev-python/csv/ChangeLog | 10 | ||||
-rw-r--r-- | dev-python/csv/Manifest | 9 | ||||
-rw-r--r-- | dev-python/csv/csv-1.0-r1.ebuild | 26 | ||||
-rw-r--r-- | dev-python/csv/files/csv-1.0-rename.patch | 123 | ||||
-rw-r--r-- | dev-python/csv/files/digest-csv-1.0-r1 | 1 |
5 files changed, 164 insertions, 5 deletions
diff --git a/dev-python/csv/ChangeLog b/dev-python/csv/ChangeLog index 89560e7c4621..19daeb3fec9b 100644 --- a/dev-python/csv/ChangeLog +++ b/dev-python/csv/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-python/csv -# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/csv/ChangeLog,v 1.4 2003/04/04 22:22:10 liquidx Exp $ +# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/csv/ChangeLog,v 1.5 2004/02/14 15:44:27 liquidx Exp $ + +*csv-1.0-r1 (14 Feb 2004) + + 14 Feb 2004; Alastair Tse <liquidx@gentoo.org> : + renamed csv.so to csv2.so to avoid conflicts with python-2.3's built in csv + module. (#40429) *csv-1.0 (21 Mar 2003) diff --git a/dev-python/csv/Manifest b/dev-python/csv/Manifest index 3ed346153a5f..06bd97f38ee7 100644 --- a/dev-python/csv/Manifest +++ b/dev-python/csv/Manifest @@ -1,6 +1,9 @@ -MD5 166ca7153bab968e71efabe99584402d files/digest-csv-0.5.0 57 -MD5 9e38ebb2987d5a487e73480d73dd3ead files/digest-csv-1.0 58 -MD5 6df907b6e15b7904bdd4f667cee177e9 csv-0.5.0.ebuild 604 MD5 8598e5bc7d8f93733078292a9b5d6f14 ChangeLog 574 +MD5 6df907b6e15b7904bdd4f667cee177e9 csv-0.5.0.ebuild 604 +MD5 3e25d1b3e37d3fb6ae3fe97930078ecb csv-1.0-r1.ebuild 729 MD5 55c61fe41154edae3b726dd300b72868 csv-1.0.ebuild 493 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159 +MD5 71855c11fa66e311bfbe19d961ae8b60 files/csv-1.0-rename.patch 4540 +MD5 166ca7153bab968e71efabe99584402d files/digest-csv-0.5.0 57 +MD5 9e38ebb2987d5a487e73480d73dd3ead files/digest-csv-1.0 58 +MD5 9e38ebb2987d5a487e73480d73dd3ead files/digest-csv-1.0-r1 58 diff --git a/dev-python/csv/csv-1.0-r1.ebuild b/dev-python/csv/csv-1.0-r1.ebuild new file mode 100644 index 000000000000..f57036fc4869 --- /dev/null +++ b/dev-python/csv/csv-1.0-r1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2003 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/csv/csv-1.0-r1.ebuild,v 1.1 2004/02/14 15:44:27 liquidx Exp $ + +inherit distutils + +DESCRIPTION="CSV Module for Python" +HOMEPAGE="http://www.object-craft.com.au/projects/csv/" +SRC_URI="http://www.object-craft.com.au/projects/csv/download/${P}.tar.gz" + +LICENSE="PYTHON" +SLOT="0" +KEYWORDS="~x86 ~alpha ~ppc ~sparc" +IUSE="" + +pkg_setup() { + einfo "This package is installed as csv2.py to avoid conflict with" + einfo "python-2.3.x" +} + +src_unpack() { + unpack ${A} + # patch thanks to David Grant <david.grant@telus.net> (#40429) + cd ${S}; epatch ${FILESDIR}/${P}-rename.patch +} + diff --git a/dev-python/csv/files/csv-1.0-rename.patch b/dev-python/csv/files/csv-1.0-rename.patch new file mode 100644 index 000000000000..af865a15dfc3 --- /dev/null +++ b/dev-python/csv/files/csv-1.0-rename.patch @@ -0,0 +1,123 @@ +--- setup.py.orig 2004-02-04 22:25:11.507290503 -0500 ++++ setup.py 2004-02-04 22:25:36.831750000 -0500 +@@ -49,15 +49,15 @@ + self.announce("Pre-release checks pass!") + sdist.run(self) + +-setup(name = "csv", ++setup(name = "csv2", + version = "1.0", + maintainer = "Dave Cole", + maintainer_email = " csv@object-craft.com.au", + description = "Fast CSV Parser for Python", + url = "http://www.object-craft.com.au/projects/csv/", + ext_modules = [ +- Extension('csv', +- ['csv.c'], ++ Extension('csv2', ++ ['csv.c'], + ) + ], + license = 'BSD - see file LICENCE', +--- test.py.orig 2004-02-04 22:25:46.309424965 -0500 ++++ test.py 2004-02-04 22:26:06.421613162 -0500 +@@ -24,12 +24,12 @@ + plat_spec = "lib.%s-%s" % (distutils.util.get_platform(), sys.version[0:3]) + sys.path.insert(0, os.path.join(basedir, 'build', plat_spec)) + import unittest +-import csv ++import csv2 + import string + + class TestCSVParse(unittest.TestCase): + def parse_expect(self, input, expected_result, **kw): +- parser = csv.parser() ++ parser = csv2.parser() + for kw_arg, kw_value in kw.items(): + setattr(parser, kw_arg, kw_value) + result = [] +@@ -41,7 +41,7 @@ + self.assertEqual(expected_result, result) + + def parse_exception(self, input, exception, **kw): +- parser = csv.parser() ++ parser = csv2.parser() + for kw_arg, kw_value in kw.items(): + setattr(parser, kw_arg, kw_value) + self.assertRaises(exception, parser.parse, input) +@@ -116,10 +116,10 @@ + ['9','8','7','6']]) + + def test_strict_quote(self): +- self.parse_exception('"abc"def', csv.Error, strict = 1) ++ self.parse_exception('"abc"def', csv2.Error, strict = 1) + + def test_unquoted_nl(self): +- self.parse_exception('abc\ndef', csv.Error) ++ self.parse_exception('abc\ndef', csv2.Error) + + def test_alt_fieldsep(self): + self.parse_expect('1\t2\t3\t', [['1', '2', '3', '']], +@@ -151,7 +151,7 @@ + + class TestCSVJoin(unittest.TestCase): + def join_expect(self, input, expected_result, **kw): +- parser = csv.parser() ++ parser = csv2.parser() + for kw_arg, kw_value in kw.items(): + setattr(parser, kw_arg, kw_value) + result = parser.join(input) +--- csv.c.orig 2004-02-04 22:24:59.000000000 -0500 ++++ csv.c 2004-02-04 22:42:45.094982901 -0500 +@@ -726,7 +726,7 @@ + " Extracts fields from the (partial) CSV record in string.\n" + " Trailing end of line characters are ignored, so you do not\n" + " need to strip the string before passing it to the parser. If\n" +-" you pass more than a single line of text, a csv.Error\n" ++" you pass more than a single line of text, a csv2.Error\n" + " exception will be raised.\n" + "\n" + " join(sequence) -> string\n" +@@ -735,8 +735,8 @@ + "\n" + "Typical usage:\n" + "\n" +-" import csv\n" +-" p = csv.parser()\n" ++" import csv2\n" ++" p = csv2.parser()\n" + " file = open('afile.csv')\n" + " while 1:\n" + " line = file.readline()\n" +@@ -748,13 +748,13 @@ + " continue\n" + " # process the fields\n"; + +-void initcsv(void) ++void initcsv2(void) + { + PyObject *module, *dict, *rev = NULL; + + ParserType.ob_type = &PyType_Type; + /* Create the module and add the functions */ +- module = Py_InitModule4("csv", csv_methods, ++ module = Py_InitModule4("csv2", csv_methods, + csv_module__doc__, + (PyObject*)NULL,PYTHON_API_VERSION); + if (module == NULL) +@@ -769,7 +769,7 @@ + goto error; + + /* Add the CSV exception object to the module. */ +- if ((error_obj = PyErr_NewException("csv.Error", NULL, NULL)) == NULL) ++ if ((error_obj = PyErr_NewException("csv2.Error", NULL, NULL)) == NULL) + goto error; + + PyDict_SetItemString(dict, "Error", error_obj); +@@ -779,5 +779,5 @@ + Py_XDECREF(error_obj); + /* Check for errors */ + if (PyErr_Occurred()) +- Py_FatalError("can't initialize module csv"); ++ Py_FatalError("can't initialize module csv2"); + } diff --git a/dev-python/csv/files/digest-csv-1.0-r1 b/dev-python/csv/files/digest-csv-1.0-r1 new file mode 100644 index 000000000000..f6f4d8f587fd --- /dev/null +++ b/dev-python/csv/files/digest-csv-1.0-r1 @@ -0,0 +1 @@ +MD5 a62811dd44884142203e9528af1cab26 csv-1.0.tar.gz 11417 |