Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-04 19:10:09 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1576 from pbrod/Fix_issue1570_use_of_tempfile

Browse Source 
Fixes issue #1570:
This commit is contained in:
Robin Dunn
2020-04-01 15:40:07 -07:00
committed by GitHub
parent 8c9446bd28 5cf6dc565e
commit de25f3091f
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wx/tools/img2py.py
View File

@@ -34,7 +34,6 @@
# #
""" """
img2py.py -- Convert an image to PNG format and embed it in a Python img2py.py -- Convert an image to PNG format and embed it in a Python
module with appropriate code so it can be loaded into module with appropriate code so it can be loaded into
@@ -81,7 +80,6 @@ function. See its docstring for more info.
import base64 import base64
import getopt import getopt
import glob
import os import os
import re import re
import sys import sys
@@ -120,10 +118,8 @@ def convert(fileName, maskClr, outputDir, outputName, outType, outExt):
with open(newname, "wb") as f_out: with open(newname, "wb") as f_out:
with open(fileName, "rb") as f_in: with open(fileName, "rb") as f_in:
f_out.write(f_in.read()) f_out.write(f_in.read())
return 1, "ok" return True, "ok"
return img2img.convert(fileName, maskClr, outputDir, outputName, outType, outExt)
else:
return img2img.convert(fileName, maskClr, outputDir, outputName, outType, outExt)
def _replace_non_alphanumeric_with_underscore(imgName): def _replace_non_alphanumeric_with_underscore(imgName):
@@ -187,7 +183,9 @@ def img2py(image_file, python_file,
app = wx.App(0) app = wx.App(0)
# convert the image file to a temporary file # convert the image file to a temporary file
tfname = tempfile.mktemp() with tempfile.NamedTemporaryFile(delete=False) as fid:
tfname = fid.name
try: try:
ok, msg = convert(image_file, maskClr, None, tfname, wx.BITMAP_TYPE_PNG, ".png") ok, msg = convert(image_file, maskClr, None, tfname, wx.BITMAP_TYPE_PNG, ".png")
if not ok: if not ok:
@@ -260,7 +258,6 @@ def img2py(image_file, python_file,
print("Embedded %s%s into %s%s" % (image_file, n_msg, python_file, m_msg)) print("Embedded %s%s into %s%s" % (image_file, n_msg, python_file, m_msg))
def main(args=None): def main(args=None):
if not args: if not args:
args = sys.argv[1:] args = sys.argv[1:]