r18128 - in /branches/upstream/libmime-encwords-perl/current: Changes EncWords.pm META.yml t/01decode.t t/02encode.t

[gregoa-guest at users.alioth.debian.org]

Author: gregoa-guest
Date: Sat Mar 29 17:17:47 2008
New Revision: 18128

URL: http://svn.debian.org/wsvn/?sc=1&rev=18128
Log:
[svn-upgrade] Integrating new upstream version, libmime-encwords-perl (1.008)

Modified:
    branches/upstream/libmime-encwords-perl/current/Changes
    branches/upstream/libmime-encwords-perl/current/EncWords.pm
    branches/upstream/libmime-encwords-perl/current/META.yml
    branches/upstream/libmime-encwords-perl/current/t/01decode.t
    branches/upstream/libmime-encwords-perl/current/t/02encode.t

Modified: branches/upstream/libmime-encwords-perl/current/Changes
URL: http://svn.debian.org/wsvn/branches/upstream/libmime-encwords-perl/current/Changes?rev=18128&op=diff
==============================================================================
--- branches/upstream/libmime-encwords-perl/current/Changes (original)
+++ branches/upstream/libmime-encwords-perl/current/Changes Sat Mar 29 17:17:47 2008
@@ -1,3 +1,9 @@
+2008-03-29	Hatuka*nezumi - IKEDA Soji	<hatuka at nezumi.nu>
+
+	* Release 1.008.
+	* Bug Fix: Perl <=5.6.x: encode_mimewords(): ASCII words
+	  are encoded.
+
 2008-03-21	Hatuka*nezumi - IKEDA Soji	<hatuka at nezumi.nu>
 
 	* Release 1.007.

Modified: branches/upstream/libmime-encwords-perl/current/EncWords.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmime-encwords-perl/current/EncWords.pm?rev=18128&op=diff
==============================================================================
--- branches/upstream/libmime-encwords-perl/current/EncWords.pm (original)
+++ branches/upstream/libmime-encwords-perl/current/EncWords.pm Sat Mar 29 17:17:47 2008
@@ -120,7 +120,7 @@
 #------------------------------
 
 ### The package version, both in 1.23 style *and* usable by MakeMaker:
-$VERSION = '1.007';
+$VERSION = '1.008';
 
 ### Public Configuration Attributes
 our $Config = {
@@ -725,13 +725,14 @@
 		$csetobj = MIME::Charset->new($cset,
 					      Mapping => $Params{Mapping});
 	    }
-	} elsif ($cset ne "US-ASCII") {
+	} elsif (!$cset or $cset ne "US-ASCII") {
 	    $cset ||= $Params{Charset} || $Config->{Charset};
 	    $csetobj = MIME::Charset->new($cset, Mapping => $Params{Mapping});
 	    my $u = $s;
+	    $@ = '';
 	    eval {
 		$u = $csetobj->decode($u, 0);
-	    };
+	    } if MIME::Charset::USE_ENCODE;
 	    if ($@ or $u =~ $UNSAFE) {
 		$enc = $Params{Encoding};
 	    } else {

Modified: branches/upstream/libmime-encwords-perl/current/META.yml
URL: http://svn.debian.org/wsvn/branches/upstream/libmime-encwords-perl/current/META.yml?rev=18128&op=diff
==============================================================================
--- branches/upstream/libmime-encwords-perl/current/META.yml (original)
+++ branches/upstream/libmime-encwords-perl/current/META.yml Sat Mar 29 17:17:47 2008
@@ -1,7 +1,7 @@
 # http://module-build.sourceforge.net/META-spec.html
 #XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
 name:         MIME-EncWords
-version:      1.007
+version:      1.008
 version_from: EncWords.pm
 installdirs:  site
 requires:

Modified: branches/upstream/libmime-encwords-perl/current/t/01decode.t
URL: http://svn.debian.org/wsvn/branches/upstream/libmime-encwords-perl/current/t/01decode.t?rev=18128&op=diff
==============================================================================
--- branches/upstream/libmime-encwords-perl/current/t/01decode.t (original)
+++ branches/upstream/libmime-encwords-perl/current/t/01decode.t Sat Mar 29 17:17:47 2008
@@ -1,7 +1,7 @@
 use strict;
 use Test;
 
-BEGIN { plan tests => ($^V ge v5.8.1)? 42: 10 }
+BEGIN { plan tests => ($] >= 5.008001)? 42: 10 }
 
 use MIME::EncWords qw(decode_mimewords);
 $MIME::EncWords::Config = {

Modified: branches/upstream/libmime-encwords-perl/current/t/02encode.t
URL: http://svn.debian.org/wsvn/branches/upstream/libmime-encwords-perl/current/t/02encode.t?rev=18128&op=diff
==============================================================================
--- branches/upstream/libmime-encwords-perl/current/t/02encode.t (original)
+++ branches/upstream/libmime-encwords-perl/current/t/02encode.t Sat Mar 29 17:17:47 2008
@@ -1,9 +1,8 @@
 use strict;
 use Test;
 
-BEGIN { plan tests => ($^V ge v5.8.1)? 17: 12 }
+BEGIN { plan tests => ($] >= 5.008001)? 17: 12 }
 
-use MIME::Charset qw(header_encode);
 use MIME::EncWords qw(encode_mimewords);
 $MIME::EncWords::Config = {
     Detect7bit => 'YES',