From 289bafdbc469fd0ed2a4485eca22005dbe668db5 Mon Sep 17 00:00:00 2001
From: Andrew Dunstan <andrew@dunslane.net>
Date: Sun, 6 May 2018 07:37:05 -0400
Subject: [PATCH] Clear severity 5 perlcritic warnings from vcregress.pl
My recent update for python3 support used some idioms that are
unapproved. This fixes them. Backpatch to all live branches like the
original.
---
src/tools/msvc/vcregress.pl | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index f242b7bc8d9..64428ac7c39 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -261,10 +261,10 @@ sub mangle_plpython3
my @files = glob("$dir/$test.$extension $dir/${test}_[0-9].$extension");
foreach my $file (@files)
{
- open(my $handle, "$file") || die "test file $file not found";
+ open(my $handle, '<', $file) || die "test file $file not found";
my $contents = <$handle>;
close($handle);
- map
+ do
{
s/except ([[:alpha:]][[:alpha:].]*), *([[:alpha:]][[:alpha:]]*):/except $1 as $2:/g;
s/<type 'exceptions\.([[:alpha:]]*)'>/<class '$1'>/g;
@@ -276,15 +276,16 @@ sub mangle_plpython3
s/LANGUAGE plpython2?u/LANGUAGE plpython3u/g;
s/EXTENSION ([^ ]*_)*plpython2?u/EXTENSION $1plpython3u/g;
s/installing required extension "plpython2u"/installing required extension "plpython3u"/g;
- } $contents;
+ } for ($contents);
my $base = basename $file;
- open($handle, ">$dir/python3/$base") || die "opening python 3 file for $file";
+ open($handle, '>', "$dir/python3/$base") ||
+ die "opening python 3 file for $file";
print $handle $contents;
close($handle);
}
}
}
- map { $_ =~ s!^!python3/!; } @$tests;
+ do { s!^!python3/!; } foreach(@$tests);
return @$tests;
}
--
GitLab