From 7e3159b175dcf6f8e8fa0b3ddb55349051461b44 Mon Sep 17 00:00:00 2001 From: Rob McMullen Date: Sun, 24 Jun 2018 09:51:46 -0700 Subject: [PATCH] Disk image filenames should be str, not encoded bytes --- atrcopy/diskimages.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/atrcopy/diskimages.py b/atrcopy/diskimages.py index d670e7d..19afc33 100644 --- a/atrcopy/diskimages.py +++ b/atrcopy/diskimages.py @@ -130,11 +130,10 @@ class DiskImageBase(object): return Directory def set_filename(self, filename): - if type(filename) is not bytes: filename = filename.encode("utf-8") - if b'.' in filename: - self.filename, self.ext = filename.rsplit(b'.', 1) + if '.' in filename: + self.filename, self.ext = filename.rsplit('.', 1) else: - self.filename, self.ext = filename, b'' + self.filename, self.ext = filename, '' def dir(self): lines = [] @@ -180,10 +179,9 @@ class DiskImageBase(object): if not filename: filename = self.filename if self.ext: - filename += b'.' + self.ext + filename += '.' + self.ext if not filename: raise RuntimeError("No filename specified for save!") - if type(filename) is not bytes: filename = filename.encode("utf-8") data = self.bytes[:] with open(filename, "wb") as fh: data.tofile(fh)