freemyipod r929 - Code Review

Repository:	freemyipod
Revision:	< r928‎ \| r929 \| r930 >
Date:	16:37, 20 May 2014
Author:	theseven
Status:	new
Tags:
Comment:	libemcorebootcfg: Fix Python 3.x problems
Modified paths:	/emcore/trunk/tools/libemcorebootcfg.py (modified) (history)

Diff [purge]

Index: emcore/trunk/tools/libemcorebootcfg.py
—	—	@@ -24,7 +24,7 @@
25	25	import struct
26	26
27	27	def encode(addr, option):
28		~~- if option == None: return ""~~
	28	+ if option == None: return b""
29	29	addr = addr + 16
30	30	data1 = encode(addr, option[2])
31	31	if len(data1) == 0: addr1 = 0
—	—	@@ -34,9 +34,9 @@
35	35	if len(data2) == 0: addr2 = 0
36	36	else: addr2 = addr
37	37	addr = addr + len(data2)
38		~~- if type(option[1]).__name__ == "str":~~
39		~~- data = option[1] + '\0'~~
40		~~- data = data.ljust((len(data) + 3) & ~3, '\0')~~
	38	+ if type(option[1]) == type(b""):
	39	+ data = option[1] + b"\0"
	40	+ data = data.ljust((len(data) + 3) & ~3, b"\0")
41	41	else:
42	42	data = ""
43	43	addr = option[1]
—	—	@@ -44,7 +44,7 @@
45	45
46	46
47	47	def configure(binary, options):
48		~~- fileaddr = binary.index("emCOboot")~~
	48	+ fileaddr = binary.index(b"emCOboot")
49	49	version = struct.unpack("<I", binary[fileaddr + 8 : fileaddr + 12])[0]
50	50	if version != 1: raise ValueError("Unknown boot configuration data version")
51	51	memaddr = struct.unpack("<I", binary[fileaddr + 12 : fileaddr + 16])[0]
—	—	@@ -52,4 +52,4 @@
53	53	if len(data) == 0: addr = 0
54	54	else: addr = memaddr + 24
55	55	return binary[:fileaddr + 16] + struct.pack("<II", len(data) + 24, addr) + data
56		-
\ No newline at end of file
	56	+