Fix imports in some tests and in floatcanvas

unittests/test_dataview.py

@@ -1,7 +1,7 @@
 import unittest
 from unittests import wtc
 import wx
-from wx.lib import six
+import six
 import wx.dataview as dv
 import os
 

unittests/test_eventfilter.py

@@ -1,4 +1,5 @@
-import unittest, wtc
+import unittest
+from unittests import wtc
 import wx
 
 

unittests/test_pyevent.py

@@ -1,5 +1,6 @@
 import sys
-import unittest, wtc
+import unittest
+from unittests import wtc
 import wx
 ##import os; print 'PID:', os.getpid(); raw_input('Ready to start, press enter...')
 

unittests/test_xrc.py

@@ -27,8 +27,6 @@ class xrc_Tests(wtc.WidgetTestCase):
         self.assertTrue(isinstance(ctrl, wx.StaticText))
         
         
-        
-
     def test_xrc1(self):
         xmlres = xrc.XmlResource(xrcFile)
         self.checkXmlRes(xmlres)
@@ -236,7 +234,7 @@ class xrc_Tests(wtc.WidgetTestCase):
         resource = b'''<?xml version="1.0"?>
             <resource>
                 <!-- Notice that the class IS a standard wx class and that a subclass is specified -->        
-                <object class="wxPanel" name="MyPanel" subclass="xrcfactorytest.MyCustomPanel">
+                <object class="wxPanel" name="MyPanel" subclass="unittests.xrcfactorytest.MyCustomPanel">
                     <size>200,100</size>
                     <object class="wxStaticText" name="label1">
                         <label>This panel is a custom class derived from wx.Panel,\nand is loaded by the Python SubclassFactory.</label>
@@ -255,7 +253,7 @@ class xrc_Tests(wtc.WidgetTestCase):
         self.myYield()
 
         self.assertNotEqual(panel, None) 
-        import xrcfactorytest
+        from unittests import xrcfactorytest
         self.assertTrue(isinstance(panel, xrcfactorytest.MyCustomPanel))
         
         

wx/lib/floatcanvas/FCObjects.py

@@ -17,7 +17,7 @@ This is where FloatCanvas defines its drawings objects.
 import sys
 
 import wx
-from wx.lib import six
+import six
 
 import numpy as N
 

wx/lib/floatcanvas/FloatCanvas.py

@@ -50,7 +50,7 @@ mac = sys.platform.startswith("darwin")
 import numpy as N
 from time import clock
 import wx
-from wx.lib import six
+import six
 
 from .FCObjects import *
 

wx/lib/floatcanvas/ScreenShot.py

@@ -10,7 +10,7 @@ import zlib
 
 def getScreenShotData():
     return zlib.decompress(
-'x\xdatzeP\\M\xd0.N\xf0\xe0\x16\xdc\xdd\x12\xdc\xdd\t/\xee\xee\xee\x0e!\x10\
+b'x\xdatzeP\\M\xd0.N\xf0\xe0\x16\xdc\xdd\x12\xdc\xdd\t/\xee\xee\xee\x0e!\x10\
 \xdc\xdd\t\xee\xee\x8b\xbbC`\x91`\x8b;\xcb\xe2.\x97|_\xdd\x7f\xf7v\xd5\xd4\
 \xa9\x9a\xd3\xa7\xa7g\xba{\xe6y\xa6N\xe4we\x194d"d(((49Y\xc9\xff\xa0\xa0\xa0\
 />\x9a\xe8\'\x84\x8f\x1e\tK\xd6\xe4\x8f\x07\x9c\x9b\xb8\x9c\xfa\xa7\x0f\xf1\