operator fix and commenting out icons_rc useage

Author: James Draper

examples/BasicExample.py

@@ -7,7 +7,7 @@
 from qtpandas.compat import QtGui
 from qtpandas.models.DataFrameModel import DataFrameModel
 from qtpandas.views.DataTableView import DataTableWidget
-from qtpandas.views._ui import icons_rc
+# from qtpandas.views._ui import icons_rc
 
 sys.excepthook = excepthook
 

examples/TestApp.py

@@ -12,7 +12,7 @@
 from qtpandas.models.DataFrameModel import DataFrameModel
 from qtpandas.models.DataSearch import DataSearch
 from qtpandas.views.CSVDialogs import CSVImportDialog, CSVExportDialog
-from qtpandas.views._ui import icons_rc
+# from qtpandas.views._ui import icons_rc
 from qtpandas.views.DataTableView import DataTableWidget
 from qtpandas.views.CustomDelegates import DtypeComboDelegate
 from qtpandas.models.mime import PandasCellMimeType, PandasCellPayload

qtpandas/models/DataSearch.py

@@ -41,8 +41,9 @@ def __init__(self, name, filterString='', dataFrame=pd.DataFrame()):
     def __repr__(self):
         unformatted = "DataSearch({}): {} ({})"
         formatted_string = unformatted.format(hex(id(self)),
-                                              self.name, self._filterString)
-        if python_version > 3:
+                                              self.name,
+                                              self._filterString)
+        if python_version < 3:
             formatted_string = unformatted.encode("utf-8")
 
         return formatted_string

qtpandas/views/CSVDialogs.py

@@ -8,7 +8,7 @@
 # from qtpandas.encoding import Detector
 from qtpandas.models.DataFrameModel import DataFrameModel
 from qtpandas.views.CustomDelegates import DtypeComboDelegate
-from qtpandas.views._ui import icons_rc
+# from qtpandas.views._ui import icons_rc
 
 from qtpandas.utils import fillNoneValues, convertTimestamps, superReadFile