mirror of
https://github.com/wxWidgets/Phoenix.git
synced 2025-12-16 01:30:07 +01:00
remove more Python2 hybridation
This commit is contained in:
committed by
Scott Talbert
parent
0257f755cf
commit
323e78c085
@@ -24,7 +24,7 @@ except ImportError:
|
||||
if hasattr(sys, "frozen"):
|
||||
import os, win32api
|
||||
dllpath = os.path.join(win32api.GetSystemDirectory(), 'MFC71.DLL')
|
||||
if sys.version[:3] >= '2.4' and not os.path.exists(dllpath):
|
||||
if not os.path.exists(dllpath):
|
||||
message = "%s not found" % dllpath
|
||||
else:
|
||||
raise # original error message
|
||||
|
||||
@@ -2594,16 +2594,7 @@ SWITCHER_TEXT_MARGIN_Y = 1
|
||||
if __name__ == '__main__':
|
||||
# Easy image extraction.
|
||||
import sys
|
||||
if sys.version_info[0] == 2:
|
||||
PY2 = True
|
||||
PY3 = False
|
||||
elif sys.version_info[0] == 3:
|
||||
PY2 = False
|
||||
PY3 = True
|
||||
if PY2:
|
||||
answer = int(raw_input('Enter 1 to extract all bitmaps: '))
|
||||
elif PY3:
|
||||
answer = int(input('Enter 1 to extract all bitmaps: '))
|
||||
answer = int(input('Enter 1 to extract all bitmaps: '))
|
||||
if answer == 1:
|
||||
app = wx.App(0)
|
||||
import os
|
||||
@@ -2622,7 +2613,4 @@ if __name__ == '__main__':
|
||||
except Exception:
|
||||
pass
|
||||
app.MainLoop()
|
||||
if PY2:
|
||||
raw_input('Press Enter To Exit.')
|
||||
elif PY3:
|
||||
input('Press Enter To Exit.')
|
||||
input('Press Enter To Exit.')
|
||||
|
||||
Reference in New Issue
Block a user