[py-svn] r34707 - in py/dist/py: path/local test
fijal at codespeak.net
fijal at codespeak.net
Fri Nov 17 13:50:18 CET 2006
Author: fijal
Date: Fri Nov 17 13:50:05 2006
New Revision: 34707
Modified:
py/dist/py/path/local/local.py
py/dist/py/test/config.py
Log:
Reverting mtime addition.
Modified: py/dist/py/path/local/local.py
==============================================================================
--- py/dist/py/path/local/local.py (original)
+++ py/dist/py/path/local/local.py Fri Nov 17 13:50:05 2006
@@ -377,8 +377,7 @@
pkgpath = None
if modname is None:
try:
- if self.module_mtime == self.mtime():
- return self.module
+ return self.module
except AttributeError:
pass
pkgpath = self.pypkgpath()
@@ -402,7 +401,6 @@
self._prependsyspath(self.dirpath())
modname = self.purebasename
mod = __import__(modname, None, None, ['__doc__'])
- self.module_mtime = self.mtime()
self.module = mod
return mod
else:
Modified: py/dist/py/test/config.py
==============================================================================
--- py/dist/py/test/config.py (original)
+++ py/dist/py/test/config.py Fri Nov 17 13:50:05 2006
@@ -48,16 +48,12 @@
configpaths.append(defaultconfig)
for p in configpaths:
try:
- mtime, mod = cls.configs_cache[p]
- if mtime != p.mtime():
- raise IndexError()
+ mod = cls.configs_cache[p]
except (KeyError, IndexError):
mod = importconfig(p)
- cls.configs_cache[p] = p.mtime(), mod
+ cls.configs_cache[p] = mod
try:
- retval = getattr(mod, name)
- cls.values_cache[name] = retval
- return retval
+ return getattr(mod, name)
except AttributeError:
pass
if default is not dummy:
@@ -204,7 +200,7 @@
l.append(x)
l.reverse()
_config_paths_cache[key] = l
- return l
+ return l
def getanchorpaths(args):
""" yield "anchors" from skimming the args for existing files/dirs. """
More information about the pytest-commit
mailing list