summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrey Lebedev <andrey@lebedev.lt>2013-02-21 12:38:23 +0000
committerAndrey Lebedev <andrey@lebedev.lt>2013-02-21 12:38:23 +0000
commit20e185494f3afa80f3f85007733bf6821d10a6ba (patch)
tree684a03049aba879400430f41d6f4dcd31ad4dc46 /src
parent98a1f82881bdee9b862dfa89ecbf04ada96ccb5b (diff)
downloadzope-publisher-20e185494f3afa80f3f85007733bf6821d10a6ba.tar.gz
Fix support for Python-2.6
Diffstat (limited to 'src')
-rw-r--r--src/zope/publisher/paste.txt2
-rw-r--r--src/zope/publisher/tests/test_mapply.py5
2 files changed, 5 insertions, 2 deletions
diff --git a/src/zope/publisher/paste.txt b/src/zope/publisher/paste.txt
index e559398..89cea59 100644
--- a/src/zope/publisher/paste.txt
+++ b/src/zope/publisher/paste.txt
@@ -75,7 +75,7 @@ environment dictionary and a start-response function:
PATH_INFO: /a/b
QUERY_STRING:
REQUEST_METHOD: GET
- wsgi.input: <_io.BytesIO object at ...>
+ wsgi.input: <...io.BytesIO object at ...>
</pre>
<h1>Publication arguments:</h1>
Globals: {'global_option': 42}<br />
diff --git a/src/zope/publisher/tests/test_mapply.py b/src/zope/publisher/tests/test_mapply.py
index 1056793..ab3a361 100644
--- a/src/zope/publisher/tests/test_mapply.py
+++ b/src/zope/publisher/tests/test_mapply.py
@@ -45,8 +45,11 @@ class MapplyTests(unittest.TestCase):
v = mapply(cc.compute, (), values)
self.failUnlessEqual(v, '334')
- @unittest.skipUnless(PYTHON2, "Classic classes are only available in py3")
def testClassicClass(self):
+ if not PYTHON2:
+ # Classic classes are only available in py3
+ return
+
values = {'a':2, 'b':3}
class c(object):
a = 3