diff options
| author | Daniel Holth <dholth@fastmail.fm> | 2016-06-15 23:46:00 (GMT) |
|---|---|---|
| committer | Daniel Holth <dholth@fastmail.fm> | 2016-06-15 23:46:00 (GMT) |
| commit | f8fbe351d2677bc2e4e3094e905c579825c1582a (patch) | |
| tree | 64e0c20decc566367ec34ed6fcd13a368532512d /src/engine/SCons/Node | |
| parent | 88958d1f4beae35315b26ec1b32b38eeb41946f8 (diff) | |
| download | SCons-f8fbe351d2677bc2e4e3094e905c579825c1582a.zip SCons-f8fbe351d2677bc2e4e3094e905c579825c1582a.tar.gz SCons-f8fbe351d2677bc2e4e3094e905c579825c1582a.tar.bz2 | |
wrap several frequently-used open() calls in with statements
Diffstat (limited to 'src/engine/SCons/Node')
| -rw-r--r-- | src/engine/SCons/Node/FS.py | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Node/__init__.py | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py index d19afa9..71511b5 100644 --- a/src/engine/SCons/Node/FS.py +++ b/src/engine/SCons/Node/FS.py @@ -1211,9 +1211,9 @@ class FS(LocalFS): def getcwd(self): if hasattr(self, "_cwd"): - return self._cwd + return self._cwd else: - return "<no cwd>" + return "<no cwd>" def chdir(self, dir, change_os_dir=0): """Change the current working directory for lookups. diff --git a/src/engine/SCons/Node/__init__.py b/src/engine/SCons/Node/__init__.py index e714172..51762a3 100644 --- a/src/engine/SCons/Node/__init__.py +++ b/src/engine/SCons/Node/__init__.py @@ -214,7 +214,8 @@ def get_contents_file(node): return '' fname = node.rfile().get_abspath() try: - contents = open(fname, "rb").read() + with open(fname, "rb") as fp: + contents = fp.read() except EnvironmentError as e: if not e.filename: e.filename = fname |