Skip to content

Fix: issue 2589 -- tostring() deprecated since numpy 1.19.0, replaced with tobytes() #2591

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 2 commits into from
Jul 25, 2023
Merged

Fix: issue 2589 -- tostring() deprecated since numpy 1.19.0, replaced with tobytes() #2591

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa5bf99
Fix: tostring() deprecated since numpy 1.19.0, replaced with tobytes()
Jun 28, 2023
8fbeba9
Fix: issue 2589 changes for rhel7 and ubuntu14
Jun 30, 2023
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
6 changes: 5 additions & 1 deletion python/MDSplus/mdsscalar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ def _mimport(name, level=1):

import numpy as _N
import ctypes as _C
import sys

_dat = _mimport('mdsdata')
_arr = _mimport('mdsarray')
Expand Down Expand Up @@ -434,7 +435,10 @@ def _descriptor(self):
def fromDescriptor(cls, d):
if d.length == 0:
return cls('')
return cls(_N.array(_C.cast(d.pointer, _C.POINTER((_C.c_byte*d.length))).contents[:], dtype=_N.uint8).tostring())
if sys.version_info.major == 2: # needed for rhel7 and ubuntu14
return cls(_N.array(_C.cast(d.pointer, _C.POINTER((_C.c_byte*d.length))).contents[:], dtype=_N.uint8).tostring())
else:
return cls(_N.array(_C.cast(d.pointer, _C.POINTER((_C.c_byte*d.length))).contents[:], dtype=_N.uint8).tobytes())

def __radd__(self, y):
"""radd: x.__radd__(y) <==> y+x
Expand Down