Turns out in 2008 the regex that aliases ISO-646 to ascii was changed
so that it also matches plain 646, so we no longer need a patch to do
that.

https://github.com/dankogai/p5-encode/commit/aa1fdef85add72114ed7badf85e523cfdc9d6275

They adjusted the regex like this, making the leading ISO optional:
-    define_alias( qr/\bISO[-_]?646[-_]?US$/i => '"ascii"' );
+    define_alias( qr/\b(?:ISO[-_]?)?646(?:[-_]?US)?$/i => '"ascii"' );


The secondary quotes on the definition ('"ascii"') are due to the way
regex aliasing works and get stripped off.

OK to remove our local patch?

-- 
andrew - http://afresh1.com

($do || !$do) && undef($try) ;  # Master of Perl, Yoda is.  Hmmmm?
Index: gnu/usr.bin/perl/cpan/Encode/lib/Encode/Alias.pm
===================================================================
RCS file: /cvs/src/gnu/usr.bin/perl/cpan/Encode/lib/Encode/Alias.pm,v
retrieving revision 1.4
diff -u -p -u -r1.4 Alias.pm
--- gnu/usr.bin/perl/cpan/Encode/lib/Encode/Alias.pm    24 Mar 2014 15:05:24 
-0000      1.4
+++ gnu/usr.bin/perl/cpan/Encode/lib/Encode/Alias.pm    31 May 2014 17:08:19 
-0000
@@ -152,7 +152,6 @@ sub init_aliases {
     define_alias( qr/^(?:US-?)ascii$/i       => '"ascii"' );
     define_alias( 'C'                        => 'ascii' );
     define_alias( qr/\b(?:ISO[-_]?)?646(?:[-_]?US)?$/i => '"ascii"' );
-    define_alias( '646'                      => 'ascii' );
 
     # Allow variants of iso-8859-1 etc.
     define_alias( qr/\biso[-_]?(\d+)[-_](\d+)$/i => '"iso-$1-$2"' );

Reply via email to