Merged changes

This commit is contained in:
Justin Driscoll 2009-08-11 17:59:03 -04:00
commit 48a2035665

View file

@ -82,7 +82,12 @@ class Accessor(object):
{'filename': filename,
'specname': self.spec.name(),
'extension': extension.lstrip('.')}
return os.path.join(self._obj._ik.cache_dir, filepath, cache_filename)
if callable(self._obj._ik.cache_dir):
return self._obj._ik.cache_dir(self._obj, filepath,
cache_filename)
else:
return os.path.join(self._obj._ik.cache_dir, filepath,
cache_filename)
@property
def url(self):