Apple-2-Tools/atrcopy
1
0
Fork 0
mirror of https://github.com/robmcmullen/atrcopy.git synced 2024-06-25 18:29:29 +00:00
Code Issues Projects Releases Wiki Activity

Changed numpy convenience method tostring to tobytes

Browse Source
This commit is contained in:
Rob McMullen 2018-05-26 20:07:43 -07:00
parent 68debef437
commit ebdcb01c40
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
atrcopy/diskimages.py
View File

@ -292,7 +292,7 @@ class DiskImageBase(object):
def get_file(self, dirent): def get_file(self, dirent):
segment = self.get_file_segment(dirent) segment = self.get_file_segment(dirent)
return segment.tostring() return segment.tobytes()
def get_file_segment(self, dirent): def get_file_segment(self, dirent):
pass pass

6
atrcopy/dos33.py
View File

@ -245,7 +245,7 @@ class Dos33Dirent(Dirent):
self.sector = values[1] self.sector = values[1]
self._file_type = values[2] & 0x7f self._file_type = values[2] & 0x7f
self.locked = values[2] & 0x80 self.locked = values[2] & 0x80
self.filename = (bytes[3:0x20] - 0x80).tostring().rstrip() self.filename = (bytes[3:0x20] - 0x80).tobytes().rstrip()
self.num_sectors = int(values[4]) self.num_sectors = int(values[4])
self.is_sane = self.sanity_check(image) self.is_sane = self.sanity_check(image)
@ -699,12 +699,12 @@ class ProdosDiskImage(DiskImageBase):
swap_order = False swap_order = False
if (magic == [1, 56, 176, 3]).all(): if (magic == [1, 56, 176, 3]).all():
data, style = self.get_sectors(1) data, style = self.get_sectors(1)
prodos = data[3:9].tostring() prodos = data[3:9].tobytes()
if prodos == "PRODOS": if prodos == "PRODOS":
pass pass
else: else:
data, style = self.get_sectors(14) data, style = self.get_sectors(14)
prodos = data[3:9].tostring() prodos = data[3:9].tobytes()
if prodos == "PRODOS": if prodos == "PRODOS":
swap_order = True swap_order = True
else: else:

12
atrcopy/segments.py
View File

@ -71,7 +71,7 @@ class SegmentSaver(object):
@classmethod @classmethod
def encode_data(cls, segment, ui_control): def encode_data(cls, segment, ui_control):
return segment.tostring() return segment.tobytes()
class OrderWrapper(object): class OrderWrapper(object):
@ -119,8 +119,8 @@ class OrderWrapper(object):
def unindexed(self): def unindexed(self):
return self.np_data[self.order] return self.np_data[self.order]
def tostring(self): def tobytes(self):
return self.np_data[self.order].tostring() return self.np_data[self.order].tobytes()
class UserExtraData(object): class UserExtraData(object):
@ -637,8 +637,8 @@ class DefaultSegment(object):
raise IndexError("index %d not in this segment" % base_index) raise IndexError("index %d not in this segment" % base_index)
return int(index) return int(index)
def tostring(self): def tobytes(self):
return self.data.tostring() return self.data.tobytes()
def get_style_bits(self, **kwargs): def get_style_bits(self, **kwargs):
return get_style_bits(**kwargs) return get_style_bits(**kwargs)
@ -1053,7 +1053,7 @@ class DefaultSegment(object):
@property @property
def search_copy(self): def search_copy(self):
if self._search_copy is None: if self._search_copy is None:
self._search_copy = self.data.tostring() self._search_copy = self.data.tobytes()
return self._search_copy return self._search_copy
def compare_segment(self, other_segment): def compare_segment(self, other_segment):