mirror of
https://github.com/wxWidgets/Phoenix.git
synced 2026-01-06 20:10:08 +01:00
* Upgrade to the newest six module (1.2.0) and call it six instead of wx2to3.
* Tweak six a little, adding its license text since we'll only be distributing the module, fix the name of the dummy moves module, and add a PY33 constant since the change in memoryview affects our code. * Update all modules already using the old wx2to3 * Tweak lots of unit tests and other modules to work with Python 3.3 (still a few more that will need some work.) * Try to deal with memoryview changes in Py3.3, without much luck... git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -18,6 +18,8 @@ import sys, os
|
||||
import copy
|
||||
|
||||
|
||||
PY3 = sys.version_info[0] == 3
|
||||
|
||||
magicMethods = {
|
||||
'operator!=' : '__ne__',
|
||||
'operator==' : '__eq__',
|
||||
@@ -114,8 +116,14 @@ class FixWxPrefix(object):
|
||||
names.append(item.name)
|
||||
|
||||
names = list()
|
||||
text = textfile_open('wx/core.pi').read()
|
||||
parseTree = ast.parse(text, 'wx/core.pi')
|
||||
filename = 'wx/core.pi'
|
||||
if PY3:
|
||||
with open(filename, 'rt', encoding='utf-8') as f:
|
||||
text = f.read()
|
||||
else:
|
||||
with open(filename, 'r') as f:
|
||||
text = f.read()
|
||||
parseTree = ast.parse(text, filename)
|
||||
for item in parseTree.body:
|
||||
_processItem(item, names)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user