diff options
| author | Luca Falavigna <dktrkranz@debian.org> | 2010-06-15 14:28:28 +0000 |
|---|---|---|
| committer | Luca Falavigna <dktrkranz@debian.org> | 2010-06-15 14:28:28 +0000 |
| commit | 0ed55e71a9f4b9cda836c6a4a5408cece60db0c6 (patch) | |
| tree | b1e82f6e428ac15ed9b4de93e48d8079420d537d /src/engine/SCons/CacheDir.py | |
| parent | fe00e4f75ba00298c30d6854b245c2a42c6542b8 (diff) | |
| parent | 738149c9bfb9965d013d01ef99f9bb1c2819e7e8 (diff) | |
Merge commit 'upstream/2.0.0'
Diffstat (limited to 'src/engine/SCons/CacheDir.py')
| -rw-r--r-- | src/engine/SCons/CacheDir.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/engine/SCons/CacheDir.py b/src/engine/SCons/CacheDir.py index 6977621..6b2e174 100644 --- a/src/engine/SCons/CacheDir.py +++ b/src/engine/SCons/CacheDir.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/CacheDir.py 4720 2010/03/24 03:14:11 jars" +__revision__ = "src/engine/SCons/CacheDir.py 5023 2010/06/14 22:05:46 scons" __doc__ = """ CacheDir support @@ -29,7 +29,6 @@ CacheDir support import os.path import stat -import string import sys import SCons.Action @@ -101,7 +100,7 @@ def CachePushFunc(target, source, env): # has beaten us creating the directory. if not fs.isdir(cachedir): msg = errfmt % (str(target), cachefile) - raise SCons.Errors.EnvironmentError, msg + raise SCons.Errors.EnvironmentError(msg) try: if fs.islink(t.path): @@ -122,7 +121,7 @@ def CachePushFunc(target, source, env): CachePush = SCons.Action.Action(CachePushFunc, None) -class CacheDir: +class CacheDir(object): def __init__(self, path): try: @@ -158,7 +157,7 @@ class CacheDir: return None, None sig = node.get_cachedir_bsig() - subdir = string.upper(sig[0]) + subdir = sig[0].upper() dir = os.path.join(self.path, subdir) return dir, os.path.join(dir, sig) |