Commit 9b3faba3 authored by Amir MOHAMMADI's avatar Amir MOHAMMADI

Fixes a few warnings and depracations

parent 44b95672
Pipeline #40554 passed with stage
in 8 minutes and 3 seconds
...@@ -358,8 +358,8 @@ def unpack_array(shape, dtype, fd): ...@@ -358,8 +358,8 @@ def unpack_array(shape, dtype, fd):
# N.B.: this bit of code is optimized to reduce memory usage # N.B.: this bit of code is optimized to reduce memory usage
data_format = ENDIANNESS + dtype.str[1:] data_format = ENDIANNESS + dtype.str[1:]
count = numpy.prod(shape_) count = numpy.prod(shape_)
to_read = numpy.asscalar(dtype.itemsize*count) to_read = int(dtype.itemsize * count)
a = numpy.fromstring(fd.read(to_read), dtype=data_format, count=count) a = numpy.frombuffer(fd.read(to_read), dtype=data_format, count=count)
return a.reshape(shape_) return a.reshape(shape_)
elif issubclass(dtype, str): # it is a string elif issubclass(dtype, str): # it is a string
......
...@@ -411,7 +411,8 @@ class CachedDataSource(DataSource): ...@@ -411,7 +411,8 @@ class CachedDataSource(DataSource):
# list of start/end indices to check that there are contiguous # list of start/end indices to check that there are contiguous
indices = [] indices = []
for f_data, f_chck in zip(data_filenames, checksum_filenames): for f_data, f_chck in zip(data_filenames, checksum_filenames):
expected_chksum = open(f_chck, "rt").read().strip() with open(f_chck, "rt") as f:
expected_chksum = f.read().strip()
current_chksum = hashFileContents(f_data) current_chksum = hashFileContents(f_data)
if expected_chksum != current_chksum: if expected_chksum != current_chksum:
raise IOError( raise IOError(
......
...@@ -82,7 +82,8 @@ def load_module(name, path, uses): ...@@ -82,7 +82,8 @@ def load_module(name, path, uses):
retval.__dict__[k] = load_module(k, v['path'], v['uses']) retval.__dict__[k] = load_module(k, v['path'], v['uses'])
# execute the module code on the context of previously import modules # execute the module code on the context of previously import modules
exec(compile(open(path, "rb").read(), path, 'exec'), retval.__dict__) with open(path, "rb") as f:
exec(compile(f.read(), path, 'exec'), retval.__dict__)
return retval return retval
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment