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

* Upgrade to the newest six module (1.2.0) and call it six instead of wx2to3.

Browse Source 
* 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:
Robin Dunn
2012-12-16 01:15:41 +00:00
parent 5b8bc4fe17
commit 295d3f6442
34 changed files with 494 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
unittests/test_cursor.py
View File

@@ -1,6 +1,7 @@
import imp_unittest, unittest
import wtc
import wx
import wx.lib.six as six
import os
pngFile = os.path.join(os.path.dirname(__file__), 'pointy.png')
@@ -69,7 +70,7 @@ class CursorTests(wtc.WidgetTestCase):
c2 = wx.Cursor(wx.CURSOR_ARROW)
self.assertTrue( c2.IsOk() )
if wtc.isPython3():
if six.PY3:
self.assertTrue( c2.__bool__() == c2.IsOk() )
else:
self.assertTrue( c2.__nonzero__() == c2.IsOk() )