[Checkins] SVN: zope.publisher/branches/py3-attempt2/src/zope/publisher/ Fix support for Python-2.6

[Andrey Lebedev]

Log message for revision 129561:
  Fix support for Python-2.6
  
  

Changed:
  U   zope.publisher/branches/py3-attempt2/src/zope/publisher/paste.txt
  U   zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_mapply.py

-=-
Modified: zope.publisher/branches/py3-attempt2/src/zope/publisher/paste.txt
===================================================================
--- zope.publisher/branches/py3-attempt2/src/zope/publisher/paste.txt	2013-02-21 10:39:33 UTC (rev 129560)
+++ zope.publisher/branches/py3-attempt2/src/zope/publisher/paste.txt	2013-02-21 12:38:23 UTC (rev 129561)
@@ -75,7 +75,7 @@
     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 />

Modified: zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_mapply.py
===================================================================
--- zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_mapply.py	2013-02-21 10:39:33 UTC (rev 129560)
+++ zope.publisher/branches/py3-attempt2/src/zope/publisher/tests/test_mapply.py	2013-02-21 12:38:23 UTC (rev 129561)
@@ -45,8 +45,11 @@
         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