Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitec20545

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 enoughfor our purposes, especially since this is only needed inlong-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 toc3556f6, which probably missed catching thisbecause the problematic pattern was already gone when thatpatch 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 worthchanging, and the whole mess is gone as of v15.Discussion:https://postgr.es/m/165561.1661984701@sss.pgh.pa.us
1 parent8bd054a commitec20545

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
forfilein$(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)

[8]ページ先頭

©2009-2025 Movatter.jp