Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make png2c script compatible with Python 3 too

Browse Source 
Use print() and byte strings to make the code compatible with Python 3,
while also keeping it compatible with Python 2 (>= 2.6, at least).

Closes https://github.com/wxWidgets/wxWidgets/pull/1348
This commit is contained in:
Igor Korot
2019-06-12 00:44:55 -05:00
committed by Vadim Zeitlin
parent 7c7c717389
commit b383d539b5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
misc/scripts/png2c.py
View File

@@ -20,7 +20,7 @@ in C code (like XPM but with full alpha channel support).
-s embed the image size in the image names in generated code.""" -s embed the image size in the image names in generated code."""
if len(sys.argv) < 2: if len(sys.argv) < 2:
print USAGE print(USAGE)
sys.exit(1) sys.exit(1)
r = re.compile("^([a-zA-Z._][a-zA-Z._0-9]*)[.][pP][nN][gG]$") r = re.compile("^([a-zA-Z._][a-zA-Z._0-9]*)[.][pP][nN][gG]$")
@@ -37,7 +37,7 @@ for path in sys.argv[1:]:
# Allow only filenames that make sense as C variable names # Allow only filenames that make sense as C variable names
if not(m): if not(m):
print "Skipped file (unsuitable filename): " + filename print("Skipped file (unsuitable filename): " + filename)
continue continue
# Read PNG file as character array # Read PNG file as character array
@@ -50,8 +50,8 @@ for path in sys.argv[1:]:
# Each PNG file starts with a 8 byte signature that should be followed # Each PNG file starts with a 8 byte signature that should be followed
# by IHDR chunk which is always 13 bytes in length so the first 16 # by IHDR chunk which is always 13 bytes in length so the first 16
# bytes are fixed (or at least we expect them to be). # bytes are fixed (or at least we expect them to be).
if bytes[0:16].tostring() != '\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR': if bytes[0:16].tostring() != b'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR':
print '"%s" doesn\'t seem to be a valid PNG file.' % filename print('"%s" doesn\'t seem to be a valid PNG file.' % filename)
continue continue
# Try to naively get its size if necessary # Try to naively get its size if necessary
@@ -91,4 +91,4 @@ for path in sys.argv[1:]:
# Now conclude the C source # Now conclude the C source
text += "};\n\n" text += "};\n\n"
print text print(text)