r59577 - in /trunk/libtext-csv-perl: Changes META.yml Makefile.PL debian/changelog lib/Text/CSV.pm lib/Text/CSV_PP.pm t/20_file.t t/21_lexicalio.t t/22_scalario.t t/41_null.t t/65_allow.t t/70_rt.t t/71_pp.t t/75_hashref.t t/76_magic.t
carnil-guest at users.alioth.debian.org
carnil-guest at users.alioth.debian.org
Sat Jun 19 05:52:32 UTC 2010
Author: carnil-guest
Date: Sat Jun 19 05:52:24 2010
New Revision: 59577
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=59577
Log:
* New upstream release
* Add myself to Uploaders.
Modified:
trunk/libtext-csv-perl/Changes
trunk/libtext-csv-perl/META.yml
trunk/libtext-csv-perl/Makefile.PL
trunk/libtext-csv-perl/debian/changelog
trunk/libtext-csv-perl/lib/Text/CSV.pm
trunk/libtext-csv-perl/lib/Text/CSV_PP.pm
trunk/libtext-csv-perl/t/20_file.t
trunk/libtext-csv-perl/t/21_lexicalio.t
trunk/libtext-csv-perl/t/22_scalario.t
trunk/libtext-csv-perl/t/41_null.t
trunk/libtext-csv-perl/t/65_allow.t
trunk/libtext-csv-perl/t/70_rt.t
trunk/libtext-csv-perl/t/71_pp.t
trunk/libtext-csv-perl/t/75_hashref.t
trunk/libtext-csv-perl/t/76_magic.t
Modified: trunk/libtext-csv-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-csv-perl/Changes?rev=59577&op=diff
==============================================================================
--- trunk/libtext-csv-perl/Changes (original)
+++ trunk/libtext-csv-perl/Changes Sat Jun 19 05:52:24 2010
@@ -1,4 +1,8 @@
Revision history for Perl extension Text::CSV.
+
+1.18 Sat Jun 19 10:34:07 2010
+ - fixed a combine bug with quote_space reported and patched by rt#58356
+ - updated test files compatible to CSV_XS 0.73
1.17 Tue Mar 16 15:20:34 2010
- fixed parse working when setting quote_char undef.
Modified: trunk/libtext-csv-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-csv-perl/META.yml?rev=59577&op=diff
==============================================================================
--- trunk/libtext-csv-perl/META.yml (original)
+++ trunk/libtext-csv-perl/META.yml Sat Jun 19 05:52:24 2010
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: Text-CSV
-version: 1.17
+version: 1.18
abstract: comma-separated values manipulator (using XS or PurePerl)
author:
- Makamaka Hannyaharamitu, E<lt>makamaka[at]cpan.orgE<gt>
@@ -14,11 +14,13 @@
IO::Handle: 0
Test::Harness: 0
Test::More: 0
+resources:
+ repository: http://github.com/makamaka/Text-CSV
no_index:
directory:
- t
- inc
-generated_by: ExtUtils::MakeMaker version 6.54
+generated_by: ExtUtils::MakeMaker version 6.56
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
version: 1.4
Modified: trunk/libtext-csv-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-csv-perl/Makefile.PL?rev=59577&op=diff
==============================================================================
--- trunk/libtext-csv-perl/Makefile.PL (original)
+++ trunk/libtext-csv-perl/Makefile.PL Sat Jun 19 05:52:24 2010
@@ -61,4 +61,14 @@
(ABSTRACT_FROM => 'lib/Text/CSV.pm', # retrieve abstract from module
AUTHOR => 'Makamaka Hannyaharamitu, E<lt>makamaka[at]cpan.orgE<gt>') : ()),
( $ExtUtils::MakeMaker::VERSION >= 6.3002 ? ('LICENSE' => 'perl', ) : () ),
+
+ ( $ExtUtils::MakeMaker::VERSION >= 6.46 ? (
+ 'META_MERGE' => {
+ resources => {
+ repository => 'http://github.com/makamaka/Text-CSV',
+ },
+ } ) : ()
+ ),
+
);
+
Modified: trunk/libtext-csv-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-csv-perl/debian/changelog?rev=59577&op=diff
==============================================================================
--- trunk/libtext-csv-perl/debian/changelog (original)
+++ trunk/libtext-csv-perl/debian/changelog Sat Jun 19 05:52:24 2010
@@ -1,3 +1,10 @@
+libtext-csv-perl (1.18-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * Add myself to Uploaders.
+
+ -- Salvatore Bonaccorso <salvatore.bonaccorso at gmail.com> Sat, 19 Jun 2010 07:52:15 +0200
+
libtext-csv-perl (1.17-1) unstable; urgency=low
* New upstream release
Modified: trunk/libtext-csv-perl/lib/Text/CSV.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-csv-perl/lib/Text/CSV.pm?rev=59577&op=diff
==============================================================================
--- trunk/libtext-csv-perl/lib/Text/CSV.pm (original)
+++ trunk/libtext-csv-perl/lib/Text/CSV.pm Sat Jun 19 05:52:24 2010
@@ -6,7 +6,7 @@
use vars qw( $VERSION $DEBUG );
BEGIN {
- $VERSION = '1.17';
+ $VERSION = '1.18';
$DEBUG = 0;
}
Modified: trunk/libtext-csv-perl/lib/Text/CSV_PP.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-csv-perl/lib/Text/CSV_PP.pm?rev=59577&op=diff
==============================================================================
--- trunk/libtext-csv-perl/lib/Text/CSV_PP.pm (original)
+++ trunk/libtext-csv-perl/lib/Text/CSV_PP.pm Sat Jun 19 05:52:24 2010
@@ -11,7 +11,7 @@
use vars qw($VERSION);
use Carp ();
-$VERSION = '1.25';
+$VERSION = '1.26';
sub PV { 0 }
sub IV { 1 }
@@ -307,7 +307,7 @@
$must_be_quoted++;
}
if($column =~ /$re_sp/){
- $must_be_quoted++ if $quote_space;
+ $must_be_quoted++;
}
if( $binary and $quote_null ){
Modified: trunk/libtext-csv-perl/t/20_file.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-csv-perl/t/20_file.t?rev=59577&op=diff
==============================================================================
--- trunk/libtext-csv-perl/t/20_file.t (original)
+++ trunk/libtext-csv-perl/t/20_file.t Sat Jun 19 05:52:24 2010
@@ -38,15 +38,15 @@
) {
my ($tst, $validp, $validg, @arg, $row) = @$_;
- open FH, ">_test.csv" or die "_test.csv: $!";
+ open FH, ">_20test.csv" or die "_20test.csv: $!";
is ($csv->print (*FH, \@arg), $validp||"", "$tst - print ()");
close FH;
- open FH, ">_test.csv" or die "_test.csv: $!";
+ open FH, ">_20test.csv" or die "_20test.csv: $!";
print FH join ",", @arg;
close FH;
- open FH, "<_test.csv" or die "_test.csv: $!";
+ open FH, "<_20test.csv" or die "_20test.csv: $!";
$row = $csv->getline (*FH);
unless ($validg) {
is ($row, undef, "$tst - false getline ()");
@@ -60,12 +60,12 @@
}
}
-unlink "_test.csv";
+unlink "_20test.csv";
# This test because of a problem with DBD::CSV
ok (1, "Tests for DBD::CSV");
-open FH, ">_test.csv" or die "_test.csv: $!";
+open FH, ">_20test.csv" or die "_20test.csv: $!";
$csv->binary (1);
$csv->eol ("\r\n");
ok ($csv->print (*FH, [ "id", "name" ]), "Bad character");
@@ -85,14 +85,14 @@
5\015
CONTENTS
-open FH, "<_test.csv" or die "_test.csv: $!";
+open FH, "<_20test.csv" or die "_20test.csv: $!";
my $content = do { local $/; <FH> };
close FH;
is ($content, $expected, "Content");
-open FH, ">_test.csv" or die "_test.csv: $!";
+open FH, ">_20test.csv" or die "_20test.csv: $!";
print FH $content;
close FH;
-open FH, "<_test.csv" or die "_test.csv: $!";
+open FH, "<_20test.csv" or die "_20test.csv: $!";
my $fields;
print "# Retrieving data\n";
@@ -130,10 +130,10 @@
[ 22, 0, 2025, qq{"+\r\r+"\r} ],
) {
my ($tst, $valid, $err, $str) = @$_;
- open FH, ">_test.csv" or die "_test.csv: $!";
+ open FH, ">_20test.csv" or die "_20test.csv: $!";
print FH $str;
close FH;
- open FH, "<_test.csv" or die "_test.csv: $!";
+ open FH, "<_20test.csv" or die "_20test.csv: $!";
my $row = $csv->getline (*FH);
close FH;
my @err = $csv->error_diag;
@@ -147,4 +147,4 @@
}
}
-unlink "_test.csv";
+unlink "_20test.csv";
Modified: trunk/libtext-csv-perl/t/21_lexicalio.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-csv-perl/t/21_lexicalio.t?rev=59577&op=diff
==============================================================================
--- trunk/libtext-csv-perl/t/21_lexicalio.t (original)
+++ trunk/libtext-csv-perl/t/21_lexicalio.t Sat Jun 19 05:52:24 2010
@@ -48,15 +48,15 @@
) {
my ($tst, $validp, $validg, @arg, $row) = @$_;
- open $io, ">_test.csv" or die "_test.csv: $!";
+ open $io, ">_21test.csv" or die "_21test.csv: $!";
is ($csv->print ($io, \@arg), $validp||"", "$tst - print ()");
close $io;
- open $io, ">_test.csv" or die "_test.csv: $!";
+ open $io, ">_21test.csv" or die "_21test.csv: $!";
print $io join ",", @arg;
close $io;
- open $io, "<_test.csv" or die "_test.csv: $!";
+ open $io, "<_21test.csv" or die "_21test.csv: $!";
$row = $csv->getline ($io);
unless ($validg) {
is ($row, undef, "$tst - false getline ()");
@@ -70,12 +70,12 @@
}
}
-unlink "_test.csv";
+unlink "_21test.csv";
# This test because of a problem with DBD::CSV
ok (1, "Tests for DBD::CSV");
-open $io, ">_test.csv" or die "_test.csv: $!";
+open $io, ">_21test.csv" or die "_21test.csv: $!";
$csv->binary (1);
$csv->eol ("\r\n");
ok ($csv->print ($io, [ "id", "name" ]), "Bad character");
@@ -95,14 +95,14 @@
5\015
CONTENTS
-open $io, "<_test.csv" or die "_test.csv: $!";
+open $io, "<_21test.csv" or die "_21test.csv: $!";
my $content = do { local $/; <$io> };
close $io;
is ($content, $expected, "Content");
-open $io, ">_test.csv" or die "_test.csv: $!";
+open $io, ">_21test.csv" or die "_21test.csv: $!";
print $io $content;
close $io;
-open $io, "<_test.csv" or die "_test.csv: $!";
+open $io, "<_21test.csv" or die "_21test.csv: $!";
my $fields;
print "# Retrieving data\n";
@@ -140,10 +140,10 @@
[ 22, 0, 2025, qq{"+\r\r+"\r} ],
) {
my ($tst, $valid, $err, $str) = @$_;
- open my $io, ">_test.csv" or die "_test.csv: $!";
+ open my $io, ">_21test.csv" or die "_21test.csv: $!";
print $io $str;
close $io;
- open $io, "<_test.csv" or die "_test.csv: $!";
+ open $io, "<_21test.csv" or die "_21test.csv: $!";
my $row = $csv->getline ($io);
my @err = $csv->error_diag;
my $sstr = _readable ($str);
@@ -156,4 +156,4 @@
}
}
-unlink "_test.csv";
+unlink "_21test.csv";
Modified: trunk/libtext-csv-perl/t/22_scalario.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-csv-perl/t/22_scalario.t?rev=59577&op=diff
==============================================================================
--- trunk/libtext-csv-perl/t/22_scalario.t (original)
+++ trunk/libtext-csv-perl/t/22_scalario.t Sat Jun 19 05:52:24 2010
@@ -51,15 +51,15 @@
) {
my ($tst, $validp, $validg, @arg, $row) = @$_;
- open $io, ">", \$io_str or die "_test.csv: $!";
+ open $io, ">", \$io_str or die "_22test.csv: $!";
is ($csv->print ($io, \@arg), $validp||"", "$tst - print ()");
close $io;
- open $io, ">", \$io_str or die "_test.csv: $!";
+ open $io, ">", \$io_str or die "_22test.csv: $!";
print $io join ",", @arg;
close $io;
- open $io, "<", \$io_str or die "_test.csv: $!";
+ open $io, "<", \$io_str or die "_22test.csv: $!";
$row = $csv->getline ($io);
unless ($validg) {
is ($row, undef, "$tst - false getline ()");
@@ -73,12 +73,12 @@
}
}
-unlink "_test.csv";
+unlink "_22test.csv";
# This test because of a problem with DBD::CSV
ok (1, "Tests for DBD::CSV");
-open $io, ">", \$io_str or die "_test.csv: $!";
+open $io, ">", \$io_str or die "_22test.csv: $!";
$csv->binary (1);
$csv->eol ("\r\n");
ok ($csv->print ($io, [ "id", "name" ]), "Bad character");
@@ -98,14 +98,14 @@
5\015
CONTENTS
-open $io, "<", \$io_str or die "_test.csv: $!";
+open $io, "<", \$io_str or die "_22test.csv: $!";
my $content = do { local $/; <$io> };
close $io;
is ($content, $expected, "Content");
-open $io, ">", \$io_str or die "_test.csv: $!";
+open $io, ">", \$io_str or die "_22test.csv: $!";
print $io $content;
close $io;
-open $io, "<", \$io_str or die "_test.csv: $!";
+open $io, "<", \$io_str or die "_22test.csv: $!";
my $fields;
print "# Retrieving data\n";
@@ -144,7 +144,7 @@
) {
my ($tst, $valid, $err, $str) = @$_;
$io_str = $str;
- open $io, "<", \$io_str or die "_test.csv: $!";
+ open $io, "<", \$io_str or die "_22test.csv: $!";
my $row = $csv->getline ($io);
close $io;
my @err = $csv->error_diag;
Modified: trunk/libtext-csv-perl/t/41_null.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-csv-perl/t/41_null.t?rev=59577&op=diff
==============================================================================
--- trunk/libtext-csv-perl/t/41_null.t (original)
+++ trunk/libtext-csv-perl/t/41_null.t Sat Jun 19 05:52:24 2010
@@ -56,7 +56,7 @@
ok ($csv->combine (@$line), "combine [ ... ]");
is ($csv->string, qq{,,"0\n",,""0"0\n0"\n}, "string");
-open FH, ">__test.csv" or die $!;
+open FH, ">__41test.csv" or die $!;
binmode FH;
for (@pat) {
@@ -69,7 +69,7 @@
close FH;
-open FH, "<__test.csv" or die $!;
+open FH, "<__41test.csv" or die $!;
binmode FH;
foreach my $pat (@pat) {
@@ -81,7 +81,7 @@
close FH;
-unlink "__test.csv";
+unlink "__41test.csv";
$csv = Text::CSV->new ({
eol => "\n",
@@ -94,7 +94,7 @@
ok ($csv->combine (@$line), "combine [ ... ]");
is ($csv->string, qq{,,"0\n",,"\0\0\n0"\n}, "string");
-open FH, ">__test.csv" or die $!;
+open FH, ">__41test.csv" or die $!;
binmode FH;
for (@pat) {
@@ -107,7 +107,7 @@
close FH;
-open FH, "<__test.csv" or die $!;
+open FH, "<__41test.csv" or die $!;
binmode FH;
foreach my $pat (@pat) {
@@ -119,4 +119,4 @@
close FH;
-unlink "__test.csv";
+unlink "__41test.csv";
Modified: trunk/libtext-csv-perl/t/65_allow.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-csv-perl/t/65_allow.t?rev=59577&op=diff
==============================================================================
--- trunk/libtext-csv-perl/t/65_allow.t (original)
+++ trunk/libtext-csv-perl/t/65_allow.t Sat Jun 19 05:52:24 2010
@@ -354,14 +354,14 @@
}
ok (1, "verbatim on getline (*FH)");
- open FH, ">_test.csv";
+ open FH, ">_65test.csv";
print FH @str, "M^Abe^*\r\n";
close FH;
foreach $gc (0, 1) {
$csv->verbatim ($gc);
- open FH, "<_test.csv";
+ open FH, "<_65test.csv";
my $row;
ok ($row = $csv->getline (*FH), "#\\r\\n $gc getline");
@@ -390,27 +390,27 @@
verbatim => 1,
eol => "#\r\n",
});
- open FH, ">_test.csv";
+ open FH, ">_65test.csv";
print FH $str[1];
close FH;
- open FH, "<_test.csv";
+ open FH, "<_65test.csv";
is ($csv->getline (*FH), undef, "#\\r\\n $gc getline 2030");
is (0 + $csv->error_diag, 2030, "Got 2030");
close FH;
- unlink "_test.csv";
+ unlink "_65test.csv";
}
{ ok (1, "keep_meta_info on getline ()");
my $csv = Text::CSV->new ({ eol => "\n" });
- open FH, ">_test.csv";
+ open FH, ">_65test.csv";
print FH qq{1,"",,"Q",2\n};
close FH;
is ($csv->keep_meta_info (0), 0, "No meta info");
- open FH, "<_test.csv";
+ open FH, "<_65test.csv";
my $row = $csv->getline (*FH);
ok ($row, "Get 1st line");
$csv->error_diag ();
@@ -418,19 +418,19 @@
is ($csv->is_quoted (3), undef, "Is field 3 quoted?");
close FH;
- open FH, ">_test.csv";
+ open FH, ">_65test.csv";
print FH qq{1,"",,"Q",2\n};
close FH;
is ($csv->keep_meta_info (1), 1, "Keep meta info");
- open FH, "<_test.csv";
+ open FH, "<_65test.csv";
$row = $csv->getline (*FH);
ok ($row, "Get 2nd line");
$csv->error_diag ();
is ($csv->is_quoted (2), 0, "Is field 2 quoted?");
is ($csv->is_quoted (3), 1, "Is field 3 quoted?");
close FH;
- unlink "_test.csv";
+ unlink "_65test.csv";
}
{ my $csv = Text::CSV->new ({});
Modified: trunk/libtext-csv-perl/t/70_rt.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-csv-perl/t/70_rt.t?rev=59577&op=diff
==============================================================================
--- trunk/libtext-csv-perl/t/70_rt.t (original)
+++ trunk/libtext-csv-perl/t/70_rt.t Sat Jun 19 05:52:24 2010
@@ -12,7 +12,7 @@
plan skip_all => "Cannot load Text::CSV" if $@;
}
-my $csv_file = "_test.csv";
+my $csv_file = "_70test.csv";
END { unlink $csv_file }
my ($rt, %input, %desc);
Modified: trunk/libtext-csv-perl/t/71_pp.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-csv-perl/t/71_pp.t?rev=59577&op=diff
==============================================================================
--- trunk/libtext-csv-perl/t/71_pp.t (original)
+++ trunk/libtext-csv-perl/t/71_pp.t Sat Jun 19 05:52:24 2010
@@ -5,7 +5,7 @@
use strict;
$^W = 1;
-use Test::More tests => 53;
+use Test::More tests => 55;
BEGIN { $ENV{PERL_TEXT_CSV} = $ARGV[0] || 0; }
@@ -161,3 +161,15 @@
unlink( '__test.csv' );
+# 2010-06-18 reported by https://rt.cpan.org/Public/Bug/Display.html?id=58356
+
+$csv = Text::CSV->new ({ binary => 1, quote_space => 0 });
+my @list = (
+ "a a",
+ "b,b",
+ "c ,c",
+);
+
+ok( $csv->combine( @list ) );
+is( $csv->string, q{a a,"b,b","c ,c"} );
+
Modified: trunk/libtext-csv-perl/t/75_hashref.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-csv-perl/t/75_hashref.t?rev=59577&op=diff
==============================================================================
--- trunk/libtext-csv-perl/t/75_hashref.t (original)
+++ trunk/libtext-csv-perl/t/75_hashref.t Sat Jun 19 05:52:24 2010
@@ -12,7 +12,7 @@
plan skip_all => "Cannot load Text::CSV" if $@;
}
-open FH, ">_test.csv";
+open FH, ">_75test.csv";
print FH <<EOC;
code,name,price,description
1,Dress,240.00,"Evening gown"
@@ -47,7 +47,7 @@
ok ($csv->column_names ("name", "code"), "column_names (list)");
is_deeply ([ $csv->column_names ], [ "name", "code" ], "well set");
-open FH, "<_test.csv";
+open FH, "<_75test.csv";
my $row;
ok ($row = $csv->getline (*FH), "getline headers");
is ($row->[0], "code", "Header line");
@@ -77,7 +77,7 @@
is ($csv->error_diag () + 0, 3004, "legal header defenition");
my @bcr = \($code, $name, $price, $desc);
-open FH, "<_test.csv";
+open FH, "<_75test.csv";
ok ($row = $csv->getline (*FH), "getline headers");
ok ($csv->bind_columns (@bcr), "Bind columns");
ok ($csv->column_names ($row), "column_names from array_ref");
@@ -110,7 +110,7 @@
close FH;
-open FH, "<_test.csv";
+open FH, "<_75test.csv";
is ($csv->column_names (undef), undef, "reset column headers");
is ($csv->bind_columns (undef), undef, "reset bound columns");
@@ -123,4 +123,4 @@
close FH;
-unlink "_test.csv";
+unlink "_75test.csv";
Modified: trunk/libtext-csv-perl/t/76_magic.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-csv-perl/t/76_magic.t?rev=59577&op=diff
==============================================================================
--- trunk/libtext-csv-perl/t/76_magic.t (original)
+++ trunk/libtext-csv-perl/t/76_magic.t Sat Jun 19 05:52:24 2010
@@ -26,12 +26,12 @@
}
tie $foo, "Foo";
-open FH, ">_test.csv";
+open FH, ">_76test.csv";
ok ($csv->print (*FH, $foo), "print with unused magic scalar");
close FH;
untie $foo;
-open FH, "<_test.csv";
+open FH, "<_76test.csv";
is_deeply ($csv->getline (*FH), \@foo, "Content read-back");
close FH;
@@ -40,7 +40,7 @@
untie $foo;
is_deeply ([$csv->column_names], \@foo, "column_names ()");
-unlink "_test.csv";
+unlink "_76test.csv";
package Foo;
More information about the Pkg-perl-cvs-commits
mailing list