Skip to content

Commit

Permalink
Some Python 2.6 fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
kylemacfarlane committed Oct 11, 2014
1 parent 5a64f3e commit b64a24b
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
9 changes: 8 additions & 1 deletion setup.py
Expand Up @@ -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()
Expand All @@ -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',
Expand Down Expand Up @@ -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',
Expand Down
6 changes: 6 additions & 0 deletions src/z3c/rml/paraparser.py
Expand Up @@ -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)
Expand All @@ -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:
Expand Down

0 comments on commit b64a24b

Please sign in to comment.