Commit76ee0ef

authored

Merge pull request#21633 from meeseeksmachine/auto-backport-of-pr-21501-on-v3.5.x

Backport PR#21501 on branch v3.5.x (Refix for pyparsing compat.)

2 parents532f424 +03041da commit76ee0efCopy full SHA for 76ee0ef

File tree

-1

lines changed

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`frompyparsingimport (`
`16`	`16`	`Combine,Empty,Forward,Group,Literal,oneOf,OneOrMore,`
`17`	`17`	`Optional,ParseBaseException,ParseFatalException,ParserElement,`
`18`		`-ParseResults,QuotedString,Regex,StringEnd,Suppress,ZeroOrMore)`
	`18`	`+ParseResults,QuotedString,Regex,StringEnd,Suppress,White,ZeroOrMore)`
`19`	`19`
`20`	`20`	`importmatplotlibasmpl`
`21`	`21`	`from .import_api,cbook`
`@@ -2058,6 +2058,7 @@ def __init__(self):`
`2058`	`2058`	`p.accent<<=Group(`
`2059`	`2059`	`Suppress(p.bslash)`
`2060`	`2060`	`+oneOf([self._accent_map,self._wide_accents])`
	`2061`	`++Suppress(Optional(White()))`
`2061`	`2062`	`-p.placeable`
`2062`	`2063`	`)`
`2063`	`2064`

Comments

(0)