[CMF-checkins] CVS: CMF/CMFCore - utils.py:1.18

[Ken Manheimer]

Update of /cvs-repository/CMF/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv32402

Modified Files:
	utils.py 
Log Message:
Enable use of Data.fs from unix on windows: when normalizing paths, do
more to normalize for the platform.  (We'll need to add a bit more to
work in the other direction.)

normalize(): Include os.path.normpath() in the processing(!)

expandpath(): Make sure os.path.normpath() is done here, too (whether
or not normalize() is called).


=== CMF/CMFCore/utils.py 1.17 => 1.18 ===
 #
 def normalize(p):
-    return path.abspath(path.normcase(p))
+    return path.abspath(path.normcase(path.normpath(p)))
 
 normINSTANCE_HOME = normalize(INSTANCE_HOME)
 normSOFTWARE_HOME = normalize(SOFTWARE_HOME)
@@ -609,6 +609,7 @@
 
 def expandpath(p):
     # Converts a minimal path to an absolute path.
+    p = path.normpath(p)
     if path.isabs(p):
         return p
     abs = path.join(normINSTANCE_HOME, p)