[Checkins] SVN: zope.configuration/branches/tseaver-test_cleanup/src/zope/configuration/ Fix Py3k compat bug.

Tres Seaver cvs-admin at zope.org
Wed May 9 20:23:30 UTC 2012


Log message for revision 125778:
  Fix Py3k compat bug.
  
  Also, note a WTF.

Changed:
  U   zope.configuration/branches/tseaver-test_cleanup/src/zope/configuration/config.py
  U   zope.configuration/branches/tseaver-test_cleanup/src/zope/configuration/tests/test_config.py

-=-
Modified: zope.configuration/branches/tseaver-test_cleanup/src/zope/configuration/config.py
===================================================================
--- zope.configuration/branches/tseaver-test_cleanup/src/zope/configuration/config.py	2012-05-09 20:23:23 UTC (rev 125777)
+++ zope.configuration/branches/tseaver-test_cleanup/src/zope/configuration/config.py	2012-05-09 20:23:27 UTC (rev 125778)
@@ -557,10 +557,11 @@
     def finish(self):
         # when we're done, we call the handler, which might return more actions
         # Need to save and restore old info
+        # XXX why not just use callable()?
         try:
             actions = self.handler()
         except AttributeError as v:
-            if v[0] == '__call__':
+            if v.args[0] == '__call__':
                 return # noncallable
             raise
         except TypeError:

Modified: zope.configuration/branches/tseaver-test_cleanup/src/zope/configuration/tests/test_config.py
===================================================================
--- zope.configuration/branches/tseaver-test_cleanup/src/zope/configuration/tests/test_config.py	2012-05-09 20:23:23 UTC (rev 125777)
+++ zope.configuration/branches/tseaver-test_cleanup/src/zope/configuration/tests/test_config.py	2012-05-09 20:23:27 UTC (rev 125778)
@@ -1751,7 +1751,6 @@
                           'foo': 'bar',
                           'baz': None,
                          })
-    #TODO coverage
 
 
 class Test_resolveConflicts(unittest.TestCase):



More information about the checkins mailing list