Unbreak with py-parsing 2.1.0.

This commit is contained in:
shadchin
2016-03-13 08:12:14 +00:00
parent 88284b51f6
commit a50728b4ee
2 changed files with 25 additions and 2 deletions
+2 -2
View File
@@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.17 2016/01/26 13:05:26 sthen Exp $
# $OpenBSD: Makefile,v 1.18 2016/03/13 08:12:14 shadchin Exp $
COMMENT= Python interface to Graphviz's Dot#'
MODPY_EGG_VERSION= 1.0.28
REVISION= 1
REVISION= 2
DISTNAME= pydot-${MODPY_EGG_VERSION}
PKGNAME= ${DISTNAME:S/py/py-/}
CATEGORIES= graphics
@@ -0,0 +1,23 @@
$OpenBSD: patch-dot_parser_py,v 1.1 2016/03/13 08:12:14 shadchin Exp $
--- dot_parser.py.orig Tue Jan 3 05:23:26 2012
+++ dot_parser.py Wed Mar 2 15:52:33 2016
@@ -19,13 +19,17 @@ import glob
import pydot
import re
import codecs
+import string
from pyparsing import __version__ as pyparsing_version
-from pyparsing import ( nestedExpr, Literal, CaselessLiteral, Word, Upcase, OneOrMore, ZeroOrMore,
+from pyparsing import ( nestedExpr, Literal, CaselessLiteral, Word, OneOrMore, ZeroOrMore,
Forward, NotAny, delimitedList, oneOf, Group, Optional, Combine, alphas, nums,
restOfLine, cStyleComment, nums, alphanums, printables, empty, quotedString,
- ParseException, ParseResults, CharsNotIn, _noncomma, dblQuotedString, QuotedString, ParserElement )
+ ParseException, ParseResults, CharsNotIn, dblQuotedString, QuotedString, ParserElement )
+
+printables = "".join( [ c for c in string.printable if c not in string.whitespace ] )
+_noncomma = "".join( [ c for c in printables if c != "," ] )
class P_AttrList: