diff --git a/configpm b/configpm index 07219d8e075c..0c46b9e6daa8 100755 --- a/configpm +++ b/configpm @@ -1199,7 +1199,7 @@ if ($orig_config_txt ne $config_txt or $orig_heavy_txt ne $heavy_txt) { unshift(@INC,'lib'); require $Config_PM; require $Config_heavy; -import Config; +Config->import; die "$0: $Config_PM not valid" unless $Config{'PERL_CONFIG_SH'} eq 'true'; diff --git a/dist/Devel-PPPort/parts/inc/podtest b/dist/Devel-PPPort/parts/inc/podtest index df18c3a4a828..5c416139fbc0 100644 --- a/dist/Devel-PPPort/parts/inc/podtest +++ b/dist/Devel-PPPort/parts/inc/podtest @@ -24,7 +24,7 @@ else { use Test::Pod; $Test::Pod::VERSION >= 1.41 or die "Test::Pod version only $Test::Pod::VERSION"; - import Test::Pod tests => scalar @pods; + Test::Pod->import(tests => scalar @pods); }; $reason = 'Test::Pod >= 1.41 required' if $@; } diff --git a/dist/Exporter/t/Exporter.t b/dist/Exporter/t/Exporter.t index 2fcd00384fe1..6127e40357aa 100644 --- a/dist/Exporter/t/Exporter.t +++ b/dist/Exporter/t/Exporter.t @@ -248,7 +248,7 @@ sub TIESCALAR{bless[]} { tie my $t, __PACKAGE__; for($t) { # $_ is now tied - import Exporter::for::Tied::_; + Exporter::for::Tied::_->import; } } ::ok(1, 'import with tied $_'); diff --git a/dist/ExtUtils-CBuilder/t/00-have-compiler.t b/dist/ExtUtils-CBuilder/t/00-have-compiler.t index bd2ed10e5c9d..bac645133709 100644 --- a/dist/ExtUtils-CBuilder/t/00-have-compiler.t +++ b/dist/ExtUtils-CBuilder/t/00-have-compiler.t @@ -13,7 +13,7 @@ BEGIN { if ($^O eq 'VMS') { # So we can get the return value of system() require vmsish; - import vmsish; + vmsish->import; } } diff --git a/dist/ExtUtils-CBuilder/t/01-basic.t b/dist/ExtUtils-CBuilder/t/01-basic.t index d6b75e9d0bcd..80435fa30f80 100644 --- a/dist/ExtUtils-CBuilder/t/01-basic.t +++ b/dist/ExtUtils-CBuilder/t/01-basic.t @@ -6,7 +6,7 @@ BEGIN { if ($^O eq 'VMS') { # So we can get the return value of system() require vmsish; - import vmsish; + vmsish->import; } } use ExtUtils::CBuilder; diff --git a/dist/ExtUtils-CBuilder/t/02-link.t b/dist/ExtUtils-CBuilder/t/02-link.t index 6160c267d0c7..6ee68ccb562a 100644 --- a/dist/ExtUtils-CBuilder/t/02-link.t +++ b/dist/ExtUtils-CBuilder/t/02-link.t @@ -6,7 +6,7 @@ BEGIN { if ($^O eq 'VMS') { # So we can get the return value of system() require vmsish; - import vmsish; + vmsish->import; } } use ExtUtils::CBuilder; diff --git a/dist/ExtUtils-CBuilder/t/03-cplusplus.t b/dist/ExtUtils-CBuilder/t/03-cplusplus.t index 2fae11fc0e1a..b4800427c686 100644 --- a/dist/ExtUtils-CBuilder/t/03-cplusplus.t +++ b/dist/ExtUtils-CBuilder/t/03-cplusplus.t @@ -6,7 +6,7 @@ BEGIN { if ($^O eq 'VMS') { # So we can get the return value of system() require vmsish; - import vmsish; + vmsish->import; } } use ExtUtils::CBuilder; diff --git a/dist/I18N-Collate/t/I18N-Collate.t b/dist/I18N-Collate/t/I18N-Collate.t index 4f12cba3ec38..5916f5e4bd7e 100644 --- a/dist/I18N-Collate/t/I18N-Collate.t +++ b/dist/I18N-Collate/t/I18N-Collate.t @@ -7,7 +7,7 @@ use strict; no warnings; BEGIN { - require Config; import Config; + require Config; Config->import; if (!$::Config{d_setlocale} || $::Config{ccflags} =~ /\bD?NO_LOCALE\b/) { print "1..0\n"; exit; diff --git a/dist/Safe/t/safe1.t b/dist/Safe/t/safe1.t index 0f3d8e88d6a7..e9bd5cf675fd 100644 --- a/dist/Safe/t/safe1.t +++ b/dist/Safe/t/safe1.t @@ -1,7 +1,7 @@ #!./perl -w $|=1; BEGIN { - require Config; import Config; + require Config; Config->import; if ($Config{'extensions'} !~ /\bOpcode\b/ && $Config{'osname'} ne 'VMS') { print "1..0\n"; exit 0; diff --git a/dist/Safe/t/safe2.t b/dist/Safe/t/safe2.t index ee738529c440..216808484631 100644 --- a/dist/Safe/t/safe2.t +++ b/dist/Safe/t/safe2.t @@ -1,7 +1,7 @@ #!./perl -w $|=1; BEGIN { - require Config; import Config; + require Config; Config->import; if ($Config{'extensions'} !~ /\bOpcode\b/ && $Config{'osname'} ne 'VMS') { print "1..0\n"; exit 0; diff --git a/dist/Safe/t/safe3.t b/dist/Safe/t/safe3.t index c1b59c07f49f..fcca684ea919 100644 --- a/dist/Safe/t/safe3.t +++ b/dist/Safe/t/safe3.t @@ -1,7 +1,7 @@ #!perl -w BEGIN { - require Config; import Config; + require Config; Config->import; if ($Config{'extensions'} !~ /\bOpcode\b/ && $Config{'extensions'} !~ /\bPOSIX\b/ && $Config{'osname'} ne 'VMS') diff --git a/dist/Safe/t/safeload.t b/dist/Safe/t/safeload.t index 9830707b2e64..f8cb75513ed0 100644 --- a/dist/Safe/t/safeload.t +++ b/dist/Safe/t/safeload.t @@ -2,7 +2,7 @@ BEGIN { require Config; - import Config; + Config->import; if ($Config{'extensions'} !~ /\bOpcode\b/) { print "1..0\n"; exit 0; diff --git a/dist/Safe/t/safenamedcap.t b/dist/Safe/t/safenamedcap.t index 6afa70e587cc..f72271b4618d 100644 --- a/dist/Safe/t/safenamedcap.t +++ b/dist/Safe/t/safenamedcap.t @@ -4,7 +4,7 @@ BEGIN { exit 0; } require Config; - import Config; + Config->import; if ($Config{'extensions'} !~ /\bOpcode\b/) { print "1..0\n"; exit 0; diff --git a/dist/Safe/t/saferegexp.t b/dist/Safe/t/saferegexp.t index 2719ca120256..674495c71ed3 100644 --- a/dist/Safe/t/saferegexp.t +++ b/dist/Safe/t/saferegexp.t @@ -1,7 +1,7 @@ #!perl -w BEGIN { - require Config; import Config; + require Config; Config->import; if ($Config{'extensions'} !~ /\bOpcode\b/) { print "1..0\n"; exit 0; diff --git a/dist/Safe/t/safesecurity.t b/dist/Safe/t/safesecurity.t index 7cb97127faff..17362a286205 100644 --- a/dist/Safe/t/safesecurity.t +++ b/dist/Safe/t/safesecurity.t @@ -2,7 +2,7 @@ BEGIN { require Config; - import Config; + Config->import; if ($Config{'extensions'} !~ /\bOpcode\b/) { print "1..0\n"; exit 0; diff --git a/dist/Safe/t/safesig.t b/dist/Safe/t/safesig.t index b643534622bb..62c67ed64140 100644 --- a/dist/Safe/t/safesig.t +++ b/dist/Safe/t/safesig.t @@ -2,7 +2,7 @@ BEGIN { require Config; - import Config; + Config->import; if ($Config{'extensions'} !~ /\bOpcode\b/) { print "1..0\n"; exit 0; diff --git a/dist/Safe/t/safesort.t b/dist/Safe/t/safesort.t index 366358df03b3..827ec5372f1f 100644 --- a/dist/Safe/t/safesort.t +++ b/dist/Safe/t/safesort.t @@ -1,7 +1,7 @@ #!perl -w $|=1; BEGIN { - require Config; import Config; + require Config; Config->import; if ($Config{'extensions'} !~ /\bOpcode\b/ && $Config{'osname'} ne 'VMS') { print "1..0\n"; exit 0; diff --git a/dist/Safe/t/safeuniversal.t b/dist/Safe/t/safeuniversal.t index ad2377562c19..587addb6bd82 100644 --- a/dist/Safe/t/safeuniversal.t +++ b/dist/Safe/t/safeuniversal.t @@ -2,7 +2,7 @@ BEGIN { require Config; - import Config; + Config->import; if ($Config{'extensions'} !~ /\bOpcode\b/) { print "1..0\n"; exit 0; diff --git a/dist/Safe/t/safeutf8.t b/dist/Safe/t/safeutf8.t index 07d70aa01896..eec57a4a0f89 100644 --- a/dist/Safe/t/safeutf8.t +++ b/dist/Safe/t/safeutf8.t @@ -1,7 +1,7 @@ #!perl -w $|=1; BEGIN { - require Config; import Config; + require Config; Config->import; if ($Config{'extensions'} !~ /\bOpcode\b/ && $Config{'osname'} ne 'VMS') { print "1..0\n"; exit 0; diff --git a/dist/Safe/t/safewrap.t b/dist/Safe/t/safewrap.t index b99f4164dde8..c9d8b96828ad 100644 --- a/dist/Safe/t/safewrap.t +++ b/dist/Safe/t/safewrap.t @@ -2,7 +2,7 @@ $|=1; BEGIN { - require Config; import Config; + require Config; Config->import; if ($Config{'extensions'} !~ /\bOpcode\b/ && $Config{'osname'} ne 'VMS') { print "1..0\n"; exit 0; diff --git a/dist/autouse/t/autouse.t b/dist/autouse/t/autouse.t index 20ad9eb8d4d8..d7381d86af4d 100644 --- a/dist/autouse/t/autouse.t +++ b/dist/autouse/t/autouse.t @@ -91,7 +91,7 @@ SKIP: { is $w, undef, 'no redefinition warning when clobbering autouse stub with new sub'; undef $w; - import MyTestModule2 'test_function2'; + MyTestModule2->import('test_function2'); is $w, undef, 'no redefinition warning when clobbering autouse stub via *a=\&b'; } diff --git a/dist/threads/lib/threads.pm b/dist/threads/lib/threads.pm index 5f159a5b44c8..85c48b98865b 100644 --- a/dist/threads/lib/threads.pm +++ b/dist/threads/lib/threads.pm @@ -5,7 +5,7 @@ use 5.008; use strict; use warnings; -our $VERSION = '2.42'; # remember to update version in POD! +our $VERSION = '2.43'; # remember to update version in POD! my $XS_VERSION = $VERSION; #$VERSION = eval $VERSION; @@ -56,7 +56,7 @@ sub import } } elsif ($sym =~ /^str/i) { - import overload ('""' => \&tid); + overload->import('""' => \&tid); } elsif ($sym =~ /^(?::all|yield)$/) { push(@EXPORT, qw(yield)); @@ -134,7 +134,7 @@ threads - Perl interpreter-based threads =head1 VERSION -This document describes threads version 2.42 +This document describes threads version 2.43 =head1 WARNING diff --git a/ext/Devel-Peek/t/Peek.t b/ext/Devel-Peek/t/Peek.t index 5a563acd1ad9..77128c4d17eb 100644 --- a/ext/Devel-Peek/t/Peek.t +++ b/ext/Devel-Peek/t/Peek.t @@ -1,7 +1,7 @@ #!./perl -T BEGIN { - require Config; import Config; + require Config; Config->import; if ($Config{'extensions'} !~ /\bDevel\/Peek\b/) { print "1..0 # Skip: Devel::Peek was not built\n"; exit 0; diff --git a/ext/Fcntl/t/syslfs.t b/ext/Fcntl/t/syslfs.t index c94c3441633c..bd9c7b21d30f 100644 --- a/ext/Fcntl/t/syslfs.t +++ b/ext/Fcntl/t/syslfs.t @@ -3,13 +3,13 @@ # If you modify/add tests here, remember to update also t/op/lfs.t. BEGIN { - require Config; import Config; + require Config; Config->import; # Don't bother if there are no quad offsets. if ($Config{lseeksize} < 8) { print "1..0 # Skip: no 64-bit file offsets\n"; exit(0); } - require Fcntl; import Fcntl qw(/^O_/ /^SEEK_/); + require Fcntl; Fcntl->import(qw(/^O_/ /^SEEK_/)); } use strict; diff --git a/ext/File-DosGlob/t/DosGlob.t b/ext/File-DosGlob/t/DosGlob.t index 49a0f9e7e810..44d33ded0ebc 100644 --- a/ext/File-DosGlob/t/DosGlob.t +++ b/ext/File-DosGlob/t/DosGlob.t @@ -143,7 +143,7 @@ if ($cwd =~ /^([a-zA-Z]:)/) { SKIP: { require Config; skip "no XS::APItest" - unless eval { require XS::APItest; import XS::APItest "sv_count"; 1 }; + unless eval { require XS::APItest; XS::APItest->import("sv_count"); 1 }; # Use a random number of ops, so that the glob op does not reuse the # same address each time, giving us false passes. my($count,$count2); diff --git a/ext/File-Glob/t/basic.t b/ext/File-Glob/t/basic.t index b6bca0bc07b7..27dcd3f4ec3d 100644 --- a/ext/File-Glob/t/basic.t +++ b/ext/File-Glob/t/basic.t @@ -3,7 +3,7 @@ BEGIN { chdir 't' if -d 't'; @INC = '../lib'; - require Config; import Config; + require Config; Config->import; if ($Config{'extensions'} !~ /\bFile\/Glob\b/i) { print "1..0\n"; exit 0; diff --git a/ext/File-Glob/t/case.t b/ext/File-Glob/t/case.t index 320e7d14f159..08055d2febec 100644 --- a/ext/File-Glob/t/case.t +++ b/ext/File-Glob/t/case.t @@ -3,7 +3,7 @@ BEGIN { chdir 't' if -d 't'; @INC = '../lib'; - require Config; import Config; + require Config; Config->import; if ($Config{'extensions'} !~ /\bFile\/Glob\b/i) { print "1..0\n"; exit 0; @@ -18,12 +18,12 @@ BEGIN { my $pat = "op/G*.t"; -import File::Glob ':nocase'; +File::Glob->import(':nocase'); @a = csh_glob($pat); cmp_ok(scalar @a, '>=', 8, 'use of the case sensitivity tags, via csh_glob()'); # This may fail on systems which are not case-PRESERVING -import File::Glob ':case'; +File::Glob->import(':case'); @a = csh_glob($pat); is(scalar @a, 0, 'None should be uppercase'); diff --git a/ext/File-Glob/t/global.t b/ext/File-Glob/t/global.t index cf7d5b23753e..0ed8db378c0b 100644 --- a/ext/File-Glob/t/global.t +++ b/ext/File-Glob/t/global.t @@ -3,7 +3,7 @@ BEGIN { chdir 't' if -d 't'; @INC = '../lib'; - require Config; import Config; + require Config; Config->import; if ($Config{'extensions'} !~ /\bFile\/Glob\b/i) { print "1..0\n"; exit 0; diff --git a/ext/File-Glob/t/taint.t b/ext/File-Glob/t/taint.t index 4751303fe0ec..568e9de5721f 100644 --- a/ext/File-Glob/t/taint.t +++ b/ext/File-Glob/t/taint.t @@ -3,7 +3,7 @@ BEGIN { chdir 't' if -d 't'; @INC = '../lib'; - require Config; import Config; + require Config; Config->import; if ($Config{'extensions'} !~ /\bFile\/Glob\b/i) { print "1..0\n"; exit 0; diff --git a/ext/File-Glob/t/threads.t b/ext/File-Glob/t/threads.t index 03f00ceb63f6..70105be2804b 100644 --- a/ext/File-Glob/t/threads.t +++ b/ext/File-Glob/t/threads.t @@ -3,7 +3,7 @@ BEGIN { chdir 't' if -d 't'; @INC = '../lib'; - require Config; import Config; + require Config; Config->import; if ($Config{'extensions'} !~ /\bFile\/Glob\b/i) { print "1..0\n"; exit 0; diff --git a/ext/Hash-Util/t/Util.t b/ext/Hash-Util/t/Util.t index 33d99679a21f..74791a4ef676 100644 --- a/ext/Hash-Util/t/Util.t +++ b/ext/Hash-Util/t/Util.t @@ -2,7 +2,7 @@ BEGIN { if ($ENV{PERL_CORE}) { - require Config; import Config; + require Config; Config->import; no warnings 'once'; if ($Config{extensions} !~ /\bHash\/Util\b/) { print "1..0 # Skip: Hash::Util was not built\n"; diff --git a/ext/IPC-Open3/t/IPC-Open3.t b/ext/IPC-Open3/t/IPC-Open3.t index a5cae6ca69a5..a30f361e7207 100644 --- a/ext/IPC-Open3/t/IPC-Open3.t +++ b/ext/IPC-Open3/t/IPC-Open3.t @@ -1,7 +1,7 @@ #!./perl -w BEGIN { - require Config; import Config; + require Config; Config->import; if (!$Config{'d_fork'} # open2/3 supported on win32 && $^O ne 'MSWin32') diff --git a/ext/Opcode/t/Opcode.t b/ext/Opcode/t/Opcode.t index 82028cc5b2cf..1f43d8942d47 100644 --- a/ext/Opcode/t/Opcode.t +++ b/ext/Opcode/t/Opcode.t @@ -3,7 +3,7 @@ $|=1; BEGIN { - require Config; import Config; + require Config; Config->import; if ($Config{'extensions'} !~ /\bOpcode\b/ && $Config{'osname'} ne 'VMS') { print "1..0\n"; exit 0; diff --git a/ext/Opcode/t/ops.t b/ext/Opcode/t/ops.t index 3f1c4277f0cd..07564145943c 100644 --- a/ext/Opcode/t/ops.t +++ b/ext/Opcode/t/ops.t @@ -1,7 +1,7 @@ #!./perl BEGIN { - require Config; import Config; + require Config; Config->import; if ($Config{'extensions'} !~ /\bOpcode\b/ && $Config{'osname'} ne 'VMS') { print "1..0\n"; exit 0; diff --git a/ext/POSIX/t/mb.t b/ext/POSIX/t/mb.t index 64941e4a23b8..2af5f855d4f8 100644 --- a/ext/POSIX/t/mb.t +++ b/ext/POSIX/t/mb.t @@ -8,7 +8,7 @@ # with the correct LC_CTYPE set in the environment. BEGIN { - require Config; import Config; + require Config; Config->import; if ($^O ne 'VMS' and $Config{'extensions'} !~ /\bPOSIX\b/) { print "1..0\n"; exit 0; diff --git a/ext/POSIX/t/posix.t b/ext/POSIX/t/posix.t index 504708e3548f..059c63a28424 100644 --- a/ext/POSIX/t/posix.t +++ b/ext/POSIX/t/posix.t @@ -1,7 +1,7 @@ #!./perl BEGIN { - require Config; import Config; + require Config; Config->import; if ($^O ne 'VMS' and $Config{'extensions'} !~ /\bPOSIX\b/) { print "1..0\n"; exit 0; diff --git a/ext/POSIX/t/taint.t b/ext/POSIX/t/taint.t index 5a960c714ba8..00ca4ec16a42 100644 --- a/ext/POSIX/t/taint.t +++ b/ext/POSIX/t/taint.t @@ -1,7 +1,7 @@ #!./perl -Tw BEGIN { - require Config; import Config; + require Config; Config->import; if ($^O ne 'VMS' and $Config{'extensions'} !~ /\bPOSIX\b/) { print "1..0\n"; exit 0; diff --git a/ext/PerlIO-encoding/t/fallback.t b/ext/PerlIO-encoding/t/fallback.t index 686b164236ac..15332adc26b4 100644 --- a/ext/PerlIO-encoding/t/fallback.t +++ b/ext/PerlIO-encoding/t/fallback.t @@ -13,7 +13,7 @@ BEGIN { print "1..0 # Skip: No Encode\n"; exit 0; } - import Encode qw(:fallback_all); + Encode->import(qw(:fallback_all)); } use Test::More tests => 10; diff --git a/ext/Sys-Hostname/t/Hostname.t b/ext/Sys-Hostname/t/Hostname.t index 99f9e562c725..c40d1e161db8 100644 --- a/ext/Sys-Hostname/t/Hostname.t +++ b/ext/Sys-Hostname/t/Hostname.t @@ -1,7 +1,7 @@ #!./perl BEGIN { - require Config; import Config; + require Config; Config->import; if ($Config{'extensions'} !~ /\bSys\/Hostname\b/) { print "1..0 # Skip: Sys::Hostname was not built\n"; exit 0; diff --git a/ext/VMS-Filespec/lib/VMS/Filespec.pm b/ext/VMS-Filespec/lib/VMS/Filespec.pm index f0c508dce718..e2c58e15b598 100644 --- a/ext/VMS-Filespec/lib/VMS/Filespec.pm +++ b/ext/VMS-Filespec/lib/VMS/Filespec.pm @@ -37,7 +37,7 @@ which determines whether you have delete access to a file. If you're running under VMS, the routines in this package are special, in that they're automatically made available to any Perl script, whether you're running F or the full F. The C or C +VMS::Filespec> or C<< require VMS::Filespec; VMS::Filespec->import(...) >> statement can be used to import the function names into the current package, but they're always available if you use the fully qualified name, whether or not you've mentioned the F<.pm> file in your script. @@ -223,7 +223,7 @@ This document was last revised 8-DEC-2007, for Perl 5.10.0 package VMS::Filespec; require 5.006; -our $VERSION = '1.14'; +our $VERSION = '1.15'; # If you want to use this package on a non-VMS system, # uncomment the following line. diff --git a/ext/VMS-Stdio/t/vms_stdio.t b/ext/VMS-Stdio/t/vms_stdio.t index 64fe3a357310..f4b96d59819d 100644 --- a/ext/VMS-Stdio/t/vms_stdio.t +++ b/ext/VMS-Stdio/t/vms_stdio.t @@ -1,6 +1,6 @@ # Tests for VMS::Stdio v2.2 use VMS::Stdio; -import VMS::Stdio qw(&flush &getname &rewind &sync &tmpnam); +VMS::Stdio->import(qw(&flush &getname &rewind &sync &tmpnam)); print "1..19\n"; print +(defined(&getname) ? '' : 'not '), "ok 1\n"; diff --git a/ext/XS-APItest/t/my_cxt.t b/ext/XS-APItest/t/my_cxt.t index d2d60555f711..be03309e21bb 100644 --- a/ext/XS-APItest/t/my_cxt.t +++ b/ext/XS-APItest/t/my_cxt.t @@ -5,7 +5,7 @@ my $threads; BEGIN { - require Config; import Config; + require Config; Config->import; $threads = $Config{'useithreads'}; # must 'use threads' before 'use Test::More' eval 'use threads' if $threads; diff --git a/ext/XS-Typemap/t/Typemap.t b/ext/XS-Typemap/t/Typemap.t index 93a67bf031f4..7badbd8de3d5 100644 --- a/ext/XS-Typemap/t/Typemap.t +++ b/ext/XS-Typemap/t/Typemap.t @@ -1,5 +1,5 @@ BEGIN { - require Config; import Config; + require Config; Config->import; if ($Config{'extensions'} !~ /\bXS\/Typemap\b/) { print "1..0 # Skip: XS::Typemap was not built\n"; exit 0; diff --git a/ext/re/t/reflags.t b/ext/re/t/reflags.t index 595b4b28b466..477fffbd154d 100644 --- a/ext/re/t/reflags.t +++ b/ext/re/t/reflags.t @@ -126,7 +126,7 @@ is qr//, '(?^:)', 'no re "/d" is a no-op when not on'; ok $_[0] =~ /Unknown regular expression flag "\x{100}"/, "warning with unknown regexp flags in use re '/flags'" }; - import re "/\x{100}" + re->import("/\x{100}"); } # use re '/flags' in combination with explicit flags diff --git a/lib/AnyDBM_File.t b/lib/AnyDBM_File.t index 22f262bf178c..045fa45616c5 100644 --- a/lib/AnyDBM_File.t +++ b/lib/AnyDBM_File.t @@ -3,8 +3,8 @@ BEGIN { chdir 't' if -d 't'; @INC = '../lib'; - require Config; import Config; - require Test::More; import Test::More; + require Config; Config->import; + require Test::More; Test::More->import; plan(tests, 12); } diff --git a/lib/B/Deparse-core.t b/lib/B/Deparse-core.t index eb125a6e8d44..7fcb7d8d9ef4 100644 --- a/lib/B/Deparse-core.t +++ b/lib/B/Deparse-core.t @@ -93,7 +93,7 @@ sub testit { package test; use subs (); no warnings qw( experimental::keyword_any experimental::keyword_all ); - import subs $keyword; + subs->import($keyword); $code = "no warnings 'syntax'; no strict 'vars'; sub { ${vars}() = $expr }"; $code = "use feature 'isa';\n$code" if $keyword eq "isa"; $code = "use feature 'switch';\n$code" if $keyword eq "break"; @@ -610,7 +610,7 @@ recv 4 p ref 01 $ rename 2 p # XXX This code prints 'Undefined subroutine &main::require called': -# use subs (); import subs 'require'; +# use subs (); subs->import('require'); # eval q[no strict 'vars'; sub { () = require; }]; print $@; # so disable for now #require 01 $+ diff --git a/lib/DirHandle.t b/lib/DirHandle.t index 21a39f12128c..6bc3cf2f0e25 100644 --- a/lib/DirHandle.t +++ b/lib/DirHandle.t @@ -3,7 +3,7 @@ BEGIN { chdir 't' if -d 't'; @INC = '../lib'; - require Config; import Config; + require Config; Config->import; if (not $Config{'d_readdir'}) { print "1..0\n"; exit 0; diff --git a/lib/File/Compare.t b/lib/File/Compare.t index 640b18163134..47c6ec2244d5 100644 --- a/lib/File/Compare.t +++ b/lib/File/Compare.t @@ -62,7 +62,7 @@ is(compare_text($TEST,$README,sub {$_[0] ne $_[1]}), 1, my @donetests; eval { - require File::Temp; import File::Temp qw/ tempfile unlink0 /; + require File::Temp; File::Temp->import(qw/ tempfile unlink0 /); my($tfh,$filename) = tempfile('fcmpXXXX', TMPDIR => 1); # NB. The trailing space is intentional (see [perl #37716]) diff --git a/lib/FileHandle.t b/lib/FileHandle.t index d8bcd116027c..fc0837914bb1 100644 --- a/lib/FileHandle.t +++ b/lib/FileHandle.t @@ -3,7 +3,7 @@ BEGIN { chdir 't' if -d 't'; @INC = '../lib'; - require Config; import Config; + require Config; Config->import; if ($Config{'extensions'} !~ /\bIO\b/ && $^O ne 'VMS') { print "1..0\n"; exit 0; diff --git a/lib/Net/hostent.t b/lib/Net/hostent.t index 3ee198098877..dbe4a6b7e03a 100644 --- a/lib/Net/hostent.t +++ b/lib/Net/hostent.t @@ -8,7 +8,7 @@ BEGIN { use Test::More; BEGIN { - require Config; import Config; + require Config; Config->import; if ($Config{'extensions'} !~ /\bSocket\b/ && !(($^O eq 'VMS') && $Config{d_socket})) { diff --git a/lib/Unicode/UCD.t b/lib/Unicode/UCD.t index a70e3bd0d71e..57bd70286017 100644 --- a/lib/Unicode/UCD.t +++ b/lib/Unicode/UCD.t @@ -4,7 +4,7 @@ BEGIN { $::IS_EBCDIC = (ord("A") == 193) ? 1 : 0; chdir 't' if -d 't'; @INC = '../lib'; - require Config; import Config; + require Config; Config->import; if ($Config{'extensions'} !~ /\bStorable\b/) { print "1..0 # Skip: Storable was not built; Unicode::UCD uses Storable\n"; exit 0; diff --git a/lib/locale.t b/lib/locale.t index 6fa485e0d6cb..5a97de9ae6f2 100644 --- a/lib/locale.t +++ b/lib/locale.t @@ -54,7 +54,7 @@ BEGIN { exit; } $| = 1; - require Config; import Config; + require Config; Config->import; } use feature 'fc'; @@ -857,7 +857,7 @@ my $final_without_setlocale = $test_num; debug "Scanning for locales...\n"; -require POSIX; import POSIX ':locale_h'; +require POSIX; POSIX->import(':locale_h'); debug "Scanning for just perl-compatible locales"; my $category = 'LC_CTYPE'; diff --git a/lib/open.t b/lib/open.t index fa17f1a97ca5..00a8a1449590 100644 --- a/lib/open.t +++ b/lib/open.t @@ -3,7 +3,7 @@ BEGIN { chdir 't' if -d 't'; @INC = '../lib'; - require Config; import Config; + require Config; Config->import; require './test.pl'; require './charset_tools.pl'; } diff --git a/lib/sigtrap.t b/lib/sigtrap.t index 8ee0696c555f..719f975a2395 100644 --- a/lib/sigtrap.t +++ b/lib/sigtrap.t @@ -61,7 +61,7 @@ fresh_perl_like ' BEGIN { *CORE::GLOBAL::kill = sub {} } require sigtrap; - import sigtrap "INT"; + sigtrap->import("INT"); sub { $SIG{INT}->("INT") } -> (3) ', qr/\$ = main::__ANON__\(3\) called/, diff --git a/os2/OS2/OS2-ExtAttr/t/os2_ea.t b/os2/OS2/OS2-ExtAttr/t/os2_ea.t index 947e2f19167a..3c21f5d39bdf 100644 --- a/os2/OS2/OS2-ExtAttr/t/os2_ea.t +++ b/os2/OS2/OS2-ExtAttr/t/os2_ea.t @@ -1,7 +1,7 @@ BEGIN { chdir 't' if -d 't/lib'; @INC = '../lib' if -d 'lib'; - require Config; import Config; + require Config; Config->import; if (-d 'lib' and $Config{'extensions'} !~ /\bOS2(::|\/)REXX\b/) { print "1..0\n"; exit 0; diff --git a/os2/OS2/OS2-PrfDB/t/os2_prfdb.t b/os2/OS2/OS2-PrfDB/t/os2_prfdb.t index b9f7d90ae225..a03331f991ea 100644 --- a/os2/OS2/OS2-PrfDB/t/os2_prfdb.t +++ b/os2/OS2/OS2-PrfDB/t/os2_prfdb.t @@ -1,7 +1,7 @@ BEGIN { chdir 't' if -d 't/lib'; @INC = '../lib' if -d 'lib'; - require Config; import Config; + require Config; Config->import; if (-d 'lib' and $Config{'extensions'} !~ /\bOS2(::|\/)PrfDB\b/) { print "1..0\n"; exit 0; diff --git a/os2/OS2/OS2-REXX/t/rx_cmprt.t b/os2/OS2/OS2-REXX/t/rx_cmprt.t index 6db785be5152..4a218d7790bb 100644 --- a/os2/OS2/OS2-REXX/t/rx_cmprt.t +++ b/os2/OS2/OS2-REXX/t/rx_cmprt.t @@ -1,7 +1,7 @@ BEGIN { chdir 't' if -d 't/lib'; @INC = '../lib' if -d 'lib'; - require Config; import Config; + require Config; Config->import; if (-d 'lib' and $Config{'extensions'} !~ /\bOS2(::|\/)REXX\b/) { print "1..0\n"; exit 0; diff --git a/os2/OS2/OS2-REXX/t/rx_dllld.t b/os2/OS2/OS2-REXX/t/rx_dllld.t index 406bd63a338e..f89312d41bc7 100644 --- a/os2/OS2/OS2-REXX/t/rx_dllld.t +++ b/os2/OS2/OS2-REXX/t/rx_dllld.t @@ -1,7 +1,7 @@ BEGIN { chdir 't' if -d 't/lib'; @INC = '../lib' if -d 'lib'; - require Config; import Config; + require Config; Config->import; if (-d 'lib' and $Config{'extensions'} !~ /\bOS2(::|\/)REXX\b/) { print "1..0\n"; exit 0; diff --git a/os2/OS2/OS2-REXX/t/rx_emxrv.t b/os2/OS2/OS2-REXX/t/rx_emxrv.t index 5df8c32785d5..e8881f5296ca 100644 --- a/os2/OS2/OS2-REXX/t/rx_emxrv.t +++ b/os2/OS2/OS2-REXX/t/rx_emxrv.t @@ -1,7 +1,7 @@ BEGIN { chdir 't' if -d 't/lib'; @INC = '../lib' if -d 'lib'; - require Config; import Config; + require Config; Config->import; if (-d 'lib' and $Config{'extensions'} !~ /\bOS2(::|\/)REXX\b/) { print "1..0\n"; exit 0; diff --git a/os2/OS2/OS2-REXX/t/rx_objcall.t b/os2/OS2/OS2-REXX/t/rx_objcall.t index 0ec67b112de5..efa339b9e58d 100644 --- a/os2/OS2/OS2-REXX/t/rx_objcall.t +++ b/os2/OS2/OS2-REXX/t/rx_objcall.t @@ -1,7 +1,7 @@ BEGIN { chdir 't' if -d 't/lib'; @INC = '../lib' if -d 'lib'; - require Config; import Config; + require Config; Config->import; if (-d 'lib' and $Config{'extensions'} !~ /\bOS2(::|\/)REXX\b/) { print "1..0\n"; exit 0; diff --git a/os2/OS2/OS2-REXX/t/rx_sql.test b/os2/OS2/OS2-REXX/t/rx_sql.test index 602c76dc47d2..88d7f70bdee1 100644 --- a/os2/OS2/OS2-REXX/t/rx_sql.test +++ b/os2/OS2/OS2-REXX/t/rx_sql.test @@ -1,7 +1,7 @@ BEGIN { chdir 't' if -d 't/lib'; @INC = '../lib'; - require Config; import Config; + require Config; Config->import; if ($Config{'extensions'} !~ /\bOS2(::|\/)REXX\b/) { print "1..0\n"; exit 0; diff --git a/os2/OS2/OS2-REXX/t/rx_tiesql.test b/os2/OS2/OS2-REXX/t/rx_tiesql.test index c85a1e990b97..6f1465f984b8 100644 --- a/os2/OS2/OS2-REXX/t/rx_tiesql.test +++ b/os2/OS2/OS2-REXX/t/rx_tiesql.test @@ -1,7 +1,7 @@ BEGIN { chdir 't' if -d 't/lib'; @INC = '../lib'; - require Config; import Config; + require Config; Config->import; if ($Config{'extensions'} !~ /\bOS2(::|\/)REXX\b/) { print "1..0\n"; exit 0; diff --git a/os2/OS2/OS2-REXX/t/rx_tievar.t b/os2/OS2/OS2-REXX/t/rx_tievar.t index 9c9ea7d466ed..7643de181acf 100644 --- a/os2/OS2/OS2-REXX/t/rx_tievar.t +++ b/os2/OS2/OS2-REXX/t/rx_tievar.t @@ -1,7 +1,7 @@ BEGIN { chdir 't' if -d 't/lib'; @INC = '../lib' if -d 'lib'; - require Config; import Config; + require Config; Config->import; if (-d 'lib' and $Config{'extensions'} !~ /\bOS2(::|\/)REXX\b/) { print "1..0\n"; exit 0; diff --git a/os2/OS2/OS2-REXX/t/rx_tieydb.t b/os2/OS2/OS2-REXX/t/rx_tieydb.t index ec6bfca20ef2..e5174dbff408 100644 --- a/os2/OS2/OS2-REXX/t/rx_tieydb.t +++ b/os2/OS2/OS2-REXX/t/rx_tieydb.t @@ -1,7 +1,7 @@ BEGIN { chdir 't' if -d 't/lib'; @INC = '../lib' if -d 'lib'; - require Config; import Config; + require Config; Config->import; if (-d 'lib' and $Config{'extensions'} !~ /\bOS2(::|\/)REXX\b/) { print "1..0\n"; exit 0; diff --git a/os2/OS2/OS2-REXX/t/rx_varset.t b/os2/OS2/OS2-REXX/t/rx_varset.t index 166cf5362354..485c37e3c43b 100644 --- a/os2/OS2/OS2-REXX/t/rx_varset.t +++ b/os2/OS2/OS2-REXX/t/rx_varset.t @@ -1,7 +1,7 @@ BEGIN { chdir 't' if -d 't/lib'; @INC = '../lib' if -d 'lib'; - require Config; import Config; + require Config; Config->import; if (-d 'lib' and $Config{'extensions'} !~ /\bOS2(::|\/)REXX\b/) { print "1..0\n"; exit 0; diff --git a/os2/OS2/OS2-REXX/t/rx_vrexx.t b/os2/OS2/OS2-REXX/t/rx_vrexx.t index 361189468226..13e1845bd3a2 100644 --- a/os2/OS2/OS2-REXX/t/rx_vrexx.t +++ b/os2/OS2/OS2-REXX/t/rx_vrexx.t @@ -1,7 +1,7 @@ BEGIN { chdir 't' if -d 't/lib'; @INC = '../lib' if -d 'lib'; - require Config; import Config; + require Config; Config->import; if (-d 'lib' and $Config{'extensions'} !~ /\bOS2(::|\/)REXX\b/) { print "1..0 # skipped: OS2::REXX not built\n"; exit 0; diff --git a/pod/perlthrtut.pod b/pod/perlthrtut.pod index 82ac6952bdf8..4a121210310a 100644 --- a/pod/perlthrtut.pod +++ b/pod/perlthrtut.pod @@ -186,10 +186,10 @@ have code like this: if ($Config{useithreads}) { # We have threads require MyMod_threaded; - import MyMod_threaded; + MyMod_threaded->import(); } else { require MyMod_unthreaded; - import MyMod_unthreaded; + MyMod_unthreaded->import(); } } diff --git a/t/io/open.t b/t/io/open.t index 62298ef42fff..ae749b6973ff 100644 --- a/t/io/open.t +++ b/t/io/open.t @@ -490,7 +490,7 @@ pass("no crash when open autovivifies glob in freed package"); skip "Errno not built yet", 8; } require Errno; - import Errno 'ENOENT'; + Errno->import('ENOENT'); # check handling of multiple arguments, which the original patch # mis-handled $! = 0; diff --git a/t/loc_tools.pl b/t/loc_tools.pl index 45532ba9eaaf..e518b820b45d 100644 --- a/t/loc_tools.pl +++ b/t/loc_tools.pl @@ -20,7 +20,7 @@ solaris => [ 'vi_VN.UTF-8', ], # Use of U+A8 segfaults: GH #20578 ); -eval { require POSIX; import POSIX 'locale_h'; }; +eval { require POSIX; POSIX->import('locale_h'); }; my $has_locale_h = ! $@; my @known_categories = ( qw(LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY diff --git a/t/op/coreamp.t b/t/op/coreamp.t index d928c39b8ae3..b7082246ed40 100644 --- a/t/op/coreamp.t +++ b/t/op/coreamp.t @@ -1217,7 +1217,7 @@ like $@, qr'^Undefined format "STDOUT" called', { last if is_miniperl; require Cwd; - import Cwd; + Cwd->import; $tests += 3; require File::Temp ; my $dir = File::Temp::tempdir(uc cleanup => 1); diff --git a/t/op/eval.t b/t/op/eval.t index 8a1138bef5ec..371bbb27ae09 100644 --- a/t/op/eval.t +++ b/t/op/eval.t @@ -662,7 +662,7 @@ EOP # [perl #70151] { - BEGIN { eval 'require re; import re "/x"' } + BEGIN { eval 'require re; re->import("/x")' } ok "ab" =~ /a b/, 'eval does not localise %^H at run time'; } diff --git a/t/op/lc.t b/t/op/lc.t index 812c41d6b6b7..b0ecfb6c583f 100644 --- a/t/op/lc.t +++ b/t/op/lc.t @@ -9,7 +9,7 @@ BEGIN { chdir 't' if -d 't'; require './test.pl'; set_up_inc('../lib'); - require Config; import Config; + require Config; Config->import; skip_all_without_unicode_tables(); require './charset_tools.pl'; require './loc_tools.pl'; # Contains find_utf8_ctype_locale() diff --git a/t/run/switches.t b/t/run/switches.t index f72949f2ca6f..210089bb0f22 100644 --- a/t/run/switches.t +++ b/t/run/switches.t @@ -127,7 +127,7 @@ SKIP: { # Win32 won't let us open the directory, so we never get to die with # EISDIR, which happens after open. require Errno; - import Errno qw(EACCES EISDIR); + Errno->import(qw(EACCES EISDIR)); my $error = do { local $! = $^O eq 'MSWin32' ? &EACCES : &EISDIR; "$!" }; diff --git a/t/run/todo.t b/t/run/todo.t index e20d33120ae3..fc963e9ac5f8 100644 --- a/t/run/todo.t +++ b/t/run/todo.t @@ -5,7 +5,7 @@ BEGIN { set_up_inc('../lib', '.', '../ext/re'); require './charset_tools.pl'; require './loc_tools.pl'; - require Config; import Config; + require Config; Config->import; } use strict; diff --git a/t/win32/runenv.t b/t/win32/runenv.t index 332b5df7fca6..d9384057d7db 100644 --- a/t/win32/runenv.t +++ b/t/win32/runenv.t @@ -9,7 +9,7 @@ BEGIN { chdir 't' if -d 't'; @INC = '../lib'; require Config; Config->import; - require File::Temp; import File::Temp qw/:POSIX/; + require File::Temp; File::Temp->import(qw/:POSIX/); require Win32; ($::os_id, $::os_major) = ( Win32::GetOSVersion() )[ 4, 1 ];