mirror of
https://github.com/ddnet/ddnet.git
synced 2024-11-10 01:58:19 +00:00
reverted Python 3 support fixes to keep compatibility with 2.5
This commit is contained in:
parent
372b62566b
commit
3c1eee2a12
|
@ -69,8 +69,8 @@ if gen_client_content_header or gen_server_content_header:
|
|||
order = []
|
||||
for line in contentlines:
|
||||
line = line.strip()
|
||||
if line[:6] == b"class " and b'(Struct)' in line:
|
||||
order += [line.split()[1].split(b"(")[0].decode('ascii')]
|
||||
if line[:6] == "class " and '(Struct)' in line:
|
||||
order += [line.split()[1].split("(")[0]]
|
||||
for name in order:
|
||||
EmitTypeDeclaration(content.__dict__[name])
|
||||
|
||||
|
|
|
@ -3,15 +3,15 @@ import hashlib, sys, re
|
|||
alphanum = "0123456789abcdefghijklmnopqrstuvwzyxABCDEFGHIJKLMNOPQRSTUVWXYZ_"
|
||||
|
||||
def cstrip(lines):
|
||||
d = b""
|
||||
d = ""
|
||||
for l in lines:
|
||||
l = re.sub(b"#.*", b"", l)
|
||||
l = re.sub(b"//.*", b"", l)
|
||||
d += l + b" "
|
||||
d = re.sub(b"\/\*.*?\*/", b"", d) # remove /* */ comments
|
||||
d = d.replace(b"\t", b" ") # tab to space
|
||||
d = re.sub(b" *", b" ", d) # remove double spaces
|
||||
d = re.sub(b"", b"", d) # remove /* */ comments
|
||||
l = re.sub("#.*", "", l)
|
||||
l = re.sub("//.*", "", l)
|
||||
d += l + " "
|
||||
d = re.sub("\/\*.*?\*/", "", d) # remove /* */ comments
|
||||
d = d.replace("\t", " ") # tab to space
|
||||
d = re.sub(" *", " ", d) # remove double spaces
|
||||
d = re.sub("", "", d) # remove /* */ comments
|
||||
|
||||
d = d.strip()
|
||||
|
||||
|
@ -24,11 +24,11 @@ def cstrip(lines):
|
|||
i += 1
|
||||
return d
|
||||
|
||||
f = b""
|
||||
f = ""
|
||||
for filename in sys.argv[1:]:
|
||||
f += cstrip([l.strip() for l in open(filename, "rb")])
|
||||
|
||||
hash = hashlib.md5(f).hexdigest().lower()[16:]
|
||||
hash = hashlib.md5(f.encode()).hexdigest().lower()[16:]
|
||||
# TODO: refactor hash that is equal to the 0.5 hash, remove when we
|
||||
# TODO: remove when we don't need it any more
|
||||
if hash == "f16c2456fc487748":
|
||||
|
|
Loading…
Reference in a new issue