Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 02d060d

Browse files
committed
Port regress-python3-mangle.mk to Solaris "sed", redux.
Per experimentation and buildfarm failures, Solaris' "sed" has got some kind of problem with regexes that use both '*' and '[[:alpha:]]'. We can work around that by replacing '[[:alpha:]]' with '[a-zA-Z]', which is plenty good enough for our purposes, especially since this is only needed in long-stable branches. I chose to flat-out remove the second pattern of this sort, 's/except \([a-zA-Z][a-zA-Z.]*\), *\([a-zA-Z][a-zA-Z]*\):/except \1 as \2:/g' because we haven't needed it since 8.4. Follow-on to c3556f6, which probably missed catching this because the problematic pattern was already gone when that patch was written. Patch v10-v12 only, as the problem manifests only there. We have a line of dead code in v13-v14, which isn't worth changing, and the whole mess is gone as of v15. Discussion: https://postgr.es/m/[email protected]
1 parent c832828 commit 02d060d

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

src/pl/plpython/regress-python3-mangle.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ REGRESS := $(foreach test,$(REGRESS),$(if $(filter $(test),$(REGRESS_PLPYTHON3_M
1414
pgregress-python3-mangle:
1515
$(MKDIR_P) sql/python3 expected/python3 results/python3
1616
for file in $(patsubst %,$(srcdir)/sql/%.sql,$(REGRESS_PLPYTHON3_MANGLE)) $(patsubst %,$(srcdir)/expected/%*.out,$(REGRESS_PLPYTHON3_MANGLE)); do \
17-
sed -e 's/except \([[:alpha:]][[:alpha:].]*\), *\([[:alpha:]][[:alpha:]]*\):/except \1 as \2:/g' \
18-
-e "s/<type 'exceptions\.\([[:alpha:]]*\)'>/<class '\1'>/g" \
17+
sed -e 's/except \([a-zA-Z][a-zA-Z.]*\), *\([a-zA-Z][a-zA-Z]*\):/except \1 as \2:/g' \
1918
-e "s/<type 'long'>/<class 'int'>/g" \
2019
-e "s/\([0-9][0-9]*\)L/\1/g" \
2120
-e 's/\([ [{]\)u"/\1"/g' \

0 commit comments

Comments
 (0)