diff options
Diffstat (limited to 'numpy/core/setup_common.py')
| -rw-r--r-- | numpy/core/setup_common.py | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/numpy/core/setup_common.py b/numpy/core/setup_common.py index 32d52d93e..bf6abcf02 100644 --- a/numpy/core/setup_common.py +++ b/numpy/core/setup_common.py @@ -312,30 +312,24 @@ def pyod(filename): def _pyod2(): out = [] - fid = open(filename, 'rb') - try: + with open(filename, 'rb') as fid: yo = [int(oct(int(binascii.b2a_hex(o), 16))) for o in fid.read()] - for i in range(0, len(yo), 16): - line = ['%07d' % int(oct(i))] - line.extend(['%03d' % c for c in yo[i:i+16]]) - out.append(" ".join(line)) - return out - finally: - fid.close() + for i in range(0, len(yo), 16): + line = ['%07d' % int(oct(i))] + line.extend(['%03d' % c for c in yo[i:i+16]]) + out.append(" ".join(line)) + return out def _pyod3(): out = [] - fid = open(filename, 'rb') - try: + with open(filename, 'rb') as fid: yo2 = [oct(o)[2:] for o in fid.read()] - for i in range(0, len(yo2), 16): - line = ['%07d' % int(oct(i)[2:])] - line.extend(['%03d' % int(c) for c in yo2[i:i+16]]) - out.append(" ".join(line)) - return out - finally: - fid.close() + for i in range(0, len(yo2), 16): + line = ['%07d' % int(oct(i)[2:])] + line.extend(['%03d' % int(c) for c in yo2[i:i+16]]) + out.append(" ".join(line)) + return out if sys.version_info[0] < 3: return _pyod2() |