diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2006-04-17 13:40:08 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2006-04-17 13:40:08 (GMT) |
| commit | 6c1074888e147c11ac0175e97594daa4f0625844 (patch) | |
| tree | 6353ef17fa9f6da7a71f1cd752bf2871bb1e1078 /Lib | |
| parent | 749d070e93f0052bc9540c163d465a6c00eed4ed (diff) | |
| download | cpython-6c1074888e147c11ac0175e97594daa4f0625844.zip cpython-6c1074888e147c11ac0175e97594daa4f0625844.tar.gz cpython-6c1074888e147c11ac0175e97594daa4f0625844.tar.bz2 | |
This patches fixes a number of byteorder problems in MacOSX specific code.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/plat-mac/applesingle.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_applesingle.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Lib/plat-mac/applesingle.py b/Lib/plat-mac/applesingle.py index b035d9e..76bdb06 100644 --- a/Lib/plat-mac/applesingle.py +++ b/Lib/plat-mac/applesingle.py @@ -25,7 +25,7 @@ class Error(ValueError): pass # File header format: magic, version, unused, number of entries -AS_HEADER_FORMAT=">ll16sh" +AS_HEADER_FORMAT=">LL16sh" AS_HEADER_LENGTH=26 # The flag words for AppleSingle AS_MAGIC=0x00051600 diff --git a/Lib/test/test_applesingle.py b/Lib/test/test_applesingle.py index 2a2d60a..d533f1a 100644 --- a/Lib/test/test_applesingle.py +++ b/Lib/test/test_applesingle.py @@ -15,8 +15,8 @@ AS_VERSION=0x00020000 dataforkdata = 'hello\r\0world\n' resourceforkdata = 'goodbye\ncruel\0world\r' -applesingledata = struct.pack("ll16sh", AS_MAGIC, AS_VERSION, "foo", 2) + \ - struct.pack("llllll", 1, 50, len(dataforkdata), +applesingledata = struct.pack(">ll16sh", AS_MAGIC, AS_VERSION, "foo", 2) + \ + struct.pack(">llllll", 1, 50, len(dataforkdata), 2, 50+len(dataforkdata), len(resourceforkdata)) + \ dataforkdata + \ resourceforkdata |