[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/ Removed os.path.walk call in windows development mode

Nikolay Kim fafhrd91 at gmail.com
Wed Feb 2 17:30:48 EST 2011


Log message for revision 120068:
  Removed os.path.walk call in windows development mode

Changed:
  U   Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt
  U   Products.CMFCore/trunk/Products/CMFCore/DirectoryView.py

-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt	2011-02-02 22:30:34 UTC (rev 120067)
+++ Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt	2011-02-02 22:30:48 UTC (rev 120068)
@@ -74,7 +74,9 @@
 
 - DirectoryView: Removed support for deprecated old API.
 
+- DirectoryView: Removed os.path.walk call in windows development mode
 
+
 2.2.0-beta (2009-12-06)
 -----------------------
 

Modified: Products.CMFCore/trunk/Products/CMFCore/DirectoryView.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/DirectoryView.py	2011-02-02 22:30:34 UTC (rev 120067)
+++ Products.CMFCore/trunk/Products/CMFCore/DirectoryView.py	2011-02-02 22:30:48 UTC (rev 120068)
@@ -106,7 +106,6 @@
 class DirectoryInformation:
     data = None
     _v_last_read = 0
-    _v_last_filelist = [] # Only used on Win32
 
     def __init__(self, filepath, reg_key, ignore=ignore):
         self._filepath = filepath
@@ -159,23 +158,13 @@
         if not Globals.DevelopmentMode:
             return 0
         mtime=0
-        filelist=[]
         try:
             mtime = os.stat(self._filepath)[8]
-            if platform == 'win32':
-                # some Windows directories don't change mtime
-                # when a file is added to or deleted from them :-(
-                # So keep a list of files as well, and see if that
-                # changes
-                os.path.walk(self._filepath, self._walker, filelist)
-                filelist.sort()
         except:
             logger.exception("Error checking for directory modification")
 
-        if mtime != self._v_last_read or filelist != self._v_last_filelist:
+        if mtime != self._v_last_read:
             self._v_last_read = mtime
-            self._v_last_filelist = filelist
-
             return 1
 
         return 0



More information about the checkins mailing list