Merge branch 'remove-six'

# Conflicts:
#	unittests/test_string.py
#	unittests/test_wxdatetime.py
This commit is contained in:
Robin Dunn
2016-06-30 20:14:58 -07:00
81 changed files with 111 additions and 948 deletions

View File

@@ -2,7 +2,7 @@ import unittest
from unittests import wtc
import wx
import os
import wx.lib.six as six
import six
pngFile = os.path.join(os.path.dirname(__file__), 'toucan.png')