SF patch# 1761465 by Jeffrey Yasskin.
Fix test_aepack and test_applesingle.
diff --git a/Lib/test/test_aepack.py b/Lib/test/test_aepack.py
index 8a4b035..79e59a1 100755
--- a/Lib/test/test_aepack.py
+++ b/Lib/test/test_aepack.py
@@ -8,18 +8,18 @@
class TestAepack(unittest.TestCase):
OBJECTS = [
- aetypes.Enum('enum'),
- aetypes.Type('type'),
- aetypes.Keyword('kwrd'),
+ aetypes.Enum(b'enum'),
+ aetypes.Type(b'type'),
+ aetypes.Keyword(b'kwrd'),
aetypes.Range(1, 10),
- aetypes.Comparison(1, '< ', 10),
- aetypes.Logical('not ', 1),
- aetypes.IntlText(0, 0, 'international text'),
+ aetypes.Comparison(1, b'< ', 10),
+ aetypes.Logical(b'not ', 1),
+ aetypes.IntlText(0, 0, b'international text'),
aetypes.IntlWritingCode(0,0),
aetypes.QDPoint(50,100),
aetypes.QDRectangle(50,100,150,200),
aetypes.RGBColor(0x7000, 0x6000, 0x5000),
- aetypes.Unknown('xxxx', 'unknown type data'),
+ aetypes.Unknown(b'xxxx', b'unknown type data'),
aetypes.Character(1),
aetypes.Character(2, aetypes.Line(2)),
]
diff --git a/Lib/test/test_applesingle.py b/Lib/test/test_applesingle.py
index d533f1a..96450e3 100644
--- a/Lib/test/test_applesingle.py
+++ b/Lib/test/test_applesingle.py
@@ -12,8 +12,8 @@
AS_MAGIC=0x00051600
AS_VERSION=0x00020000
-dataforkdata = 'hello\r\0world\n'
-resourceforkdata = 'goodbye\ncruel\0world\r'
+dataforkdata = b'hello\r\0world\n'
+resourceforkdata = b'goodbye\ncruel\0world\r'
applesingledata = struct.pack(">ll16sh", AS_MAGIC, AS_VERSION, "foo", 2) + \
struct.pack(">llllll", 1, 50, len(dataforkdata),
@@ -25,7 +25,7 @@
class TestApplesingle(unittest.TestCase):
def setUp(self):
- fp = open(test_support.TESTFN, 'w')
+ fp = open(test_support.TESTFN, 'wb')
fp.write(applesingledata)
fp.close()