From b64a24b2b2f2192423c748d970ee8b0b07a71856 Mon Sep 17 00:00:00 2001 From: Kyle MacFarlane Date: Sat, 11 Oct 2014 15:47:57 +0100 Subject: [PATCH] Some Python 2.6 fixes --- setup.py | 9 ++++++++- src/z3c/rml/paraparser.py | 6 ++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 2457f3c..9eb175f 100644 --- a/setup.py +++ b/setup.py @@ -15,6 +15,7 @@ """ import os from setuptools import setup, find_packages +import sys def read(*rnames): return open(os.path.join(os.path.dirname(__file__), *rnames)).read() @@ -34,6 +35,12 @@ def alltests(): suites = list(zope.testrunner.find.find_suites(options)) return unittest.TestSuite(suites) +if sys.version_info < (2, 7): + # XXX ReportLab dropped Python 2.6 support + REPORTLAB_VERSION = '<3.0' +else: + REPORTLAB_VERSION = '>=3.0' + TESTS_REQUIRE = [ 'Pillow', 'coverage', @@ -82,7 +89,7 @@ def alltests(): 'lxml', # XXX: PyPDF2 1.22 does not work. 'PyPDF2==1.21', - 'reportlab>=3.0', + 'reportlab' + REPORTLAB_VERSION, 'setuptools', 'six', 'zope.interface', diff --git a/src/z3c/rml/paraparser.py b/src/z3c/rml/paraparser.py index ff6b6bf..1dbaeac 100644 --- a/src/z3c/rml/paraparser.py +++ b/src/z3c/rml/paraparser.py @@ -146,15 +146,19 @@ def endDynamic(self): def start_pagenumber(self, attributes): self.startDynamic(attributes, PageNumberFragment) + start_pageNumber = start_pagenumber # XXX Python 2.6 with RL < 3.0 def end_pagenumber(self): self.endDynamic() + end_pageNumber = end_pagenumber # XXX Python 2.6 with RL < 3.0 def start_getname(self, attributes): self.startDynamic(attributes, GetNameFragment) + start_getName = start_getname # XXX Python 2.6 with RL < 3.0 def end_getname(self): self.endDynamic() + end_getName = end_getname # XXX Python 2.6 with RL < 3.0 def start_name(self, attributes): self.startDynamic(attributes, NameFragment) @@ -165,10 +169,12 @@ def end_name(self): def start_evalstring(self, attributes): self.startDynamic(attributes, EvalStringFragment) self.in_eval = True + start_evalString = start_evalstring # XXX Python 2.6 with RL < 3.0 def end_evalstring(self): self.in_eval = False self.endDynamic() + end_evalString = end_evalstring # XXX Python 2.6 with RL < 3.0 def handle_data(self, data): if not self.in_eval: