added Python 3 support fixes by Sworddragon

This commit is contained in:
oy 2011-01-17 15:48:57 +01:00
parent 02db5bfe66
commit 232aafa891
2 changed files with 12 additions and 12 deletions

View file

@ -69,8 +69,8 @@ if gen_client_content_header or gen_server_content_header:
order = [] order = []
for line in contentlines: for line in contentlines:
line = line.strip() line = line.strip()
if line[:6] == "class " and '(Struct)' in line: if line[:6] == b"class " and b'(Struct)' in line:
order += [line.split()[1].split("(")[0]] order += [line.split()[1].split(b"(")[0].decode('ascii')]
for name in order: for name in order:
EmitTypeDeclaration(content.__dict__[name]) EmitTypeDeclaration(content.__dict__[name])

View file

@ -3,15 +3,15 @@ import hashlib, sys, re
alphanum = "0123456789abcdefghijklmnopqrstuvwzyxABCDEFGHIJKLMNOPQRSTUVWXYZ_" alphanum = "0123456789abcdefghijklmnopqrstuvwzyxABCDEFGHIJKLMNOPQRSTUVWXYZ_"
def cstrip(lines): def cstrip(lines):
d = "" d = b""
for l in lines: for l in lines:
l = re.sub("#.*", "", l) l = re.sub(b"#.*", b"", l)
l = re.sub("//.*", "", l) l = re.sub(b"//.*", b"", l)
d += l + " " d += l + b" "
d = re.sub("\/\*.*?\*/", "", d) # remove /* */ comments d = re.sub(b"\/\*.*?\*/", b"", d) # remove /* */ comments
d = d.replace("\t", " ") # tab to space d = d.replace(b"\t", b" ") # tab to space
d = re.sub(" *", " ", d) # remove double spaces d = re.sub(b" *", b" ", d) # remove double spaces
d = re.sub("", "", d) # remove /* */ comments d = re.sub(b"", b"", d) # remove /* */ comments
d = d.strip() d = d.strip()
@ -24,11 +24,11 @@ def cstrip(lines):
i += 1 i += 1
return d return d
f = "" f = b""
for filename in sys.argv[1:]: for filename in sys.argv[1:]:
f += cstrip([l.strip() for l in open(filename, "rb")]) f += cstrip([l.strip() for l in open(filename, "rb")])
hash = hashlib.md5(f.encode()).hexdigest().lower()[16:] hash = hashlib.md5(f).hexdigest().lower()[16:]
# TODO: refactor hash that is equal to the 0.5 hash, remove when we # TODO: refactor hash that is equal to the 0.5 hash, remove when we
# TODO: remove when we don't need it any more # TODO: remove when we don't need it any more
if hash == "026b8eceb4cdd369": if hash == "026b8eceb4cdd369":