database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-02 11:44:50 +03:00
Code

Clear severity 5 perlcritic warnings from vcregress.pl

Browse Source 
My recent update for python3 support used some idioms that are
unapproved. This fixes them. Backpatch to all live branches like the
original.
This commit is contained in:
Andrew Dunstan 2018-05-06 07:37:05 -04:00
parent 8f1787a8f3
commit 0e6114be8c
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/tools/msvc/vcregress.pl
View File

@ -262,10 +262,10 @@ sub mangle_plpython3
my @files = glob("$dir/$test.$extension $dir/${test}_[0-9].$extension"); my @files = glob("$dir/$test.$extension $dir/${test}_[0-9].$extension");
foreach my $file (@files) 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>; my $contents = <$handle>;
close($handle); close($handle);
map do
{ {
s/except ([[:alpha:]][[:alpha:].]*), *([[:alpha:]][[:alpha:]]*):/except $1 as $2:/g; s/except ([[:alpha:]][[:alpha:].]*), *([[:alpha:]][[:alpha:]]*):/except $1 as $2:/g;
s/<type 'exceptions\.([[:alpha:]]*)'>/<class '$1'>/g; s/<type 'exceptions\.([[:alpha:]]*)'>/<class '$1'>/g;
@ -277,15 +277,16 @@ sub mangle_plpython3
s/LANGUAGE plpython2?u/LANGUAGE plpython3u/g; s/LANGUAGE plpython2?u/LANGUAGE plpython3u/g;
s/EXTENSION ([^ ]*_)*plpython2?u/EXTENSION $1plpython3u/g; s/EXTENSION ([^ ]*_)*plpython2?u/EXTENSION $1plpython3u/g;
s/installing required extension "plpython2u"/installing required extension "plpython3u"/g; s/installing required extension "plpython2u"/installing required extension "plpython3u"/g;
} $contents; } for ($contents);
my $base = basename $file; 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; print $handle $contents;
close($handle); close($handle);
} }
} }
} }
map { $_ =~ s!^!python3/!; } @$tests; do { s!^!python3/!; } foreach(@$tests);
return @$tests; return @$tests;
} }