* [PATCH 2/4] avoid relying on IO::Handle/IO::File autoload
2020-01-26 10:29 5% [PATCH 0/4] Perl 5.10.1 compatibility fixes Eric Wong
@ 2020-01-26 10:29 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2020-01-26 10:29 UTC (permalink / raw)
To: meta
Perl 5.14+ gained the ability to autoload IO::File
(and IO::Handle) on missing methods, so relying on
this breaks under 5.10.1.
There's no reason to load IO::File or IO::Handle
when built-in perlops work fine and are even a hair
faster.
---
lib/PublicInbox/Qspawn.pm | 2 +-
t/httpd-corner.t | 2 +-
t/import.t | 7 +++----
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/lib/PublicInbox/Qspawn.pm b/lib/PublicInbox/Qspawn.pm
index 31a1583d..3425e5e4 100644
--- a/lib/PublicInbox/Qspawn.pm
+++ b/lib/PublicInbox/Qspawn.pm
@@ -164,7 +164,7 @@ reread:
$async->async_pass($self->{psgi_env}->{'psgix.io'},
$qx_fh, \$buf);
} elsif (defined $r) {
- $r ? $qx_fh->write($buf) : event_step($self, undef);
+ $r ? (print $qx_fh $buf) : event_step($self, undef);
} else {
return if $! == EAGAIN; # try again when notified
goto reread if $! == EINTR;
diff --git a/t/httpd-corner.t b/t/httpd-corner.t
index 1f2bb53f..879a023a 100644
--- a/t/httpd-corner.t
+++ b/t/httpd-corner.t
@@ -278,7 +278,7 @@ SKIP: {
waitpid($pid, 0);
is($?, 0, 'curl exited successfully');
is(-s $cerr, 0, 'no errors from curl');
- $cout->seek(0, SEEK_SET);
+ seek($cout, 0, SEEK_SET);
is(<$cout>, sha1_hex($str), 'read expected body');
open my $fh, '-|', qw(curl -sS), "$base/async-big" or die $!;
diff --git a/t/import.t b/t/import.t
index cfbe501b..ecf2c590 100644
--- a/t/import.t
+++ b/t/import.t
@@ -7,8 +7,7 @@ use PublicInbox::MIME;
use PublicInbox::Git;
use PublicInbox::Import;
use PublicInbox::Spawn qw(spawn);
-use IO::File;
-use Fcntl qw(:DEFAULT);
+use Fcntl qw(:DEFAULT SEEK_SET);
use File::Temp qw/tempfile/;
use PublicInbox::TestCommon;
my ($dir, $for_destroy) = tmpdir();
@@ -42,12 +41,12 @@ if ($v2) {
my $in = tempfile();
print $in $mime->as_string or die "write failed: $!";
$in->flush or die "flush failed: $!";
- $in->seek(0, SEEK_SET);
+ seek($in, 0, SEEK_SET);
my $out = tempfile();
my $pid = spawn(\@cmd, {}, { 0 => $in, 1 => $out });
is(waitpid($pid, 0), $pid, 'waitpid succeeds on hash-object');
is($?, 0, 'hash-object');
- $out->seek(0, SEEK_SET);
+ seek($out, 0, SEEK_SET);
chomp(my $hashed_obj = <$out>);
is($hashed_obj, $info->[0], "last object_id matches exp");
}
^ permalink raw reply related [relevance 7%]
* [PATCH 0/4] Perl 5.10.1 compatibility fixes
@ 2020-01-26 10:29 5% Eric Wong
2020-01-26 10:29 7% ` [PATCH 2/4] avoid relying on IO::Handle/IO::File autoload Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2020-01-26 10:29 UTC (permalink / raw)
To: meta
Aside from the highlight.pm-dependent stuff, everything seems
to work fine after these patches under Perl 5.10.1.
Getting 5.10.1 to run required Devel::PatchPerl to make it
build on modern systems and LOTS of waiting for CPAN modules
to download and build, though :<
Eric Wong (4):
daemon: provide TCP_DEFER_ACCEPT for Perl <5.14
avoid relying on IO::Handle/IO::File autoload
t/hl_mod: document IO::Handle for autoflush
t/v2reindex.t: 5.10.1 glob compatibility
lib/PublicInbox/Daemon.pm | 5 +++--
lib/PublicInbox/Qspawn.pm | 2 +-
t/hl_mod.t | 1 +
t/httpd-corner.t | 11 ++++++-----
t/httpd-https.t | 2 +-
t/httpd.t | 2 +-
t/import.t | 7 +++----
t/nntpd-tls.t | 2 +-
t/v2reindex.t | 6 +++---
9 files changed, 20 insertions(+), 18 deletions(-)
^ permalink raw reply [relevance 5%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-01-26 10:29 5% [PATCH 0/4] Perl 5.10.1 compatibility fixes Eric Wong
2020-01-26 10:29 7% ` [PATCH 2/4] avoid relying on IO::Handle/IO::File autoload Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).