Skip to content

Fix: Resolve issues with numpy >= 2.3 #2928

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WhoBrokeTheBuild merged 1 commit into from
Jul 1, 2025
Merged

Fix: Resolve issues with numpy >= 2.3 #2928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions python/MDSplus/compound.py.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,10 @@ class Conglom(_dat.TreeRefX, Compound):
module = imp.new_module(unique)
qualifiers = self.qualifiers.data()
if isinstance(qualifiers, _N.ndarray) and qualifiers.dtype == _N.uint8:
qualifiers = qualifiers.tostring()
if hasattr(qualifiers, 'tobytes'):
qualifiers = qualifiers.tobytes()
else:
qualifiers = qualifiers.tostring()
elif isinstance(qualifiers, _N.generic):
qualifiers = qualifiers.tolist()
if isinstance(qualifiers, list):
Expand Down Expand Up @@ -595,8 +598,12 @@ class Opaque(_dat.TreeRefX, Compound):
fn, typestring = os.path.splitext(filename)
f = open(filename, 'rb')
try:
opq = cls(_dat.Data(_N.fromstring(
f.read(), dtype="uint8")), typestring)
if hasattr(_N, 'frombuffer'):
f_bytes = _N.frombuffer(f.read(), dtype="uint8")
else:
f_bytes = _N.fromstring(f.read(), dtype="uint8")

opq = cls(_dat.Data(f_bytes), typestring)
finally:
f.close()
return opq
Expand Down
9 changes: 6 additions & 3 deletions python/MDSplus/tree.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4079,9 +4079,12 @@ def check_source(self, sourcefile=None):
source = self.head.record.qualifiers.data()
if isinstance(source, _N.ndarray) and source.dtype == _N.uint8:
import difflib
inrecord = _ver.tostr(source.tostring()).splitlines(1)
infile = _ver.tostr(self.__read_source(
self.__class__.__name__, sourcefile).tostring()).splitlines(1)
if hasattr(source, 'tobytes'):
inrecord = _ver.tostr(source.tobytes()).splitlines(1)
infile = _ver.tostr(self.__read_source(self.__class__.__name__, sourcefile).tobytes()).splitlines(1)
else:
inrecord = _ver.tostr(source.tostring()).splitlines(1)
infile = _ver.tostr(self.__read_source(self.__class__.__name__, sourcefile).tostring()).splitlines(1)
diff = difflib.unified_diff(inrecord, infile)
diff = ''.join(diff)
return diff
Expand Down
2 changes: 1 addition & 1 deletion python/MDSplus/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ def _encode(string):
def hash64(bytes):
import hashlib
import numpy
return numpy.frombuffer(hashlib.md5(bytes.tostring()).digest(), numpy.uint64).sum()
return numpy.frombuffer(hashlib.md5(bytes).digest(), numpy.uint64).sum()


def _tostring(string, targ, nptarg, conv, lstres):
Expand Down