[Checkins] SVN: zope.configuration/branches/tseaver-test_cleanup/ Fix tests under Py3k.

[Tres Seaver]

Log message for revision 125835:
  Fix tests under Py3k.

Changed:
  U   zope.configuration/branches/tseaver-test_cleanup/CHANGES.txt
  U   zope.configuration/branches/tseaver-test_cleanup/src/zope/configuration/tests/test_xmlconfig.py
  U   zope.configuration/branches/tseaver-test_cleanup/src/zope/configuration/xmlconfig.py

-=-
Modified: zope.configuration/branches/tseaver-test_cleanup/CHANGES.txt
===================================================================
--- zope.configuration/branches/tseaver-test_cleanup/CHANGES.txt	2012-05-10 23:26:45 UTC (rev 125834)
+++ zope.configuration/branches/tseaver-test_cleanup/CHANGES.txt	2012-05-10 23:26:50 UTC (rev 125835)
@@ -5,6 +5,8 @@
 4.0.0 (unreleased)
 ------------------
 
+- 100% unit test coverage.
+
 - Automated build of Sphinx HTML docs and running doctest snippets via tox.
 
 - Dropped hard testing dependency on ``zope.testing``.

Modified: zope.configuration/branches/tseaver-test_cleanup/src/zope/configuration/tests/test_xmlconfig.py
===================================================================
--- zope.configuration/branches/tseaver-test_cleanup/src/zope/configuration/tests/test_xmlconfig.py	2012-05-10 23:26:45 UTC (rev 125834)
+++ zope.configuration/branches/tseaver-test_cleanup/src/zope/configuration/tests/test_xmlconfig.py	2012-05-10 23:26:50 UTC (rev 125835)
@@ -389,10 +389,10 @@
         return processxmlfile(*args, **kw)
 
     def test_w_empty_xml(self):
-        from StringIO import StringIO
         from zope.configuration.config import ConfigurationMachine
         from zope.configuration.xmlconfig import registerCommonDirectives
         from zope.configuration.xmlconfig import ZopeSAXParseException
+        from zope.configuration._compat import StringIO
         context = ConfigurationMachine()
         registerCommonDirectives(context)
         exc = self.assertRaises(ZopeSAXParseException,
@@ -544,6 +544,7 @@
         from zope.configuration import xmlconfig
         from zope.configuration.config import ConfigurationMachine
         from zope.configuration.xmlconfig import registerCommonDirectives
+        from zope.configuration._compat import b
         from zope.configuration.tests import samplepackage
         from zope.configuration.tests.samplepackage import foo
         context = ConfigurationMachine()
@@ -564,12 +565,12 @@
         self.assertEqual(action['callable'], foo.data.append)
         self.assertEqual(action['includepath'], (fqn2,))
         self.assertTrue(isinstance(action['args'][0], foo.stuff))
-        self.assertEqual(action['args'][0].args, (('x', 'foo'), ('y', 2)))
+        self.assertEqual(action['args'][0].args, (('x', b('foo')), ('y', 2)))
         action = context.actions[1]
         self.assertEqual(action['callable'], foo.data.append)
         self.assertEqual(action['includepath'], (fqn3,))
         self.assertTrue(isinstance(action['args'][0], foo.stuff))
-        self.assertEqual(action['args'][0].args, (('x', 'foo'), ('y', 3)))
+        self.assertEqual(action['args'][0].args, (('x', b('foo')), ('y', 3)))
         self.assertEqual(context.stack, before_stack)
         self.assertEqual(len(context._seen_files), 3)
         self.assertTrue(fqn1 in context._seen_files)

Modified: zope.configuration/branches/tseaver-test_cleanup/src/zope/configuration/xmlconfig.py
===================================================================
--- zope.configuration/branches/tseaver-test_cleanup/src/zope/configuration/xmlconfig.py	2012-05-10 23:26:45 UTC (rev 125834)
+++ zope.configuration/branches/tseaver-test_cleanup/src/zope/configuration/xmlconfig.py	2012-05-10 23:26:50 UTC (rev 125835)
@@ -42,8 +42,9 @@
 from zope.configuration.fields import GlobalObject
 from zope.configuration.zopeconfigure import IZopeConfigure
 from zope.configuration.zopeconfigure import ZopeConfigure
-from zope.configuration._compat import u
+from zope.configuration._compat import StringIO
 from zope.configuration._compat import reraise
+from zope.configuration._compat import u
 
 logger = logging.getLogger("config")
 
@@ -424,8 +425,7 @@
 
     if files:
         paths = glob(context.path(files))
-        paths = zip([path.lower() for path in paths], paths)
-        paths.sort()
+        paths = sorted(zip([path.lower() for path in paths], paths))
         paths = [path for (l, path) in paths]
     else:
         paths = [context.path(file)]
@@ -505,8 +505,6 @@
 def string(s, context=None, name="<string>", execute=True):
     """Execute a zcml string
     """
-    from StringIO import StringIO
-
     if context is None:
         context = ConfigurationMachine()
         registerCommonDirectives(context)