Skip to content

Fix svg backend issue with pyparsing version >= 3 #888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rahulporuri merged 4 commits into from
Nov 9, 2021
Merged

Fix svg backend issue with pyparsing version >= 3 #888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a6c87f9
FIX : Fix issue with pyparsing version >= 3
Nov 8, 2021
dc64828
FIX : Handle pyparsing versions 2 and 3 accordingly
Nov 8, 2021
4ddf7ee
Merge branch 'main' of github.com:enthought/enable into rahulporuri-p…
Nov 9, 2021
fabd1ba
REF : Go with a simpler solution of checking for the method name
Nov 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions enable/savage/svg/pathdata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,13 @@ class CaselessPreservingLiteral(CaselessLiteral):

def __init__(self, matchString):
super().__init__(matchString.upper())
self.name = "'%s'" % matchString
self.errmsg = "Expected " + self.name

quoted_name = f"'{matchString}'"
if hasattr(self, "set_name"):
# Only available in pyparsing >= 3
self.set_name(quoted_name)
else:
self.setName(quoted_name)

def parseImpl(self, instring, loc, doActions=True):
test = instring[loc:loc + self.matchLen]
Expand Down
10 changes: 9 additions & 1 deletion enable/savage/svg/tests/test_pathdata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,18 @@
from enable.savage.svg.pathdata import (
Sequence, closePath, coordinatePair, curve, ellipticalArc, horizontalLine,
lineTo, moveTo, number, quadraticBezierCurveto,
smoothQuadraticBezierCurveto, svg, verticalLine
smoothQuadraticBezierCurveto, svg, verticalLine, CaselessLiteral,
)


class TestCaselessLiteral(unittest.TestCase):
def test_instantiation(self):
# regression test for https://github.com/enthought/enable/issues/887
# observed with pyparsing v >= 3
# we just test that instantiating the class doesnt raise exceptions
CaselessLiteral("test")


class TestNumber(unittest.TestCase):
parser = number
valid = ["1.e10", "1e2", "1e+4", "1e-10", "1.", "1.0", "0.1", ".2"]
Expand Down