[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/ - use float time stamps (on some file systems they have a better resolution)
Yvo Schubbe
y.2011 at wcm-solutions.de
Sat Feb 5 09:09:31 EST 2011
Log message for revision 120119:
- use float time stamps (on some file systems they have a better resolution)
Changed:
U Products.CMFCore/trunk/Products/CMFCore/DirectoryView.py
UU Products.CMFCore/trunk/Products/CMFCore/FSFile.py
UU Products.CMFCore/trunk/Products/CMFCore/FSImage.py
U Products.CMFCore/trunk/Products/CMFCore/FSObject.py
U Products.CMFCore/trunk/Products/CMFCore/tests/base/testcase.py
-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/DirectoryView.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/DirectoryView.py 2011-02-05 12:45:10 UTC (rev 120118)
+++ Products.CMFCore/trunk/Products/CMFCore/DirectoryView.py 2011-02-05 14:09:31 UTC (rev 120119)
@@ -70,7 +70,7 @@
in names
if name not in self.ignore and not ignore_re.match(name) ]
# append with stat info
- results = [ (name, os.stat(os.path.join(dirname,name))[8])
+ results = [ (name, os.stat(os.path.join(dirname,name)).st_mtime)
for name in names ]
dirlist.extend(results)
@@ -156,10 +156,10 @@
def _changed(self):
if not getConfiguration().debug_mode:
return 0
- mtime=0
- filelist=[]
+ mtime = 0.0
+ filelist = []
try:
- mtime = os.stat(self._filepath)[8]
+ mtime = os.stat(self._filepath).st_mtime
if platform == 'win32':
# some Windows directories don't change mtime
# when a file is added to or deleted from them :-(
Modified: Products.CMFCore/trunk/Products/CMFCore/FSFile.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/FSFile.py 2011-02-05 12:45:10 UTC (rev 120118)
+++ Products.CMFCore/trunk/Products/CMFCore/FSFile.py 2011-02-05 14:09:31 UTC (rev 120119)
@@ -11,8 +11,6 @@
#
##############################################################################
""" Customizable image objects that come from the filesystem.
-
-$Id$
"""
import codecs
@@ -100,10 +98,10 @@
if reparse or self.content_type == 'unknown/unknown':
try:
- mtime = os.stat(self._filepath)[8]
+ mtime = os.stat(self._filepath).st_mtime
except:
- mtime = 0
- if mtime != self._file_mod_time or mtime == 0:
+ mtime = 0.0
+ if mtime != self._file_mod_time or mtime == 0.0:
self.ZCacheable_invalidate()
self._file_mod_time = mtime
self.content_type=self._get_content_type(file, data, self.id)
Property changes on: Products.CMFCore/trunk/Products/CMFCore/FSFile.py
___________________________________________________________________
Deleted: svn:keywords
- Author Date Id Revision
Modified: Products.CMFCore/trunk/Products/CMFCore/FSImage.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/FSImage.py 2011-02-05 12:45:10 UTC (rev 120118)
+++ Products.CMFCore/trunk/Products/CMFCore/FSImage.py 2011-02-05 14:09:31 UTC (rev 120119)
@@ -11,8 +11,6 @@
#
##############################################################################
""" Customizable image objects that come from the filesystem.
-
-$Id$
"""
import os
@@ -75,13 +73,13 @@
if reparse or self.content_type == 'unknown/unknown':
try:
- mtime = os.stat(self._filepath)[8]
+ mtime = os.stat(self._filepath).st_mtime
except:
- mtime = 0
- if mtime != self._file_mod_time or mtime == 0:
+ mtime = 0.0
+ if mtime != self._file_mod_time or mtime == 0.0:
self.ZCacheable_invalidate()
self._file_mod_time = mtime
- ct, width, height = getImageInfo( data )
+ ct, width, height = getImageInfo(data)
self.content_type = ct
self.width = width
self.height = height
@@ -157,7 +155,7 @@
Return the size of the image.
"""
self._updateFromFS()
- return self._data and len( self._data ) or 0
+ return self._data and len(self._data) or 0
security.declareProtected(FTPAccess, 'manage_FTPget')
manage_FTPget = index_html
Property changes on: Products.CMFCore/trunk/Products/CMFCore/FSImage.py
___________________________________________________________________
Deleted: svn:keywords
- Author Date Id Revision
Modified: Products.CMFCore/trunk/Products/CMFCore/FSObject.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/FSObject.py 2011-02-05 12:45:10 UTC (rev 120118)
+++ Products.CMFCore/trunk/Products/CMFCore/FSObject.py 2011-02-05 14:09:31 UTC (rev 120119)
@@ -74,7 +74,7 @@
self._filepath = filepath
try:
- self._file_mod_time = os.stat(filepath)[8]
+ self._file_mod_time = os.stat(filepath).st_mtime
except:
pass
self._readFile(0)
@@ -173,12 +173,12 @@
parsed = self._parsed
if not parsed or getConfiguration().debug_mode:
try:
- mtime = os.stat(self._filepath)[8]
+ mtime = os.stat(self._filepath).st_mtime
except:
- mtime = 0
+ mtime = 0.0
if not parsed or mtime != self._file_mod_time:
self._readFile(1)
- if mtime != self._file_mod_time or mtime == 0:
+ if mtime != self._file_mod_time or mtime == 0.0:
self.ZCacheable_invalidate()
self._file_mod_time = mtime
self._parsed = 1
Modified: Products.CMFCore/trunk/Products/CMFCore/tests/base/testcase.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/base/testcase.py 2011-02-05 12:45:10 UTC (rev 120118)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/base/testcase.py 2011-02-05 14:09:31 UTC (rev 120119)
@@ -171,27 +171,27 @@
# make sure the file's modification time has changed
# also make sure the skin folder mod time has changed
try:
- dir_mtime = stat(self.skin_path_name)[8]
+ dir_mtime = stat(self.skin_path_name).st_mtime
except: # XXX Why bare except?
- dir_mtime = 0
+ dir_mtime = 0.0
thePath = join(self.skin_path_name, filename)
try:
- mtime1 = stat(thePath)[8]
+ mtime1 = stat(thePath).st_mtime
except: # XXX Why bare except?
- mtime1 = 0
+ mtime1 = 0.0
mtime2 = mtime1
while mtime2 == mtime1:
f = open(thePath, 'w')
f.write(stuff)
f.close()
- mtime2 = stat(thePath)[8]
+ mtime2 = stat(thePath).st_mtime
self._addedOrRemoved(dir_mtime)
def _deleteFile(self, filename):
try:
- dir_mtime = stat(self.skin_path_name)[8]
+ dir_mtime = stat(self.skin_path_name).st_mtime
except: # XXX Why bare except?
- dir_mtime = 0
+ dir_mtime = 0.0
remove(join(self.skin_path_name, filename))
self._addedOrRemoved(dir_mtime)
@@ -219,7 +219,7 @@
f.write('Temporary file')
f.close()
remove(fn)
- new_mtime = stat(self.skin_path_name)[8]
+ new_mtime = stat(self.skin_path_name).st_mtime
def setUp(self):
# store the place where the skin copy will be created
More information about the checkins
mailing list