Some Python 3 compatibility fixes; still need to fix coordinate_to_string

Author: kz26

pyexcelerate/DataTypes.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+from . import six
 
 class DataTypes(object):
 	BOOLEAN = 0
@@ -18,21 +19,21 @@ def to_enumeration_value(index):
 	@staticmethod
 	def get_type(value):
 		# Using value.__class__ over isinstance for speed
-		if value.__class__ == str:
+		if value.__class__ in six.string_types:
 			if len(value) > 0 and value[0] == '=':
 				return DataTypes.FORMULA
 			else:
 				return DataTypes.INLINE_STRING
 		# not using in (int, float, long, complex) for speed
-		elif value.__class__ == int or value.__class__ == float or value.__class__ == long or value.__class__ == complex:
+		elif value.__class__ in six.integer_types + (float, complex):
 			return DataTypes.NUMBER
 		# fall back to the slower isinstance
-		elif isinstance(value, basestring):
+		elif isinstance(value, six.string_types):
 			if len(value) > 0 and value[0] == '=':
 				return DataTypes.FORMULA
 			else:
 				return DataTypes.INLINE_STRING
-		elif isinstance(value, (int, float, long, complex)):
+		elif isinstance(value, six.integer_types + (float, complex)):
 			return DataTypes.NUMBER
 		elif isinstance(value, datetime):
 			return DataTypes.DATE

pyexcelerate/Range.py

@@ -1,4 +1,5 @@
 from . import DataTypes
+from . import six
 
 class Range(object):
 	A = ord('A')
@@ -174,7 +175,7 @@ def coordinate_to_string(coord):
 
 	@staticmethod
 	def to_coordinate(value):
-		if isinstance(value, basestring):
+		if isinstance(value, six.string_types):
 			value = Range.string_to_coordinate(value)
 		if (value[0] < 1 or value[0] > 65536) and value[1] != float('inf'):
 			raise Exception("Row index out of bounds")

pyexcelerate/tests/benchmark.py

@@ -12,7 +12,7 @@ def run_pyexcelerate():
     stime = time.clock()
     ws = wb.new_sheet("Test 1", data=testData)
     wb.save("test_pyexcelerate.xlsx")
-    print "pyexcelerate, %s, %s, %s" % (ROWS, COLUMNS, time.clock() - stime)
+    print("pyexcelerate, %s, %s, %s" % (ROWS, COLUMNS, time.clock() - stime))
 
 def run_openpyxl():
     stime = time.clock()
@@ -22,7 +22,7 @@ def run_openpyxl():
     for row in testData:
         ws.append(row)
     wb.save("test_openpyxl.xlsx")
-    print "openpyxl, %s, %s, %s" % (ROWS, COLUMNS, time.clock() - stime)
+    print("openpyxl, %s, %s, %s" % (ROWS, COLUMNS, time.clock() - stime))
 
 def run_xlsxwriter():
     stime = time.clock()
@@ -32,7 +32,7 @@ def run_xlsxwriter():
         for col in range(COLUMNS):
             ws.write_number(row, col, 1)
     wb.close()
-    print "xlsxwriter, %s, %s, %s" % (ROWS, COLUMNS, time.clock() - stime)
+    print("xlsxwriter, %s, %s, %s" % (ROWS, COLUMNS, time.clock() - stime))
 
 def test_all():
     run_pyexcelerate()

pyexcelerate/tests/python_benchmarks.py

@@ -1,6 +1,5 @@
 import time
 
-
 def test_benchmark():
 	TRIALS = range(1000000)
 
@@ -16,7 +15,7 @@ def test_benchmark():
 		if not answer:
 			print "failed test"
 			break
-	print "isinstance, %s" % (time.clock() - stime)
+	print("isinstance, %s" % (time.clock() - stime))
 
 	# attempt __class__
 
@@ -26,13 +25,13 @@ def test_benchmark():
 		if not answer:
 			print "failed test"
 			break
-	print "__class__, set, %s" % (time.clock() - stime)
+	print("__class__, set, %s" % (time.clock() - stime))
 
 	stime = time.clock()
 	for i in TRIALS:
 		answer = (integer.__class__ == int or integer.__class__ == float or integer.__class__ == long or integer.__class__ == complex)
 		if not answer:
 			print "failed test"
 			break
-	print "__class__, or, %s" % (time.clock() - stime)
-	
+	print("__class__, or, %s" % (time.clock() - stime))
+	

pyexcelerate/tests/test_Workbook.py

@@ -1,5 +1,4 @@
 from ..Workbook import Workbook
-import cStringIO as StringIO
 import time
 import numpy
 from datetime import datetime
@@ -21,7 +20,7 @@ def test_save():
     stime = time.clock()
     ws = wb.new_sheet("Test 1", data=testData)
     wb.save("test.xlsx")
-    print "%s, %s, %s" % (ROWS, COLUMNS, time.clock() - stime)
+    print("%s, %s, %s" % (ROWS, COLUMNS, time.clock() - stime))
 
 def test_formulas():
 	wb = Workbook()