diff options
| author | James E Keenan <jkeenan@cpan.org> | 2018-10-13 15:48:39 -0400 |
|---|---|---|
| committer | James E Keenan <jkeenan@cpan.org> | 2018-10-17 08:14:27 -0400 |
| commit | df8b709bfcaea9932dd434f18393bfcb4e3d5568 (patch) | |
| tree | 19a07cf4d30729475da92f7161d62954420ece5e /ext/File-Glob | |
| parent | d8ff3e95e0f2357b6f26f5a94c52c46231fb1a74 (diff) | |
| download | perl-df8b709bfcaea9932dd434f18393bfcb4e3d5568.tar.gz | |
Remove File::Glob::glob() in perl-5.30
For: RT # 133586
Diffstat (limited to 'ext/File-Glob')
| -rw-r--r-- | ext/File-Glob/Glob.pm | 20 | ||||
| -rw-r--r-- | ext/File-Glob/t/basic.t | 15 |
2 files changed, 15 insertions, 20 deletions
diff --git a/ext/File-Glob/Glob.pm b/ext/File-Glob/Glob.pm index 07df4941a1..368a755f50 100644 --- a/ext/File-Glob/Glob.pm +++ b/ext/File-Glob/Glob.pm @@ -13,7 +13,7 @@ require XSLoader; %EXPORT_TAGS = ( 'glob' => [ qw( GLOB_ABEND - GLOB_ALPHASORT + GLOB_ALPHASORT GLOB_ALTDIRFUNC GLOB_BRACE GLOB_CSH @@ -29,15 +29,13 @@ require XSLoader; GLOB_QUOTE GLOB_TILDE bsd_glob - glob ) ], ); $EXPORT_TAGS{bsd_glob} = [@{$EXPORT_TAGS{glob}}]; -pop @{$EXPORT_TAGS{bsd_glob}}; # no "glob" @EXPORT_OK = (@{$EXPORT_TAGS{'glob'}}, 'csh_glob'); -$VERSION = '1.31'; +$VERSION = '1.32'; sub import { require Exporter; @@ -72,17 +70,11 @@ if ($^O =~ /^(?:MSWin32|VMS|os2|dos|riscos)$/) { $DEFAULT_FLAGS |= GLOB_NOCASE(); } -# File::Glob::glob() is deprecated because its prototype is different from -# CORE::glob() (use bsd_glob() instead) +# File::Glob::glob() removed in perl-5.30 because its prototype is different +# from CORE::glob() (use bsd_glob() instead) sub glob { - use 5.024; - use warnings (); - warnings::warnif (deprecated => - "File::Glob::glob() will disappear in perl 5.30. " . - "Use File::Glob::bsd_glob() instead.") unless state $warned ++; - - splice @_, 1; # no flags - goto &bsd_glob; + die "File::Glob::glob() was removed in perl 5.30. " . + "Use File::Glob::bsd_glob() instead. $!"; } 1; diff --git a/ext/File-Glob/t/basic.t b/ext/File-Glob/t/basic.t index f0363cdcdb..6ac911c6d5 100644 --- a/ext/File-Glob/t/basic.t +++ b/ext/File-Glob/t/basic.t @@ -44,17 +44,20 @@ if (opendir(D, ".")) { @correct = grep { !/^\./ } sort readdir(D); closedir D; } -my @a = do {no warnings 'deprecated'; File::Glob::glob("*", 0);}; -@a = sort @a; -if (GLOB_ERROR) { - fail(GLOB_ERROR); -} else { - is_deeply(\@a, \@correct); +{ + local $@; + my $expect = + qr/File::Glob::glob\(\) was removed in perl 5\.30\. Use File::Glob::bsd_glob\(\) instead/; + eval { File::Glob::glob("*", 0); }; + like $@, $expect, + "Got expected error message for removal of File::Glob::glob()"; } chdir '..' or die "chdir .. $!"; # look up the user's home directory # should return a list with one item, and not set ERROR +my @a; + SKIP: { my ($name, $home); skip $^O, 1 if $^O eq 'MSWin32' || $^O eq 'NetWare' || $^O eq 'VMS' |