2.5 compatible version checking

8 files changed, 15 insertions, 18 deletions

diff --git a/setup.py b/setup.py
index c9974b0..54d2727 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@ if sys.argv[-1] == "publish":
 
 required = []
 
-if sys.version_info < (2,6):
+if sys.version_info[0] < (2,6):
     required.append('simplejson')
 
 setup(
diff --git a/tablib/formats/_csv.py b/tablib/formats/_csv.py
index 46a26d5..4b1dc02 100644
--- a/tablib/formats/_csv.py
+++ b/tablib/formats/_csv.py
@@ -4,7 +4,7 @@
 """
 
 import sys
-if sys.version_info.major > 2:
+if sys.version_info[0] > 2:
     from io import StringIO
 else:
     from cStringIO import StringIO
diff --git a/tablib/formats/_html.py b/tablib/formats/_html.py
index 64be2af..485536c 100644
--- a/tablib/formats/_html.py
+++ b/tablib/formats/_html.py
@@ -6,7 +6,7 @@
 import sys
 
 
-if sys.version_info.major > 2:
+if sys.version_info[0] > 2:
     from io import StringIO
     from tablib.packages import markup3 as markup
 else:
diff --git a/tablib/formats/_tsv.py b/tablib/formats/_tsv.py
index ab10d32..acf28da 100644
--- a/tablib/formats/_tsv.py
+++ b/tablib/formats/_tsv.py
@@ -4,7 +4,7 @@
 """
 
 import sys
-if sys.version_info.major > 2:
+if sys.version_info[0] > 2:
     from io import StringIO
 else:
     from cStringIO import StringIO
diff --git a/tablib/formats/_xls.py b/tablib/formats/_xls.py
index 6f59da8..e7192c5 100644
--- a/tablib/formats/_xls.py
+++ b/tablib/formats/_xls.py
@@ -7,12 +7,12 @@ import io
 import sys
 
 try:
-    if sys.version_info.major > 2:
+    if sys.version_info[0] > 2:
         import xlwt3 as xlwt
     else:
         import xlwt
 except ImportError:
-    if sys.version_info.major > 2:
+    if sys.version_info[0] > 2:
         import tablib.packages.xlwt3 as xlwt
     else:
         import tablib.packages.xlwt as xlwt
diff --git a/tablib/formats/_yaml.py b/tablib/formats/_yaml.py
index 0124c94..cc916f4 100644
--- a/tablib/formats/_yaml.py
+++ b/tablib/formats/_yaml.py
@@ -8,7 +8,7 @@ import sys
 try:
     import yaml
 except ImportError:
-    if sys.version_info.major > 2:
+    if sys.version_info[0] > 2:
         import tablib.packages.yaml3 as yaml
     else:
         import tablib.packages.yaml as yaml
diff --git a/tablib/packages/xlwt/__init__.py b/tablib/packages/xlwt/__init__.py
index dcc23f0..b305840 100644
--- a/tablib/packages/xlwt/__init__.py
+++ b/tablib/packages/xlwt/__init__.py
@@ -3,14 +3,11 @@
 __VERSION__ = '0.7.2'
 
 import sys
-if sys.version_info[:2] < (2, 3):
-    print >> sys.stderr, "Sorry, xlwt requires Python 2.3 or later"
-    sys.exit(1)
 
-from Workbook import Workbook
-from Worksheet import Worksheet
-from Row import Row
-from Column import Column
-from Formatting import Font, Alignment, Borders, Pattern, Protection
-from Style import XFStyle, easyxf
-from ExcelFormula import *
+from .Workbook import Workbook
+from .Worksheet import Worksheet
+from .Row import Row
+from .Column import Column
+from .Formatting import Font, Alignment, Borders, Pattern, Protection
+from .Style import XFStyle, easyxf
+from .ExcelFormula import *
diff --git a/test_tablib.py b/test_tablib.py
index 5c4c551..320c759 100755
--- a/test_tablib.py
+++ b/test_tablib.py
@@ -6,7 +6,7 @@
 import unittest
 import sys
 
-if sys.version_info.major > 2:
+if sys.version_info[0] > 2:
     from tablib.packages import markup3 as markup
 else:
     from tablib.packages import markup