Clear severity 5 perlcritic warnings from vcregress.pl
authorAndrew Dunstan <[email protected]>
Sun, 6 May 2018 11:37:05 +0000 (07:37 -0400)
committerAndrew Dunstan <[email protected]>
Sun, 6 May 2018 11:37:05 +0000 (07:37 -0400)
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

index 2b8341f4fc257efdaef0f6353b78ae29a03cdb8f..3a88638d705431050f1df909e213c885bee451ec 100644 (file)
@@ -264,10 +264,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;
@@ -279,15 +279,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;
 }