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

@@ -1,8 +1,8 @@
import unittest
from unittests import wtc
import wx
import wx.lib.six as six
from wx.lib.six import BytesIO as FileLikeObject
import six
from six import BytesIO as FileLikeObject
import os