Merge pull request #46 from takluyver/py3

Python 3 support

Author: cjw296

.gitignore

@@ -1,4 +1,6 @@
 *.pyc
 /dist
 *.egg-info
-/build
+/build
+/tests/output
+.tox

.travis.yml

@@ -1,5 +1,17 @@
 language: python
-python:
-  - "2.7"
-# command to run tests, e.g. python setup.py test
-script: nosetests
+
+sudo: false
+env:
+  - TOXENV=py27
+  - TOXENV=py33
+  - TOXENV=py34
+  - TOXENV=pypy
+
+install:
+  - travis_retry pip install tox coveralls
+
+script:
+  - tox
+
+after_success:
+  - coveralls

setup.cfg

@@ -0,0 +1,19 @@
+[pytest]
+norecursedirs =
+    .git
+    .tox
+    dist
+    build
+    *.egg
+
+addopts =
+    -rxEfs
+    --strict
+    --doctest-modules
+    --doctest-glob \*.rst
+    --tb short
+    --ignore setup.py
+    --ignore xlwt/examples/
+
+markers =
+    unit

test-requirements.txt

@@ -0,0 +1,3 @@
+nose
+pytest
+tox

tests/RKbug.py

@@ -8,14 +8,14 @@ def cellname(rowx, colx):
 
 def RK_pack_check(num, anint, case=None):
     if not(-0x7fffffff - 1 <= anint <= 0x7fffffff):
-        print "RK_pack_check: not a signed 32-bit int: %r (%r); case: %r" \
-            % (anint, hex(anint), case)
+        print("RK_pack_check: not a signed 32-bit int: %r (%r); case: %r" \
+            % (anint, hex(anint), case))
     pstr = pack("<i", anint)
     actual = unpack_RK(pstr)
     if actual != num:
-        print "RK_pack_check: round trip failure: %r (%r); case %r;  %r in, %r out" \
-            % (anint, hex(anint), case, num, actual)
- 
+        print("RK_pack_check: round trip failure: %r (%r); case %r;  %r in, %r out" \
+            % (anint, hex(anint), case, num, actual))
+
 
 def RK_encode(num, blah=0):
     """\
@@ -25,22 +25,22 @@ def RK_encode(num, blah=0):
     rk_encoded = 0
     packed = pack('<d', num)
 
-    if blah: print
-    if blah: print repr(num)
+    if blah: print()
+    if blah: print(repr(num))
     w01, w23 = unpack('<2i', packed)
     if not w01 and not(w23 & 3):
         # 34 lsb are 0
-        if blah: print "float RK", w23, hex(w23)
+        if blah: print("float RK", w23, hex(w23))
         return RK_pack_check(num, w23, 0)
         # return RKRecord(
         #    self.__parent.get_index(), self.__idx, self.__xf_idx, w23).get()
 
     if -0x20000000 <= num < 0x20000000:
         inum = int(num)
         if inum == num:
-            if blah: print "30-bit integer RK", inum, hex(inum)
+            if blah: print("30-bit integer RK", inum, hex(inum))
             rk_encoded = 2 | (inum << 2)
-            if blah: print "rk", rk_encoded, hex(rk_encoded)
+            if blah: print("rk", rk_encoded, hex(rk_encoded))
             return RK_pack_check(num, rk_encoded, 2)
             # return RKRecord(
             #     self.__parent.get_index(), self.__idx, self.__xf_idx, rk_encoded).get()
@@ -50,22 +50,22 @@ def RK_encode(num, blah=0):
     w01, w23 = unpack('<2i', packed100)
     if not w01 and not(w23 & 3):
         # 34 lsb are 0
-        if blah: print "float RK*100", w23, hex(w23)
+        if blah: print("float RK*100", w23, hex(w23))
         return RK_pack_check(num, w23 | 1, 1)
         # return RKRecord(
         #    self.__parent.get_index(), self.__idx, self.__xf_idx, w23 | 1).get()
 
     if -0x20000000 <= temp < 0x20000000:
         itemp = int(round(temp, 0))
-        if blah: print (itemp == temp), (itemp / 100.0 == num)
+        if blah: print((itemp == temp), (itemp / 100.0 == num))
         if itemp / 100.0 == num:
-            if blah: print "30-bit integer RK*100", itemp, hex(itemp)
+            if blah: print("30-bit integer RK*100", itemp, hex(itemp))
             rk_encoded = 3 | (itemp << 2)
             return RK_pack_check(num, rk_encoded, 3)
             # return RKRecord(
             #    self.__parent.get_index(), self.__idx, self.__xf_idx, rk_encoded).get()
 
-    if blah: print "Number" 
+    if blah: print("Number" )
     # return NumberRecord(
     #    self.__parent.get_index(), self.__idx, self.__xf_idx, num).get()
 

tests/mini.xls

@@ -6,12 +6,12 @@
 # Copyright (C) 2010, Manfred Moitzi
 # License: BSD licence
 
-import sys
-import os
 import unittest
 import filecmp
 import datetime
 
+from utils import in_tst_dir, in_tst_output_dir
+
 import xlwt as xlwt
 ezxf = xlwt.easyxf
 
@@ -30,13 +30,10 @@ def write_xls(file_name, sheet_name, headings, data, heading_xf, data_xfs):
             sheet.write(rowx, colx, value, data_xfs[colx])
     book.save(file_name)
 
-def from_tst_dir(filename):
-    return os.path.join(os.path.dirname(os.path.abspath(__file__)), filename)
-
 EXAMPLE_XLS = 'xlwt_easyxf_simple_demo.xls'
 
 class TestUnicode0(unittest.TestCase):
-    def create_example_xls(self):
+    def create_example_xls(self, filename):
         mkd = datetime.date
         hdngs = ['Date', 'Stock Code', 'Quantity', 'Unit Price', 'Value', 'Message']
         kinds =  'date    text          int         price         money    text'.split()
@@ -57,12 +54,12 @@ def create_example_xls(self):
             'text': ezxf(),
             }
         data_xfs = [kind_to_xf_map[k] for k in kinds]
-        write_xls(EXAMPLE_XLS, 'Demo', hdngs, data, heading_xf, data_xfs)
+        write_xls(filename, 'Demo', hdngs, data, heading_xf, data_xfs)
 
     def test_example_xls(self):
-        self.create_example_xls()
-        self.assertTrue(filecmp.cmp(from_tst_dir(EXAMPLE_XLS),
-                                    from_tst_dir('output-0.7.2/'+EXAMPLE_XLS),
+        self.create_example_xls(in_tst_output_dir(EXAMPLE_XLS))
+        self.assertTrue(filecmp.cmp(in_tst_dir(EXAMPLE_XLS),
+                                    in_tst_output_dir(EXAMPLE_XLS),
                                     shallow=False))
 
 if __name__=='__main__':

tests/simple.xls

@@ -11,6 +11,8 @@
 import unittest
 import filecmp
 
+from utils import in_tst_dir, in_tst_output_dir
+
 import xlwt
 
 def from_tst_dir(filename):
@@ -20,10 +22,10 @@ class TestMini(unittest.TestCase):
     def test_create_mini_xls(self):
         book = xlwt.Workbook()
         sheet = book.add_sheet('xlwt was here')
-        book.save('mini.xls')
+        book.save(in_tst_output_dir('mini.xls'))
 
-        self.assertTrue(filecmp.cmp(from_tst_dir('mini.xls'),
-                                    from_tst_dir(os.path.join('output-0.7.2', 'mini.xls')),
+        self.assertTrue(filecmp.cmp(in_tst_dir('mini.xls'),
+                                    in_tst_output_dir('mini.xls'),
                                     shallow=False))
 
 if __name__=='__main__':

tests/test_easyxf.py

@@ -12,10 +12,9 @@
 import filecmp
 from datetime import datetime
 
-import xlwt
+from utils import in_tst_dir, in_tst_output_dir
 
-def from_tst_dir(filename):
-    return os.path.join(os.path.dirname(os.path.abspath(__file__)), filename)
+import xlwt
 
 class TestSimple(unittest.TestCase):
     def create_simple_xls(self):
@@ -39,12 +38,12 @@ def create_simple_xls(self):
         ws.write(2, 1, 1)
         ws.write(2, 2, xlwt.Formula("A3+B3"))
 
-        wb.save('simple.xls')
+        wb.save(in_tst_output_dir('simple.xls'))
 
     def test_create_simple_xls(self):
         self.create_simple_xls()
-        self.assertTrue(filecmp.cmp(from_tst_dir('simple.xls'),
-                                    from_tst_dir(os.path.join('output-0.7.2', 'simple.xls')),
+        self.assertTrue(filecmp.cmp(in_tst_dir('simple.xls'),
+                                    in_tst_output_dir('simple.xls'),
                                     shallow=False))
 
 if __name__=='__main__':

tests/test_mini.py

@@ -6,15 +6,13 @@
 # Copyright (C) 2010, Manfred Moitzi
 # License: BSD licence
 
-import sys
 import os
 import unittest
 import filecmp
 
 import xlwt
 
-def from_tst_dir(filename):
-    return os.path.join(os.path.dirname(os.path.abspath(__file__)), filename)
+from utils import in_tst_dir, in_tst_output_dir
 
 def create_example_xls(filename):
     w = xlwt.Workbook()
@@ -44,9 +42,9 @@ def create_example_xls(filename):
 class TestUnicode1(unittest.TestCase):
 
     def test_example_xls(self):
-        create_example_xls(EXAMPLE_XLS)
-        self.assertTrue(filecmp.cmp(from_tst_dir(EXAMPLE_XLS),
-                                    from_tst_dir(os.path.join('output-0.7.2', EXAMPLE_XLS)),
+        create_example_xls(in_tst_output_dir(EXAMPLE_XLS))
+        self.assertTrue(filecmp.cmp(in_tst_dir(EXAMPLE_XLS),
+                                    in_tst_output_dir(EXAMPLE_XLS),
                                     shallow=False))
 if __name__=='__main__':
     unittest.main()

tests/test_simple.py

@@ -0,0 +1,11 @@
+import os
+from os.path import join, dirname, abspath, isdir
+
+def in_tst_dir(filename):
+    return join(dirname(abspath(__file__)), filename)
+
+def in_tst_output_dir(filename):
+    output_dir = join(dirname(abspath(__file__)), 'output')
+    if not isdir(output_dir):
+        os.mkdir(output_dir, 0o755)
+    return join(output_dir, filename)

tests/test_unicode1.py

@@ -0,0 +1,13 @@
+[tox]
+skipsdist = True
+envlist = py27, py33, py34, pypy
+
+[base]
+commands =
+    pip install -e . -r test-requirements.txt
+
+[testenv]
+pip_pre=False
+commands =
+    {[base]commands}
+    py.test {posargs} tests/