From 6780fa80302f62200b3db7b023730dc7199c553c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Wobst?= Date: Mon, 28 Oct 2013 23:11:30 +0000 Subject: [PATCH] some filelocator caching fixes for ls-R and recursivedir git-svn-id: http://svn.code.sf.net/p/pyx/code/trunk/pyx@3557 a4f5e268-e194-4f32-bce1-d30804cbbcc5 --- pyx/config.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyx/config.py b/pyx/config.py index 0bd0526e..14b95d44 100644 --- a/pyx/config.py +++ b/pyx/config.py @@ -85,7 +85,7 @@ class recursivedir: def openers(self, filename, names, extensions): for extension in extensions: if filename+extension in self.full_filenames: - return [lambda: builtinopen(self.full_filenames[filename], "rb")] + return [lambda: builtinopen(self.full_filenames[filename+extension], "rb")] while self.dirs: dir = self.dirs.pop(0) for item in os.listdir(dir): @@ -96,7 +96,7 @@ class recursivedir: self.full_filenames[item] = full_item for extension in extensions: if filename+extension in self.full_filenames: - return [lambda: builtinopen(self.full_filenames[filename], "rb")] + return [lambda: builtinopen(self.full_filenames[filename+extension], "rb")] return [] locator_classes["recursivedir"] = recursivedir @@ -133,7 +133,7 @@ class ls_R: except IOError: logger.warning("'%s' should be available at '%s' according to the ls-R file, " "but the file is not available at this location; " - "update your ls-R file" % (filename, self.full_filenames[filename])) + "update your ls-R file" % (filename, self.full_filenames[filename+extension])) return [_opener] return [] -- 2.11.4.GIT