py2to3 automatic conversion. Woot!

tests/test_locale/file_dialog.py

@@ -60,7 +60,7 @@ class MyForm(wx.Frame):
         print(path)
 
         print("Type:")
-        print(type(path))
+        print((type(path)))
 
         print("OS Walk: No Codec:")
         print(os_walk_without_codec)

tests/test_locale/test_os_walk.py

@@ -8,7 +8,7 @@ sys.path.append(os.path.realpath(os.path.join(script_dir, '..', '..')))
 from _development.helpers_locale import GetPath
 
 def test_os_walk():
-    current_directory = os.path.dirname(os.path.abspath(unicode(__file__)))
+    current_directory = os.path.dirname(os.path.abspath(str(__file__)))
     subfolders = os.listdir(current_directory)
     subfolders = [e for e in subfolders if not (e.endswith(".py") or e.endswith(".pyc") or e.endswith(".md"))]
 

tests/test_modules/test_eos/test_modifiedAttributeDict.py

@@ -5,7 +5,7 @@ import os
 import sys
 script_dir = os.path.dirname(os.path.abspath(__file__))
 script_dir = os.path.realpath(os.path.join(script_dir, '..', '..', '..'))
-print script_dir
+print(script_dir)
 sys.path.append(script_dir)
 
 # noinspection PyPackageRequirements

tests/test_modules/test_service/test_attribute.py

@@ -20,19 +20,19 @@ def test_attribute():
     assert info.attributeID == 54
     assert type(info.attributeID) is int
     assert info.attributeName == 'maxRange'
-    assert type(info.attributeName) is unicode
+    assert type(info.attributeName) is str
     assert info.defaultValue == 0.0
     assert type(info.defaultValue) is float
     assert info.description == 'Distance below which range does not affect the to-hit equation.'
-    assert type(info.description) is unicode
+    assert type(info.description) is str
     assert info.displayName == 'Optimal Range'
-    assert type(info.displayName) is unicode
+    assert type(info.displayName) is str
     assert info.highIsGood is True
     assert type(info.highIsGood) is bool
     assert info.iconID == 1391
     assert type(info.iconID) is int
     assert info.name == 'maxRange'
-    assert type(info.name) is unicode
+    assert type(info.name) is str
     assert info.published is True
     assert type(info.published) is bool
     assert info.unitID == 1
@@ -40,10 +40,10 @@ def test_attribute():
     assert info.unit.ID == 1
     assert type(info.unit.ID) is int
     assert info.unit.displayName == 'm'
-    assert type(info.unit.displayName) is unicode
+    assert type(info.unit.displayName) is str
     assert info.unit.name == 'Length'
-    assert type(info.unit.name) is unicode
+    assert type(info.unit.name) is str
     assert info.unit.unitID == 1
     assert type(info.unit.unitID) is int
     assert info.unit.unitName == 'Length'
-    assert type(info.unit.unitName) is unicode
+    assert type(info.unit.unitName) is str

tests/test_unread_desc.py

@@ -62,11 +62,11 @@ class PortUser(IPortUser):
 def print_db_info():
     # Output debug info
     import eos
-    print
-    print "------------ data base connection info ------------"
-    print(eos.db.saveddata_engine)
-    print(eos.db.gamedata_engine)
-    print
+    print()
+    print("------------ data base connection info ------------")
+    print((eos.db.saveddata_engine))
+    print((eos.db.gamedata_engine))
+    print()
 
 
 # noinspection PyUnusedLocal
@@ -78,7 +78,7 @@ def test_import_xml(print_db_info):
     fits = None
     with open(os.path.join(script_dir, xml_file), "r") as file_:
         srcString = file_.read()
-        srcString = unicode(srcString, "utf-8")
+        srcString = str(srcString, "utf-8")
         #  (basestring, IPortUser, basestring) -> list[eos.saveddata.fit.Fit]
         usr.on_port_process_start()
         #stpw.reset()