summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xPorting/Maintainers.pl8
-rw-r--r--cpan/Encode/encoding.pm10
-rw-r--r--cpan/Encode/t/enc_data.t2
-rw-r--r--cpan/Encode/t/enc_eucjp.t2
-rw-r--r--cpan/Encode/t/enc_module.t2
-rw-r--r--cpan/Encode/t/enc_utf8.t2
-rw-r--r--cpan/Encode/t/encoding.t2
-rw-r--r--cpan/Encode/t/jperl.t2
-rw-r--r--pod/perldelta.pod5
-rw-r--r--t/op/concat2.t1
-rw-r--r--t/porting/customized.dat6
-rw-r--r--t/re/pat_advanced.t2
-rw-r--r--t/uni/chr.t1
-rw-r--r--t/uni/greek.t1
-rw-r--r--t/uni/latin2.t1
-rw-r--r--t/uni/tr_7jis.t1
-rw-r--r--t/uni/tr_eucjp.t1
-rw-r--r--t/uni/tr_sjis.t1
-rw-r--r--t/uni/tr_utf8.t1
19 files changed, 5 insertions, 46 deletions
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index cd040938bf..6570126635 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -383,14 +383,6 @@ use File::Glob qw(:case);
'Encode' => {
'DISTRIBUTION' => 'DANKOGAI/Encode-2.62.tar.gz',
'FILES' => q[cpan/Encode],
- 'CUSTOMIZED' => [
- 'encoding.pm',
- 't/enc_data.t',
- 't/enc_eucjp.t',
- 't/enc_utf8.t',
- 't/encoding.t',
- 't/jperl.t',
- ],
},
'encoding::warnings' => {
diff --git a/cpan/Encode/encoding.pm b/cpan/Encode/encoding.pm
index 7bc08f452f..c0bff08873 100644
--- a/cpan/Encode/encoding.pm
+++ b/cpan/Encode/encoding.pm
@@ -102,9 +102,6 @@ sub _get_locale_encoding {
}
sub import {
- if ($] >= 5.020) {
- Carp::croak("encoding: pragma has been removed");
- }
if ($] >= 5.017) {
warnings::warnif("deprecated",
"Use of the encoding pragma is deprecated")
@@ -212,7 +209,9 @@ encoding - allows you to write your script in non-ascii or non-utf8
=head1 WARNING
-This module has been removed after being deprecated since perl 5.18.
+This module is deprecated under perl 5.18. It uses a mechanism provided by
+perl that is deprecated under 5.18 and higher, and may be removed in a
+future version.
The easiest and the best alternative is to write your script in UTF-8
and declear:
@@ -221,9 +220,6 @@ and declear:
See L<perluniintro> and L<utf8> for details.
-For reference only, the documentation of how it was supposed to work (some
-bugs never got fixed) is below.
-
=head1 SYNOPSIS
use encoding "greek"; # Perl like Greek to you?
diff --git a/cpan/Encode/t/enc_data.t b/cpan/Encode/t/enc_data.t
index 1a1cfde878..a0caf650f1 100644
--- a/cpan/Encode/t/enc_data.t
+++ b/cpan/Encode/t/enc_data.t
@@ -1,8 +1,6 @@
# $Id: enc_data.t,v 2.2 2013/02/18 02:23:56 dankogai Exp $
BEGIN {
- print "1..0 # Skip: 'use encoding' has been removed\n";
- exit 0;
require Config; import Config;
if ($Config{'extensions'} !~ /\bEncode\b/) {
print "1..0 # Skip: Encode was not built\n";
diff --git a/cpan/Encode/t/enc_eucjp.t b/cpan/Encode/t/enc_eucjp.t
index 96e466ddb0..7c78a68ee9 100644
--- a/cpan/Encode/t/enc_eucjp.t
+++ b/cpan/Encode/t/enc_eucjp.t
@@ -2,8 +2,6 @@
# This is the twin of enc_utf8.t .
BEGIN {
- print "1..0 # Skip: 'use encoding' has been removed\n";
- exit 0;
require Config; import Config;
if ($Config{'extensions'} !~ /\bEncode\b/) {
print "1..0 # Skip: Encode was not built\n";
diff --git a/cpan/Encode/t/enc_module.t b/cpan/Encode/t/enc_module.t
index 120b7adbd6..05fc6c2f64 100644
--- a/cpan/Encode/t/enc_module.t
+++ b/cpan/Encode/t/enc_module.t
@@ -1,8 +1,6 @@
# $Id: enc_module.t,v 2.2 2013/02/18 02:23:56 dankogai Exp $
# This file is in euc-jp
BEGIN {
- print "1..0 # Skip: 'use encoding' has been removed\n";
- exit 0;
require Config; import Config;
if ($Config{'extensions'} !~ /\bEncode\b/) {
print "1..0 # Skip: Encode was not built\n";
diff --git a/cpan/Encode/t/enc_utf8.t b/cpan/Encode/t/enc_utf8.t
index ce24b1d047..9c6caa3fa9 100644
--- a/cpan/Encode/t/enc_utf8.t
+++ b/cpan/Encode/t/enc_utf8.t
@@ -2,8 +2,6 @@
# This is the twin of enc_eucjp.t .
BEGIN {
- print "1..0 # Skip: 'use encoding' has been removed\n";
- exit 0;
require Config; import Config;
if ($Config{'extensions'} !~ /\bEncode\b/) {
print "1..0 # Skip: Encode was not built\n";
diff --git a/cpan/Encode/t/encoding.t b/cpan/Encode/t/encoding.t
index c49e423d61..8c7f253377 100644
--- a/cpan/Encode/t/encoding.t
+++ b/cpan/Encode/t/encoding.t
@@ -1,6 +1,4 @@
BEGIN {
- print "1..0 # Skip: 'use encoding' has been removed\n";
- exit 0;
require Config; import Config;
if ($Config{'extensions'} !~ /\bEncode\b/) {
print "1..0 # Skip: Encode was not built\n";
diff --git a/cpan/Encode/t/jperl.t b/cpan/Encode/t/jperl.t
index a47dddf969..3abe86b9b7 100644
--- a/cpan/Encode/t/jperl.t
+++ b/cpan/Encode/t/jperl.t
@@ -4,8 +4,6 @@
# This script is written in euc-jp
BEGIN {
- print "1..0 # Skip: 'use encoding' has been removed\n";
- exit 0;
require Config; import Config;
if ($Config{'extensions'} !~ /\bEncode\b/) {
print "1..0 # Skip: Encode was not built\n";
diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index 07883e61a9..65401d1672 100644
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -86,11 +86,6 @@ XXX For a release on a stable branch, this section aspires to be:
If any exist, they are bugs, and we request that you submit a
report. See L</Reporting Bugs> below.
-=head2 S<C<"use encoding">> now is a fatal error
-
-The C<encoding> pragma has been deprecated since v5.18, and its use now
-is a fatal error.
-
=head2 C<\N{}> with a sequence of multiple spaces is now a fatal error.
This has been deprecated since v5.18.
diff --git a/t/op/concat2.t b/t/op/concat2.t
index 46ec02e62f..9dfcc5b1d7 100644
--- a/t/op/concat2.t
+++ b/t/op/concat2.t
@@ -14,7 +14,6 @@ BEGIN {
plan 3;
SKIP: {
-skip("XXX 'use encoding' is gone. This test needs to be rewritten", 1);
skip_if_miniperl("no dynamic loading on miniperl, no Encode", 1);
fresh_perl_is <<'end', "ok\n", {},
no warnings 'deprecated';
diff --git a/t/porting/customized.dat b/t/porting/customized.dat
index b63e753cff..47d977b7c5 100644
--- a/t/porting/customized.dat
+++ b/t/porting/customized.dat
@@ -18,9 +18,3 @@ podlators cpan/podlators/scripts/pod2text.PL b4693fcfe4a0a1b38a215cfb8985a65d5d0
version cpan/version/lib/version.pm fa9931d4db05aff9a0a6ef558610b1a472d9306e
version vutil.c abd88f59a6e0cfe7b4e45b1859f414042ea254aa
version vxs.inc 9064aacbdfe42bb584a068f62b505dd11dbb4dc4
-Encode cpan/Encode/encoding.pm 4dc8e5e81f7b13e185d453c0ac704a07d625f190
-Encode cpan/Encode/t/enc_data.t 82e46d0908fdd381ab01b700240050034336a66d
-Encode cpan/Encode/t/enc_eucjp.t 9b386c1ef035f22798b124aa361bfecb833456c0
-Encode cpan/Encode/t/enc_utf8.t 3414490ad30b155241f07e3e3f2079743de16d40
-Encode cpan/Encode/t/encoding.t 4ac06c1f1c1b958c4e4b11304b8372bc94396c11
-Encode cpan/Encode/t/jperl.t 3c21d9c62d1a68dc6da7431f364f8aa4b3e9d040
diff --git a/t/re/pat_advanced.t b/t/re/pat_advanced.t
index d6d14dfd00..302d90ae17 100644
--- a/t/re/pat_advanced.t
+++ b/t/re/pat_advanced.t
@@ -1873,6 +1873,8 @@ EOP
'IsPunct disagrees with [:punct:] outside ASCII');
my @isPunctLatin1 = eval q {
+ no warnings 'deprecated';
+ use encoding 'latin1';
grep {/[[:punct:]]/ != /\p{IsPunct}/} map {chr} 0x80 .. 0xff;
};
skip "Eval failed ($@)", 1 if $@;
diff --git a/t/uni/chr.t b/t/uni/chr.t
index 226f1b7496..9445d32a7b 100644
--- a/t/uni/chr.t
+++ b/t/uni/chr.t
@@ -2,7 +2,6 @@
BEGIN {
require './test.pl';
- skip_all("'use encoding' has been removed");
skip_all_without_dynamic_extension('Encode');
skip_all("EBCDIC") if $::IS_EBCDIC;
skip_all_without_perlio();
diff --git a/t/uni/greek.t b/t/uni/greek.t
index d911a75ca6..5326ab94ad 100644
--- a/t/uni/greek.t
+++ b/t/uni/greek.t
@@ -2,7 +2,6 @@
BEGIN {
require './test.pl';
- skip_all("'use encoding' has been removed");
skip_all_without_dynamic_extension('Encode');
skip_all("EBCDIC") if $::IS_EBCDIC;
skip_all_without_perlio();
diff --git a/t/uni/latin2.t b/t/uni/latin2.t
index 06299db28a..6e7d980aec 100644
--- a/t/uni/latin2.t
+++ b/t/uni/latin2.t
@@ -2,7 +2,6 @@
BEGIN {
require './test.pl';
- skip_all("'use encoding' has been removed");
skip_all_without_dynamic_extension('Encode');
skip_all("EBCDIC") if $::IS_EBCDIC;
skip_all_without_perlio();
diff --git a/t/uni/tr_7jis.t b/t/uni/tr_7jis.t
index 918655b9e8..2108319d47 100644
--- a/t/uni/tr_7jis.t
+++ b/t/uni/tr_7jis.t
@@ -6,7 +6,6 @@
BEGIN {
require './test.pl';
- skip_all("'use encoding' has been removed");
skip_all_without_dynamic_extension('Encode');
skip_all("EBCDIC") if $::IS_EBCDIC;
skip_all_without_perlio();
diff --git a/t/uni/tr_eucjp.t b/t/uni/tr_eucjp.t
index 13ae4e14ca..a317bb17aa 100644
--- a/t/uni/tr_eucjp.t
+++ b/t/uni/tr_eucjp.t
@@ -5,7 +5,6 @@
BEGIN {
require './test.pl';
- skip_all("'use encoding' has been removed");
skip_all_without_dynamic_extension('Encode');
skip_all("EBCDIC") if $::IS_EBCDIC;
skip_all_without_perlio();
diff --git a/t/uni/tr_sjis.t b/t/uni/tr_sjis.t
index b1728260d9..a82b35c469 100644
--- a/t/uni/tr_sjis.t
+++ b/t/uni/tr_sjis.t
@@ -5,7 +5,6 @@
BEGIN {
require './test.pl';
- skip_all("'use encoding' has been removed");
skip_all_without_dynamic_extension('Encode');
skip_all("EBCDIC") if $::IS_EBCDIC;
skip_all_without_perlio();
diff --git a/t/uni/tr_utf8.t b/t/uni/tr_utf8.t
index 01a26bc270..2a566d91b9 100644
--- a/t/uni/tr_utf8.t
+++ b/t/uni/tr_utf8.t
@@ -6,7 +6,6 @@
BEGIN {
require './test.pl';
- skip_all("'use encoding' has been removed");
skip_all_without_dynamic_extension('Encode');
skip_all("EBCDIC") if $::IS_EBCDIC;
skip_all_without_perlio();
View Lorry Controller Status