[Checkins] SVN: zope.configuration/trunk/src/zope/configuration/ Address more Windows path weirdness.

[Tres Seaver]

Log message for revision 125959:
  Address more Windows path weirdness.

Changed:
  U   zope.configuration/trunk/src/zope/configuration/config.py
  U   zope.configuration/trunk/src/zope/configuration/name.py
  U   zope.configuration/trunk/src/zope/configuration/tests/test_config.py
  U   zope.configuration/trunk/src/zope/configuration/tests/test_xmlconfig.py

-=-
Modified: zope.configuration/trunk/src/zope/configuration/config.py
===================================================================
--- zope.configuration/trunk/src/zope/configuration/config.py	2012-05-16 21:19:44 UTC (rev 125958)
+++ zope.configuration/trunk/src/zope/configuration/config.py	2012-05-17 04:01:08 UTC (rev 125959)
@@ -196,7 +196,7 @@
                     basepath = self.package.__path__[0]
                 else:
                     basepath = os.path.dirname(self.package.__file__)
-                basepath = os.path.abspath(basepath)
+                basepath = os.path.abspath(os.path.normpath(basepath))
             self.basepath = basepath
 
         return os.path.join(basepath, filename)

Modified: zope.configuration/trunk/src/zope/configuration/name.py
===================================================================
--- zope.configuration/trunk/src/zope/configuration/name.py	2012-05-16 21:19:44 UTC (rev 125958)
+++ zope.configuration/trunk/src/zope/configuration/name.py	2012-05-17 04:01:08 UTC (rev 125959)
@@ -74,7 +74,7 @@
     try:
         package = __import__(package, _globals, _globals, _silly)
     except ImportError:
-        if file and os.path.abspath(file) == file:
+        if file and os.path.abspath(os.path.normpath(file)) == file:
             # The package didn't matter
             return file
         raise

Modified: zope.configuration/trunk/src/zope/configuration/tests/test_config.py
===================================================================
--- zope.configuration/trunk/src/zope/configuration/tests/test_config.py	2012-05-16 21:19:44 UTC (rev 125958)
+++ zope.configuration/trunk/src/zope/configuration/tests/test_config.py	2012-05-17 04:01:08 UTC (rev 125959)
@@ -164,9 +164,10 @@
         self.assertTrue(os.path.isabs(c.path('y/z')))
 
     def test_checkDuplicate_miss(self):
+        import os
         c = self._makeOne()
         c.checkDuplicate('/path') # doesn't raise
-        self.assertEqual(list(c._seen_files), ['/path'])
+        self.assertEqual(list(c._seen_files), [os.path.normpath('/path')])
 
     def test_checkDuplicate_hit(self):
         import os

Modified: zope.configuration/trunk/src/zope/configuration/tests/test_xmlconfig.py
===================================================================
--- zope.configuration/trunk/src/zope/configuration/tests/test_xmlconfig.py	2012-05-16 21:19:44 UTC (rev 125958)
+++ zope.configuration/trunk/src/zope/configuration/tests/test_xmlconfig.py	2012-05-17 04:01:08 UTC (rev 125959)
@@ -748,6 +748,7 @@
         self.assertEqual(action['callable'], foo.data.append)
 
     def test_w_execute(self):
+        import os
         from zope.configuration import xmlconfig
         from zope.configuration._compat import b
         from zope.configuration.tests.samplepackage import foo
@@ -760,13 +761,14 @@
         data = foo.data.pop()
         self.assertEqual(data.args, (('x', b('blah')), ('y', 0)))
         self.assertTrue(data.info.file.endswith(
-                            'tests/samplepackage/configure.zcml'))
+                        os.path.normpath('tests/samplepackage/configure.zcml')))
         self.assertEqual(data.info.line, 12)
         self.assertEqual(data.info.column, 2)
         self.assertEqual(data.info.eline, 12)
         self.assertEqual(data.info.ecolumn, 29)
         self.assertEqual(data.package, None)
-        self.assertTrue(data.basepath.endswith('tests/samplepackage'))
+        self.assertTrue(data.basepath.endswith(
+                        os.path.normpath('tests/samplepackage')))
 
 
 class Test_string(unittest.TestCase):
@@ -899,6 +901,7 @@
         self.assertEqual(action['callable'], foo.data.append)
 
     def test___call__(self):
+        import os
         from zope.configuration import xmlconfig
         from zope.configuration._compat import b
         from zope.configuration.tests import samplepackage
@@ -915,7 +918,7 @@
         data = foo.data.pop(0)
         self.assertEqual(data.args, (('x', b('blah')), ('y', 0)))
         self.assertTrue(data.info.file.endswith(
-                'tests/samplepackage/configure.zcml'))
+                        os.path.normpath('tests/samplepackage/configure.zcml')))
         self.assertEqual(data.info.line, 12)
         self.assertEqual(data.info.column, 2)
         self.assertEqual(data.info.eline, 12)
@@ -942,6 +945,7 @@
         return xmlconfig(*args, **kw)
 
     def test_wo_testing_passed(self):
+        import os
         from zope.configuration import xmlconfig
         from zope.configuration._compat import b
         from zope.configuration.tests import samplepackage
@@ -962,13 +966,14 @@
         data = foo.data.pop(0)
         self.assertEqual(data.args, (('x', b('blah')), ('y', 0)))
         self.assertTrue(data.info.file.endswith(
-                'tests/samplepackage/configure.zcml'))
+                        os.path.normpath('tests/samplepackage/configure.zcml')))
         self.assertEqual(data.info.line, 12)
         self.assertEqual(data.info.column, 2)
         self.assertEqual(data.info.eline, 12)
         self.assertEqual(data.info.ecolumn, 29)
 
     def test_w_testing_passed(self):
+        import os
         from zope.configuration import xmlconfig
         from zope.configuration._compat import b
         from zope.configuration.tests import samplepackage
@@ -989,7 +994,7 @@
         data = foo.data.pop(0)
         self.assertEqual(data.args, (('x', b('blah')), ('y', 0)))
         self.assertTrue(data.info.file.endswith(
-                'tests/samplepackage/configure.zcml'))
+                        os.path.normpath('tests/samplepackage/configure.zcml')))
         self.assertEqual(data.info.line, 12)
         self.assertEqual(data.info.column, 2)
         self.assertEqual(data.info.eline, 12)
@@ -1015,6 +1020,7 @@
         return testxmlconfig(*args, **kw)
 
     def test_w_testing_passed(self):
+        import os
         from zope.configuration import xmlconfig
         from zope.configuration._compat import b
         from zope.configuration.tests import samplepackage
@@ -1035,7 +1041,7 @@
         data = foo.data.pop(0)
         self.assertEqual(data.args, (('x', b('blah')), ('y', 0)))
         self.assertTrue(data.info.file.endswith(
-                'tests/samplepackage/configure.zcml'))
+                        os.path.normpath('tests/samplepackage/configure.zcml')))
         self.assertEqual(data.info.line, 12)
         self.assertEqual(data.info.column, 2)
         self.assertEqual(data.info.eline, 12)