Upgrade Encode from version 2.54 to 2.55

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 4651c1f..ff0f172 100755 (executable)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -599,7 +599,7 @@ use File::Glob qw(:case);
 
     'Encode' => {
         'MAINTAINER'   => 'dankogai',
-        'DISTRIBUTION' => 'DANKOGAI/Encode-2.54.tar.gz',
+        'DISTRIBUTION' => 'DANKOGAI/Encode-2.55.tar.gz',
         'FILES'        => q[cpan/Encode],
         'UPSTREAM'     => 'cpan',
     },

diff --git a/cpan/Encode/Changes b/cpan/Encode/Changes
index c3d7229..10beea7 100644 (file)
--- a/cpan/Encode/Changes
+++ b/cpan/Encode/Changes
@@ -1,8 +1,30 @@
 # Revision history for Perl extension Encode.
 #
-# $Id: Changes,v 2.54 2013/08/29 16:47:39 dankogai Exp dankogai $
+# $Id: Changes,v 2.55 2013/09/14 07:51:59 dankogai Exp dankogai $
 #
-$Revision: 2.54 $ $Date: 2013/08/29 16:47:39 $
+$Revision: 2.55 $ $Date: 2013/09/14 07:51:59 $
+! Encode.pm
+  Makefile.PL
+  Unicode/Unicode.pm
+  lib/Encode/Alias.pm
+  lib/Encode/CN/HZ.pm
+  lib/Encode/Encoder.pm
+  lib/Encode/Encoding.pm
+  lib/Encode/GSM0338.pm
+  lib/Encode/Guess.pm
+  lib/Encode/JP/JIS7.pm
+  lib/Encode/KR/2022_KR.pm
+  lib/Encode/MIME/Header.pm
+  lib/Encode/MIME/Header/ISO_2022_JP.pm
+  lib/Encode/Unicode/UTF7.pm
+  t/Encoder.t
+  replaced 'use base' with 'use parent'
+    base.pm is an heavy module for what it is used for. 
+    Fortunately it has a tiny replacement, parent.pm 
+    that is on CPAN but also in perl core since 5.10.1.
+  https://github.com/dankogai/p5-encode/pull/15
+
+2.54 2013/08/29 16:47:39
 ! Encode.xs
 + t/cow.t
   Addressed: COW breakage with _utf8_on()

diff --git a/cpan/Encode/Encode.pm b/cpan/Encode/Encode.pm
index 4285871..033bb15 100644 (file)
--- a/cpan/Encode/Encode.pm
+++ b/cpan/Encode/Encode.pm
@@ -1,16 +1,15 @@
 #
-# $Id: Encode.pm,v 2.54 2013/08/29 16:47:39 dankogai Exp dankogai $
+# $Id: Encode.pm,v 2.55 2013/09/14 07:51:59 dankogai Exp dankogai $
 #
 package Encode;
 use strict;
 use warnings;
-our $VERSION = sprintf "%d.%02d", q$Revision: 2.54 $ =~ /(\d+)/g;
+our $VERSION = sprintf "%d.%02d", q$Revision: 2.55 $ =~ /(\d+)/g;
 use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG};
 use XSLoader ();
 XSLoader::load( __PACKAGE__, $VERSION );
 
-require Exporter;
-use base qw/Exporter/;
+use Exporter 5.57 'import';
 
 # Public, encouraged API is exported by default
 

diff --git a/cpan/Encode/Encode.xs b/cpan/Encode/Encode.xs
index 3ecfdad..ea9265f 100644 (file)
--- a/cpan/Encode/Encode.xs
+++ b/cpan/Encode/Encode.xs
@@ -1,5 +1,5 @@
 /*
- $Id: Encode.xs,v 2.24 2013/08/29 16:47:39 dankogai Exp dankogai $
+ $Id: Encode.xs,v 2.24 2013/08/29 16:47:39 dankogai Exp $
  */
 
 #define PERL_NO_GET_CONTEXT

diff --git a/cpan/Encode/META.json b/cpan/Encode/META.json
index b50c273..3e56ac5 100644 (file)
--- a/cpan/Encode/META.json
+++ b/cpan/Encode/META.json
@@ -31,7 +31,10 @@
          }
       },
       "runtime" : {
-         "requires" : {}
+         "requires" : {
+            "Exporter" : "5.57",
+            "parent" : "0.221"
+         }
       }
    },
    "release_status" : "stable",
@@ -40,5 +43,5 @@
          "url" : "https://github.com/dankogai/p5-encode"
       }
    },
-   "version" : "2.54"
+   "version" : "2.55"
 }

diff --git a/cpan/Encode/META.yml b/cpan/Encode/META.yml
index 5bb345a..05ffcfb 100644 (file)
--- a/cpan/Encode/META.yml
+++ b/cpan/Encode/META.yml
@@ -17,7 +17,9 @@ no_index:
   directory:
     - t
     - inc
-requires: {}
+requires:
+  Exporter: 5.57
+  parent: 0.221
 resources:
   repository: https://github.com/dankogai/p5-encode
-version: 2.54
+version: 2.55

diff --git a/cpan/Encode/Makefile.PL b/cpan/Encode/Makefile.PL
index 6cc1b4f..5eb0f18 100644 (file)
--- a/cpan/Encode/Makefile.PL
+++ b/cpan/Encode/Makefile.PL
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.PL,v 2.11 2013/08/29 15:20:31 dankogai Exp $
+# $Id: Makefile.PL,v 2.12 2013/09/14 07:51:59 dankogai Exp dankogai $
 #
 use 5.007003;
 use strict;
@@ -44,6 +44,10 @@ WriteMakefile(
     },
     INC         => '-I' . File::Spec->catfile( '.', 'Encode' ),
     LICENSE     => 'perl',
+    PREREQ_PM   => {
+        Exporter   => '5.57',   # use Exporter 'import';
+       parent     => '0.221',  # version bundled with 5.10.1
+    },
     PMLIBDIRS   => \@pmlibdirs,
     INSTALLDIRS => ($] < 5.011 ? 'perl' : 'site'),
     META_MERGE        => {

diff --git a/cpan/Encode/Unicode/Unicode.pm b/cpan/Encode/Unicode/Unicode.pm
index 54df4f4..6b35cb7 100644 (file)
--- a/cpan/Encode/Unicode/Unicode.pm
+++ b/cpan/Encode/Unicode/Unicode.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 
-our $VERSION = do { my @r = ( q$Revision: 2.8 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
+our $VERSION = do { my @r = ( q$Revision: 2.9 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
 
 use XSLoader;
 XSLoader::load( __PACKAGE__, $VERSION );
@@ -42,7 +42,7 @@ for my $name (
     } => __PACKAGE__;
 }
 
-use base qw(Encode::Encoding);
+use parent qw(Encode::Encoding);
 
 sub renew {
     my $self = shift;

diff --git a/cpan/Encode/lib/Encode/Alias.pm b/cpan/Encode/lib/Encode/Alias.pm
index 362115b..28d3cad 100644 (file)
--- a/cpan/Encode/lib/Encode/Alias.pm
+++ b/cpan/Encode/lib/Encode/Alias.pm
@@ -2,10 +2,10 @@ package Encode::Alias;
 use strict;
 use warnings;
 no warnings 'redefine';
-our $VERSION = do { my @r = ( q$Revision: 2.17 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
+our $VERSION = do { my @r = ( q$Revision: 2.18 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
 use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG};
 
-use base qw(Exporter);
+use Exporter 'import';
 
 # Public, encouraged API is exported by default
 

diff --git a/cpan/Encode/lib/Encode/CN/HZ.pm b/cpan/Encode/lib/Encode/CN/HZ.pm
index 7a93e25..f035d82 100644 (file)
--- a/cpan/Encode/lib/Encode/CN/HZ.pm
+++ b/cpan/Encode/lib/Encode/CN/HZ.pm
@@ -5,11 +5,11 @@ use warnings;
 use utf8 ();
 
 use vars qw($VERSION);
-$VERSION = do { my @r = ( q$Revision: 2.6 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
+$VERSION = do { my @r = ( q$Revision: 2.7 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
 
 use Encode qw(:fallbacks);
 
-use base qw(Encode::Encoding);
+use parent qw(Encode::Encoding);
 __PACKAGE__->Define('hz');
 
 # HZ is a combination of ASCII and escaped GB, so we implement it

diff --git a/cpan/Encode/lib/Encode/Encoder.pm b/cpan/Encode/lib/Encode/Encoder.pm
index 2cde1e8..000b415 100644 (file)
--- a/cpan/Encode/lib/Encode/Encoder.pm
+++ b/cpan/Encode/lib/Encode/Encoder.pm
@@ -1,10 +1,10 @@
 #
-# $Id: Encoder.pm,v 2.2 2011/08/09 07:49:44 dankogai Exp $
+# $Id: Encoder.pm,v 2.3 2013/09/14 07:51:59 dankogai Exp dankogai $
 #
 package Encode::Encoder;
 use strict;
 use warnings;
-our $VERSION = do { my @r = ( q$Revision: 2.2 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
+our $VERSION = do { my @r = ( q$Revision: 2.3 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
 
 require Exporter;
 our @ISA       = qw(Exporter);
@@ -211,7 +211,7 @@ To make the Base64 transcoder example above really work, you could
 write a module like this:
 
   package Encode::Base64;
-  use base 'Encode::Encoding';
+  use parent 'Encode::Encoding';
   __PACKAGE__->Define('base64');
   use MIME::Base64;
   sub encode{ 

diff --git a/cpan/Encode/lib/Encode/Encoding.pm b/cpan/Encode/lib/Encode/Encoding.pm
index 62f6ee4..39d2e0a 100644 (file)
--- a/cpan/Encode/lib/Encode/Encoding.pm
+++ b/cpan/Encode/lib/Encode/Encoding.pm
@@ -3,7 +3,7 @@ package Encode::Encoding;
 # Base class for classes which implement encodings
 use strict;
 use warnings;
-our $VERSION = do { my @r = ( q$Revision: 2.6 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
+our $VERSION = do { my @r = ( q$Revision: 2.7 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
 
 require Encode;
 
@@ -81,7 +81,7 @@ Encode::Encoding - Encode Implementation Base Class
 =head1 SYNOPSIS
 
   package Encode::MyEncoding;
-  use base qw(Encode::Encoding);
+  use parent qw(Encode::Encoding);
 
   __PACKAGE__->Define(qw(myCanonical myAlias));
 
@@ -251,7 +251,7 @@ is assumed.
 
   package Encode::ROT13;
   use strict;
-  use base qw(Encode::Encoding);
+  use parent qw(Encode::Encoding);
 
   __PACKAGE__->Define('rot13');
 
@@ -290,7 +290,7 @@ C<Encode::Encoding> as a base class. This allows that class to define
 additional behaviour for all encoding objects.
 
   package Encode::MyEncoding;
-  use base qw(Encode::Encoding);
+  use parent qw(Encode::Encoding);
 
   __PACKAGE__->Define(qw(myCanonical myAlias));
 

diff --git a/cpan/Encode/lib/Encode/GSM0338.pm b/cpan/Encode/lib/Encode/GSM0338.pm
index e105844..5148488 100644 (file)
--- a/cpan/Encode/lib/Encode/GSM0338.pm
+++ b/cpan/Encode/lib/Encode/GSM0338.pm
@@ -1,5 +1,5 @@
 #
-# $Id: GSM0338.pm,v 2.4 2013/08/14 02:29:54 dankogai Exp $
+# $Id: GSM0338.pm,v 2.5 2013/09/14 07:51:59 dankogai Exp dankogai $
 #
 package Encode::GSM0338;
 
@@ -8,11 +8,11 @@ use warnings;
 use Carp;
 
 use vars qw($VERSION);
-$VERSION = do { my @r = ( q$Revision: 2.4 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
+$VERSION = do { my @r = ( q$Revision: 2.5 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
 
 use Encode qw(:fallbacks);
 
-use base qw(Encode::Encoding);
+use parent qw(Encode::Encoding);
 __PACKAGE__->Define('gsm0338');
 
 sub needs_lines { 1 }

diff --git a/cpan/Encode/lib/Encode/Guess.pm b/cpan/Encode/lib/Encode/Guess.pm
index 31ec58f..b44daf5 100644 (file)
--- a/cpan/Encode/lib/Encode/Guess.pm
+++ b/cpan/Encode/lib/Encode/Guess.pm
@@ -2,7 +2,7 @@ package Encode::Guess;
 use strict;
 use warnings;
 use Encode qw(:fallbacks find_encoding);
-our $VERSION = do { my @r = ( q$Revision: 2.5 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
+our $VERSION = do { my @r = ( q$Revision: 2.6 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
 
 my $Canon = 'Guess';
 use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG};
@@ -12,7 +12,7 @@ $Encode::Encoding{$Canon} = bless {
     Suspects => {%DEF_SUSPECTS},
 } => __PACKAGE__;
 
-use base qw(Encode::Encoding);
+use parent qw(Encode::Encoding);
 sub needs_lines { 1 }
 sub perlio_ok   { 0 }
 

diff --git a/cpan/Encode/lib/Encode/JP/JIS7.pm b/cpan/Encode/lib/Encode/JP/JIS7.pm
index 3b5699c..588389a 100644 (file)
--- a/cpan/Encode/lib/Encode/JP/JIS7.pm
+++ b/cpan/Encode/lib/Encode/JP/JIS7.pm
@@ -1,7 +1,7 @@
 package Encode::JP::JIS7;
 use strict;
 use warnings;
-our $VERSION = do { my @r = ( q$Revision: 2.4 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
+our $VERSION = do { my @r = ( q$Revision: 2.5 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
 
 use Encode qw(:fallbacks);
 
@@ -16,7 +16,7 @@ for my $name ( '7bit-jis', 'iso-2022-jp', 'iso-2022-jp-1' ) {
     } => __PACKAGE__;
 }
 
-use base qw(Encode::Encoding);
+use parent qw(Encode::Encoding);
 
 # we override this to 1 so PerlIO works
 sub needs_lines { 1 }

diff --git a/cpan/Encode/lib/Encode/KR/2022_KR.pm b/cpan/Encode/lib/Encode/KR/2022_KR.pm
index 0218d97..44373e5 100644 (file)
--- a/cpan/Encode/lib/Encode/KR/2022_KR.pm
+++ b/cpan/Encode/lib/Encode/KR/2022_KR.pm
@@ -1,11 +1,11 @@
 package Encode::KR::2022_KR;
 use strict;
 use warnings;
-our $VERSION = do { my @r = ( q$Revision: 2.2 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
+our $VERSION = do { my @r = ( q$Revision: 2.3 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
 
 use Encode qw(:fallbacks);
 
-use base qw(Encode::Encoding);
+use parent qw(Encode::Encoding);
 __PACKAGE__->Define('iso-2022-kr');
 
 sub needs_lines { 1 }

diff --git a/cpan/Encode/lib/Encode/MIME/Header.pm b/cpan/Encode/lib/Encode/MIME/Header.pm
index de769cc..090a177 100644 (file)
--- a/cpan/Encode/lib/Encode/MIME/Header.pm
+++ b/cpan/Encode/lib/Encode/MIME/Header.pm
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 
-our $VERSION = do { my @r = ( q$Revision: 2.14 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
+our $VERSION = do { my @r = ( q$Revision: 2.15 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
 use Encode qw(find_encoding encode_utf8 decode_utf8);
 use MIME::Base64;
 use Carp;
@@ -31,7 +31,7 @@ $Encode::Encoding{'MIME-Q'} = bless {
     Name     => 'MIME-Q',
 } => __PACKAGE__;
 
-use base qw(Encode::Encoding);
+use parent qw(Encode::Encoding);
 
 sub needs_lines { 1 }
 sub perlio_ok   { 0 }

diff --git a/cpan/Encode/lib/Encode/MIME/Header/ISO_2022_JP.pm b/cpan/Encode/lib/Encode/MIME/Header/ISO_2022_JP.pm
index 4abfbd0..86955c8 100644 (file)
--- a/cpan/Encode/lib/Encode/MIME/Header/ISO_2022_JP.pm
+++ b/cpan/Encode/lib/Encode/MIME/Header/ISO_2022_JP.pm
@@ -3,7 +3,7 @@ package Encode::MIME::Header::ISO_2022_JP;
 use strict;
 use warnings;
 
-use base qw(Encode::MIME::Header);
+use parent qw(Encode::MIME::Header);
 
 $Encode::Encoding{'MIME-Header-ISO_2022_JP'} =
   bless { encode => 'B', bpl => 76, Name => 'MIME-Header-ISO_2022_JP' } =>
@@ -14,7 +14,7 @@ use constant TAIL => '?=';
 
 use Encode::CJKConstants qw(%RE);
 
-our $VERSION = do { my @r = ( q$Revision: 1.3 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
+our $VERSION = do { my @r = ( q$Revision: 1.4 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
 
 # I owe the below codes totally to
 #   Jcode by Dan Kogai & http://www.din.or.jp/~ohzaki/perl.htm#JP_Base64

diff --git a/cpan/Encode/lib/Encode/Unicode/UTF7.pm b/cpan/Encode/lib/Encode/Unicode/UTF7.pm
index 0b22dbe..039e067 100644 (file)
--- a/cpan/Encode/lib/Encode/Unicode/UTF7.pm
+++ b/cpan/Encode/lib/Encode/Unicode/UTF7.pm
@@ -1,13 +1,13 @@
 #
-# $Id: UTF7.pm,v 2.7 2013/04/26 18:30:46 dankogai Exp $
+# $Id: UTF7.pm,v 2.8 2013/09/14 07:51:59 dankogai Exp dankogai $
 #
 package Encode::Unicode::UTF7;
 use strict;
 use warnings;
 no warnings 'redefine';
-use base qw(Encode::Encoding);
+use parent qw(Encode::Encoding);
 __PACKAGE__->Define('UTF-7');
-our $VERSION = do { my @r = ( q$Revision: 2.7 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
+our $VERSION = do { my @r = ( q$Revision: 2.8 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
 use MIME::Base64;
 use Encode;
 

diff --git a/cpan/Encode/t/Encoder.t b/cpan/Encode/t/Encoder.t
index 2aab6c6..63eea23 100644 (file)
--- a/cpan/Encode/t/Encoder.t
+++ b/cpan/Encode/t/Encoder.t
@@ -1,5 +1,5 @@
 #
-# $Id: Encoder.t,v 2.0 2004/05/16 20:55:17 dankogai Exp $
+# $Id: Encoder.t,v 2.1 2013/09/14 07:51:59 dankogai Exp dankogai $
 #
 
 BEGIN {
@@ -17,7 +17,7 @@ use Test::More tests => 516;
 use Encode::Encoder qw(encoder);
 use MIME::Base64;
 package Encode::Base64;
-use base 'Encode::Encoding';
+use parent 'Encode::Encoding';
 __PACKAGE__->Define('base64');
 use MIME::Base64;
 sub encode{

diff --git a/cpan/Encode/t/cow.t b/cpan/Encode/t/cow.t
index 2b8cec6..985e268 100644 (file)
--- a/cpan/Encode/t/cow.t
+++ b/cpan/Encode/t/cow.t
@@ -1,5 +1,5 @@
 #
-# $Id: cow.t,v 1.1 2013/08/29 16:47:39 dankogai Exp dankogai $
+# $Id: cow.t,v 1.1 2013/08/29 16:47:39 dankogai Exp $
 #
 use strict;
 use Encode ();

diff --git a/cpan/Encode/t/decode.t b/cpan/Encode/t/decode.t
index 8281ca8..77cdaba 100644 (file)
--- a/cpan/Encode/t/decode.t
+++ b/cpan/Encode/t/decode.t
@@ -1,5 +1,5 @@
 #
-# $Id: decode.t,v 1.1 2013/08/29 16:47:39 dankogai Exp dankogai $
+# $Id: decode.t,v 1.1 2013/08/29 16:47:39 dankogai Exp $
 #
 use strict;
 use Encode qw(decode_utf8 FB_CROAK);

diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index 5171d97..78eb04c 100644 (file)
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -238,10 +238,11 @@ DL_UNLOAD_ALL_AT_EXIT defined.  Support for GNU DLD has also been removed.
 
 =item *
 
-L<Encode> has been upgraded from version 2.52 to 2.54.
+L<Encode> has been upgraded from version 2.52 to 2.55.
 
 An erroneous early return in C<decode_utf8> has been removed, and a bug in
-C<_utf8_on> under COW has been fixed.
+C<_utf8_on> under COW has been fixed.  Encode also now uses L<parent> rather
+than L<base> throughout.
 
 =item *