mirror of
https://github.com/wxWidgets/Phoenix.git
synced 2026-01-05 11:30:06 +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:
@@ -2,15 +2,17 @@ import imp_unittest, unittest
|
||||
import wx
|
||||
import wtc
|
||||
import sys
|
||||
import wx.lib.six as six
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
if not wtc.isPython3():
|
||||
if not six.PY3:
|
||||
alt = unicode
|
||||
else:
|
||||
def alt(s):
|
||||
return bytes(s, 'utf-8')
|
||||
|
||||
|
||||
class ArrayString(unittest.TestCase):
|
||||
|
||||
if hasattr(wx, 'testArrayStringTypemap'):
|
||||
|
||||
Reference in New Issue
Block a user