[Python-modules-commits] [dbf] 04/10: merge patched into master
Sandro Tosi
morph at moszumanska.debian.org
Tue Aug 16 22:05:24 UTC 2016
This is an automated email from the git hooks/post-receive script.
morph pushed a commit to branch master
in repository dbf.
commit 082f7a57f26933028ace0f3751eefa6e81e45163
Merge: 210c0ee 3f10173
Author: Sandro Tosi <morph at debian.org>
Date: Tue Aug 16 19:49:57 2016 +0100
merge patched into master
PKG-INFO | 8 +-
PKG-INFO => dbf.egg-info/PKG-INFO | 8 +-
dbf.egg-info/SOURCES.txt | 12 +
dbf.egg-info/dependency_links.txt | 1 +
dbf.egg-info/requires.txt | 1 +
dbf.egg-info/top_level.txt | 1 +
dbf/README.md | 128 ---------
dbf/WHATSNEW | 293 ---------------------
dbf/__init__.py | 2 +-
dbf/_index.py | 185 +++++++++++++
dbf/{tests.py => test.py} | 149 +++++++++--
dbf/ver_2.py | 54 ++--
dbf/ver_32.py | 255 ++++++++++++++++--
dbf/ver_33.py | 255 ++++++++++++++++--
debian/.git-dpm | 6 +-
...x-tests-so-that-they-don-t-require-a-main.patch | 138 +++++-----
setup.cfg | 5 +
setup.py | 44 ++--
18 files changed, 935 insertions(+), 610 deletions(-)
diff --cc debian/.git-dpm
index 265d699,0000000..8e27e5d
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- 7019625317141591892e32b027441a5560abd3c1
- 7019625317141591892e32b027441a5560abd3c1
- dd802aed0f32291054fa1b43d99b7cdf42538c6e
++3f10173c6d8fb6c85429601d284b416bada8d6bc
++3f10173c6d8fb6c85429601d284b416bada8d6bc
++1a210a0cf8c94f669ff76ac515c4ea810e78a63f
+1a210a0cf8c94f669ff76ac515c4ea810e78a63f
+dbf_0.96.8.orig.tar.gz
+481f5802bb04fa4d9941f210bd4b62e26086dbff
+184291
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-fix-tests-so-that-they-don-t-require-a-main.patch
index d73812f,0000000..945a2a2
mode 100644,000000..100644
--- a/debian/patches/0001-fix-tests-so-that-they-don-t-require-a-main.patch
+++ b/debian/patches/0001-fix-tests-so-that-they-don-t-require-a-main.patch
@@@ -1,529 -1,0 +1,533 @@@
- From 7019625317141591892e32b027441a5560abd3c1 Mon Sep 17 00:00:00 2001
++From 3f10173c6d8fb6c85429601d284b416bada8d6bc Mon Sep 17 00:00:00 2001
+From: Margarita Manterola <marga at debian.org>
+Date: Wed, 4 Nov 2015 01:38:17 +0000
+Subject: fix tests so that they don't require a main.
+
+Forwarded: not-yet
+Last-Update: 2015-06-07
+---
- dbf/tests.py | 147 ++++++++++++++++++++++++++++++++++-------------------------
- 1 file changed, 84 insertions(+), 63 deletions(-)
++ dbf/test.py | 145 ++++++++++++++++++++++++++++++++++--------------------------
++ 1 file changed, 82 insertions(+), 63 deletions(-)
+
- diff --git a/dbf/tests.py b/dbf/tests.py
- index 1981b9a..a68478a 100644
- --- a/dbf/tests.py
- +++ b/dbf/tests.py
- @@ -2512,6 +2512,12 @@ class TestQuantum(unittest.TestCase):
- self.assertEqual(-none is none, True)
++diff --git a/dbf/test.py b/dbf/test.py
++index b74bfa7..65f6fe8 100644
++--- a/dbf/test.py
+++++ b/dbf/test.py
++@@ -2552,6 +2552,11 @@ class TestQuantum(unittest.TestCase):
++
+
+ class TestExceptions(unittest.TestCase):
++ def setUp(self):
++ self.tempdir = tempfile.mkdtemp()
++
++ def tearDown(self):
++ shutil.rmtree(self.tempdir, True)
- +
++
+ def test_bad_field_specs_on_creation(self):
+ self.assertRaises(FieldSpecError, Table, 'blah', 'age N(3,2)', on_disk=False)
- self.assertRaises(FieldSpecError, Table, 'blah', 'name C(300)', on_disk=False)
- @@ -2583,8 +2589,8 @@ class TestExceptions(unittest.TestCase):
- table.open(mode=dbf.READ_ONLY)
++@@ -2626,8 +2631,8 @@ class TestExceptions(unittest.TestCase):
+ self.assertRaises(DbfError, table.append, dict(name='uh uh!'))
++
+ def test_clipper(self):
+- table = Table(os.path.join(tempdir, 'temptable'), 'name C(377); thesis C(20179)', dbf_type='clp')
+- self.assertRaises(BadDataError, Table, os.path.join(tempdir, 'temptable'))
++ table = Table(os.path.join(self.tempdir, 'temptable'), 'name C(377); thesis C(20179)', dbf_type='clp')
++ self.assertRaises(BadDataError, Table, os.path.join(self.tempdir, 'temptable'))
+
- class TestIndexLocation(unittest.TestCase):
- def test_false(self):
- @@ -2595,6 +2601,12 @@ class TestIndexLocation(unittest.TestCase):
- self.assertTrue(IndexLocation(42, True))
++ def test_data_overflow(self):
++ table = Table(os.path.join(tempdir, 'temptable'), 'mine C(2); yours C(15)')
++@@ -2653,6 +2658,12 @@ class TestIndexLocation(unittest.TestCase):
++
+
+ class TestDbfCreation(unittest.TestCase):
++ def setUp(self):
++ self.tempdir = tempfile.mkdtemp()
++
++ def tearDown(self):
++ shutil.rmtree(self.tempdir, True)
++
+ "Testing table creation..."
++
+ def test_db3_memory_tables(self):
- "dbf tables in memory"
- @@ -2610,8 +2622,8 @@ class TestDbfCreation(unittest.TestCase):
++@@ -2670,8 +2681,8 @@ class TestDbfCreation(unittest.TestCase):
+ fields = ['name C(25)', 'hiredate D', 'male L', 'wisdom M', 'qty N(3,0)', 'weight F(7,3)']
+ for i in range(1, len(fields)+1):
+ for fieldlist in combinate(fields, i):
+- table = Table(os.path.join(tempdir, 'temptable'), ';'.join(fieldlist), dbf_type='db3')
+- table = Table(os.path.join(tempdir, 'temptable'), dbf_type='db3')
++ table = Table(os.path.join(self.tempdir, 'temptable'), ';'.join(fieldlist), dbf_type='db3')
++ table = Table(os.path.join(self.tempdir, 'temptable'), dbf_type='db3')
+ actualFields = table.structure()
+ self.assertEqual(fieldlist, actualFields)
+ table = open(table.filename, 'rb')
- @@ -2631,13 +2643,13 @@ class TestDbfCreation(unittest.TestCase):
- self.assertTrue(all([type(x) is unicode for x in table.field_names]))
++@@ -2693,13 +2704,13 @@ class TestDbfCreation(unittest.TestCase):
++
+ def test_clp_disk_tables(self):
+ "clp table on disk"
+- table = Table(os.path.join(tempdir, 'temptable'), 'name C(377); thesis C(20179)', dbf_type='clp')
++ table = Table(os.path.join(self.tempdir, 'temptable'), 'name C(377); thesis C(20179)', dbf_type='clp')
+ self.assertEqual(table.record_length, 20557)
+ fields = ['name C(10977)', 'hiredate D', 'male L', 'wisdom M', 'qty N(3,0)', 'weight F(7,3)']
+ for i in range(1, len(fields)+1):
+ for fieldlist in combinate(fields, i):
+- table = Table(os.path.join(tempdir, 'temptable'), ';'.join(fieldlist), dbf_type='clp')
+- table = Table(os.path.join(tempdir, 'temptable'), dbf_type='clp')
++ table = Table(os.path.join(self.tempdir, 'temptable'), ';'.join(fieldlist), dbf_type='clp')
++ table = Table(os.path.join(self.tempdir, 'temptable'), dbf_type='clp')
+ actualFields = table.structure()
+ self.assertEqual(fieldlist, actualFields)
+ table = open(table.filename, 'rb')
- @@ -2661,8 +2673,8 @@ class TestDbfCreation(unittest.TestCase):
++@@ -2725,8 +2736,8 @@ class TestDbfCreation(unittest.TestCase):
+ 'litres F(11,5)', 'blob G', 'graphic P', 'weight F(7,3)']
+ for i in range(1, len(fields)+1):
+ for fieldlist in combinate(fields, i):
+- table = Table(os.path.join(tempdir, 'tempfp'), ';'.join(fieldlist), dbf_type='vfp')
+- table = Table(os.path.join(tempdir, 'tempfp'), dbf_type='vfp')
++ table = Table(os.path.join(self.tempdir, 'tempfp'), ';'.join(fieldlist), dbf_type='vfp')
++ table = Table(os.path.join(self.tempdir, 'tempfp'), dbf_type='vfp')
+ actualFields = table.structure()
+ self.assertEqual(fieldlist, actualFields)
- def test_vfp_memory_tables(self):
- @@ -2685,19 +2697,19 @@ class TestDbfCreation(unittest.TestCase):
++
++@@ -2752,20 +2763,20 @@ class TestDbfCreation(unittest.TestCase):
+ 'weight F(7,3)']
+ for i in range(1, len(fields)+1):
+ for fieldlist in combinate(fields, i):
+- table = Table(os.path.join(tempdir, 'tempvfp'), ';'.join(fieldlist), dbf_type='vfp')
+- table = Table(os.path.join(tempdir, 'tempvfp'), dbf_type='vfp')
++ table = Table(os.path.join(self.tempdir, 'tempvfp'), ';'.join(fieldlist), dbf_type='vfp')
++ table = Table(os.path.join(self.tempdir, 'tempvfp'), dbf_type='vfp')
+ actualFields = table.structure()
+ fieldlist = [f.replace('nocptrans','binary') for f in fieldlist]
+ self.assertEqual(fieldlist, actualFields)
++
+ def test_codepage(self):
+- table = Table(os.path.join(tempdir, 'tempvfp'), 'name C(25); male L; fired D null', dbf_type='vfp')
++ table = Table(os.path.join(self.tempdir, 'tempvfp'), 'name C(25); male L; fired D null', dbf_type='vfp')
+ self.assertEqual(dbf.default_codepage, 'ascii')
+ self.assertEqual(table.codepage, dbf.CodePage('ascii'))
+ table.close()
+ table.open()
+ table.close()
+- table = Table(os.path.join(tempdir, 'tempvfp'), 'name C(25); male L; fired D null', dbf_type='vfp', codepage='cp850')
++ table = Table(os.path.join(self.tempdir, 'tempvfp'), 'name C(25); male L; fired D null', dbf_type='vfp', codepage='cp850')
+ self.assertEqual(table.codepage, dbf.CodePage('cp850'))
+
+ newtable = table.new('tempvfp2', codepage='cp437')
- @@ -2705,43 +2717,43 @@ class TestDbfCreation(unittest.TestCase):
++@@ -2773,14 +2784,14 @@ class TestDbfCreation(unittest.TestCase):
+ newtable.open()
+ newtable.create_backup()
+ newtable.close()
+- bckup = Table(os.path.join(tempdir, newtable.backup))
++ bckup = Table(os.path.join(self.tempdir, newtable.backup))
+ self.assertEqual(bckup.codepage, newtable.codepage)
++
+ def test_db3_ignore_memos(self):
+- table = Table(os.path.join(tempdir, 'tempdb3'), 'name C(25); wisdom M', dbf_type='db3').open()
++ table = Table(os.path.join(self.tempdir, 'tempdb3'), 'name C(25); wisdom M', dbf_type='db3').open()
+ table.append(('QC Tester', 'check it twice! check it thrice! check it . . . uh . . . again!'))
+ table.close()
+- table = Table(os.path.join(tempdir, 'tempdb3'), dbf_type='db3', ignore_memos=True)
++ table = Table(os.path.join(self.tempdir, 'tempdb3'), dbf_type='db3', ignore_memos=True)
+ table.open()
+ try:
+ self.assertEqual(table[0].wisdom, '')
- finally:
++@@ -2788,10 +2799,10 @@ class TestDbfCreation(unittest.TestCase):
+ table.close()
++
+ def test_fp_ignore_memos(self):
+- table = Table(os.path.join(tempdir, 'tempdb3'), 'name C(25); wisdom M', dbf_type='fp').open()
++ table = Table(os.path.join(self.tempdir, 'tempdb3'), 'name C(25); wisdom M', dbf_type='fp').open()
+ table.append(('QC Tester', 'check it twice! check it thrice! check it . . . uh . . . again!'))
+ table.close()
+- table = Table(os.path.join(tempdir, 'tempdb3'), dbf_type='fp', ignore_memos=True)
++ table = Table(os.path.join(self.tempdir, 'tempdb3'), dbf_type='fp', ignore_memos=True)
+ table.open()
+ try:
+ self.assertEqual(table[0].wisdom, '')
- finally:
++@@ -2799,10 +2810,10 @@ class TestDbfCreation(unittest.TestCase):
+ table.close()
++
+ def test_vfp_ignore_memos(self):
+- table = Table(os.path.join(tempdir, 'tempdb3'), 'name C(25); wisdom M', dbf_type='vfp').open()
++ table = Table(os.path.join(self.tempdir, 'tempdb3'), 'name C(25); wisdom M', dbf_type='vfp').open()
+ table.append(('QC Tester', 'check it twice! check it thrice! check it . . . uh . . . again!'))
+ table.close()
+- table = Table(os.path.join(tempdir, 'tempdb3'), dbf_type='vfp', ignore_memos=True)
++ table = Table(os.path.join(self.tempdir, 'tempdb3'), dbf_type='vfp', ignore_memos=True)
+ table.open()
+ try:
+ self.assertEqual(table[0].wisdom, '')
- finally:
++@@ -2810,10 +2821,10 @@ class TestDbfCreation(unittest.TestCase):
+ table.close()
++
+ def test_clp_ignore_memos(self):
+- table = Table(os.path.join(tempdir, 'tempdb3'), 'name C(25); wisdom M', dbf_type='clp').open()
++ table = Table(os.path.join(self.tempdir, 'tempdb3'), 'name C(25); wisdom M', dbf_type='clp').open()
+ table.append(('QC Tester', 'check it twice! check it thrice! check it . . . uh . . . again!'))
+ table.close()
+- table = Table(os.path.join(tempdir, 'tempdb3'), dbf_type='clp', ignore_memos=True)
++ table = Table(os.path.join(self.tempdir, 'tempdb3'), dbf_type='clp', ignore_memos=True)
+ table.open()
+ try:
+ self.assertEqual(table[0].wisdom, '')
- @@ -2750,14 +2762,16 @@ class TestDbfCreation(unittest.TestCase):
-
- class TestDbfRecords(unittest.TestCase):
++@@ -2825,13 +2836,14 @@ class TestDbfRecords(unittest.TestCase):
+ "Testing records"
- +
++
+ def setUp(self):
++ self.tempdir = tempfile.mkdtemp()
+ self.dbf_table = Table(
+- os.path.join(tempdir, 'dbf_table'),
++ os.path.join(self.tempdir, 'dbf_table'),
+ 'name C(25); paid L; qty N(11,5); orderdate D; desc M',
+ dbf_type='db3',
+ )
+ self.vfp_table = Table(
+- os.path.join(tempdir, 'vfp_table'),
++ os.path.join(self.tempdir, 'vfp_table'),
+ 'name C(25); paid L; qty N(11,5); orderdate D; desc M; mass B;' +
- ' weight F(18,3); age I; meeting T; misc G; photo P; price Y',
- dbf_type='vfp',
- @@ -2766,6 +2780,7 @@ class TestDbfRecords(unittest.TestCase):
++ ' weight F(18,3); age I; meeting T; misc G; photo P; price Y;' +
++ ' dist B(2)',
++@@ -2841,6 +2853,7 @@ class TestDbfRecords(unittest.TestCase):
+ def tearDown(self):
+ self.dbf_table.close()
+ self.vfp_table.close()
++ shutil.rmtree(self.tempdir, True)
+
+ def test_slicing(self):
+ table = self.dbf_table
- @@ -3441,13 +3456,14 @@ class TestDbfRecords(unittest.TestCase):
- class TestDbfRecordTemplates(unittest.TestCase):
++@@ -3523,13 +3536,14 @@ class TestDbfRecordTemplates(unittest.TestCase):
+ "Testing records"
++
+ def setUp(self):
++ self.tempdir = tempfile.mkdtemp()
+ self.dbf_table = Table(
+- os.path.join(tempdir, 'dbf_table'),
++ os.path.join(self.tempdir, 'dbf_table'),
+ 'name C(25); paid L; qty N(11,5); orderdate D; desc M',
+ dbf_type='db3',
+ )
+ self.vfp_table = Table(
+- os.path.join(tempdir, 'vfp_table'),
++ os.path.join(self.tempdir, 'vfp_table'),
+ 'name C(25); paid L; qty N(11,5); orderdate D; desc M; mass B;' +
+ ' weight F(18,3); age I; meeting T; misc G; photo P; price Y',
+ dbf_type='vfp',
- @@ -3456,6 +3472,7 @@ class TestDbfRecordTemplates(unittest.TestCase):
++@@ -3538,6 +3552,7 @@ class TestDbfRecordTemplates(unittest.TestCase):
+ def tearDown(self):
+ self.dbf_table.close()
+ self.vfp_table.close()
++ shutil.rmtree(self.tempdir, True)
+
+ def test_dbf_storage(self):
+ table = self.dbf_table
- @@ -3488,9 +3505,10 @@ class TestDbfRecordTemplates(unittest.TestCase):
-
++@@ -3572,9 +3587,10 @@ class TestDbfRecordTemplates(unittest.TestCase):
+ class TestDbfFunctions(unittest.TestCase):
++
+ def setUp(self):
++ self.tempdir = tempfile.mkdtemp()
+ "create a dbf and vfp table"
+ self.dbf_table = table = Table(
+- os.path.join(tempdir, 'temptable'),
++ os.path.join(self.tempdir, 'temptable'),
+ 'name C(25); paid L; qty N(11,5); orderdate D; desc M', dbf_type='db3'
+ )
+ table.open()
- @@ -3514,7 +3532,7 @@ class TestDbfFunctions(unittest.TestCase):
++@@ -3598,7 +3614,7 @@ class TestDbfFunctions(unittest.TestCase):
+ table.close()
+
+ self.vfp_table = table = Table(
+- os.path.join(tempdir, 'tempvfp'),
++ os.path.join(self.tempdir, 'tempvfp'),
+ 'name C(25); paid L; qty N(11,5); orderdate D; desc M; mass B;'
+ ' weight F(18,3); age I; meeting T; misc G; photo P',
+ dbf_type='vfp',
- @@ -3563,6 +3581,7 @@ class TestDbfFunctions(unittest.TestCase):
++@@ -3648,6 +3664,7 @@ class TestDbfFunctions(unittest.TestCase):
+ def tearDown(self):
+ self.dbf_table.close()
+ self.vfp_table.close()
++ shutil.rmtree(self.tempdir, True)
+
+ def test_add_fields_to_dbf_table(self):
+ "dbf table: adding and deleting fields"
- @@ -3808,7 +3827,7 @@ class TestDbfFunctions(unittest.TestCase):
++@@ -3895,7 +3912,7 @@ class TestDbfFunctions(unittest.TestCase):
+ table.open()
+ table.append(multiple=10)
+ self.assertEqual(table.next_record, table[0])
+- table = self.dbf_table # Table(os.path.join(tempdir, 'temptable'), dbf_type='db3')
++ table = self.dbf_table # Table(os.path.join(self.tempdir, 'temptable'), dbf_type='db3')
+ table.open()
+ total = len(table)
+ table.bottom()
- @@ -3854,7 +3873,7 @@ class TestDbfFunctions(unittest.TestCase):
++@@ -3941,7 +3958,7 @@ class TestDbfFunctions(unittest.TestCase):
+
+ # check that deletes were saved to disk..
+ table.close()
+- table = Table(os.path.join(tempdir, 'temptable'), dbf_type='db3')
++ table = Table(os.path.join(self.tempdir, 'temptable'), dbf_type='db3')
+ table.open()
+ active_records = table.create_index(active)
+ i = 0
- @@ -4000,7 +4019,7 @@ class TestDbfFunctions(unittest.TestCase):
++@@ -4088,7 +4105,7 @@ class TestDbfFunctions(unittest.TestCase):
+ qtylist = self.dbf_qtylist
+ orderlist = self.dbf_orderlist
+ desclist = self.dbf_desclist
+- table2 = table.new(os.path.join(tempdir, 'temptable2'))
++ table2 = table.new(os.path.join(self.tempdir, 'temptable2'))
+ table2.open()
+ for record in table:
+ table2.append()
- @@ -4013,7 +4032,7 @@ class TestDbfFunctions(unittest.TestCase):
++@@ -4101,7 +4118,7 @@ class TestDbfFunctions(unittest.TestCase):
+ self.assertEqual(newrecord[field], record[field])
+ table2.close()
+ table2 = None
+- table2 = Table(os.path.join(tempdir, 'temptable2'), dbf_type='db3')
++ table2 = Table(os.path.join(self.tempdir, 'temptable2'), dbf_type='db3')
+ table2.open()
+ for i in range(len(table)):
+ temp1 = dbf.scatter(table[i])
- @@ -4052,7 +4071,7 @@ class TestDbfFunctions(unittest.TestCase):
++@@ -4141,7 +4158,7 @@ class TestDbfFunctions(unittest.TestCase):
+ self.assertEqual(oldfield in table.field_names, False)
+ self.assertEqual('newfield' in table.field_names, True)
+ table.close()
+- table = Table(os.path.join(tempdir, 'temptable'), dbf_type='db3')
++ table = Table(os.path.join(self.tempdir, 'temptable'), dbf_type='db3')
+ table.open()
+ self.assertEqual(oldfield in table.field_names, False)
+ self.assertEqual('newfield' in table.field_names, True)
- @@ -4070,7 +4089,7 @@ class TestDbfFunctions(unittest.TestCase):
++@@ -4159,7 +4176,7 @@ class TestDbfFunctions(unittest.TestCase):
+ qtylist = self.dbf_qtylist
+ orderlist = self.dbf_orderlist
+ desclist = self.dbf_desclist
+- table2 = table.new(os.path.join(tempdir, 'temptable2'))
++ table2 = table.new(os.path.join(self.tempdir, 'temptable2'))
+ table2.open()
+ for record in table:
+ table2.append(record)
- @@ -4082,7 +4101,7 @@ class TestDbfFunctions(unittest.TestCase):
++@@ -4171,7 +4188,7 @@ class TestDbfFunctions(unittest.TestCase):
+ if key not in table2.memo_types:
+ self.assertEqual(newrecord[field], record[field])
+ table2.close()
+- table2 = Table(os.path.join(tempdir, 'temptable2'), dbf_type='db3')
++ table2 = Table(os.path.join(self.tempdir, 'temptable2'), dbf_type='db3')
+ table2.open()
+ for i in range(len(table)):
+ dict1 = dbf.scatter(table[i], as_type=dict)
- @@ -4114,7 +4133,7 @@ class TestDbfFunctions(unittest.TestCase):
++@@ -4203,7 +4220,7 @@ class TestDbfFunctions(unittest.TestCase):
+ qtylist = self.dbf_qtylist
+ orderlist = self.dbf_orderlist
+ desclist = self.dbf_desclist
+- table2 = table.new(os.path.join(tempdir, 'temptable2'))
++ table2 = table.new(os.path.join(self.tempdir, 'temptable2'))
+ table2.open()
+ record = table.next_record
+ table2.append(dbf.scatter(record), multiple=100)
- @@ -4122,13 +4141,13 @@ class TestDbfFunctions(unittest.TestCase):
++@@ -4211,13 +4228,13 @@ class TestDbfFunctions(unittest.TestCase):
+ for field in dbf.field_names(record):
+ self.assertEqual(record[field], samerecord[field])
+ table2.close()
+- table2 = Table(os.path.join(tempdir, 'temptable2'), dbf_type='db3')
++ table2 = Table(os.path.join(self.tempdir, 'temptable2'), dbf_type='db3')
+ table2.open()
+ for samerecord in table2:
+ for field in dbf.field_names(record):
+ self.assertEqual(record[field], samerecord[field])
+ table2.close()
+- table3 = table.new(os.path.join(tempdir, 'temptable3'))
++ table3 = table.new(os.path.join(self.tempdir, 'temptable3'))
+ table3.open()
+ record = table.next_record
+ table3.append(record, multiple=100)
- @@ -4136,7 +4155,7 @@ class TestDbfFunctions(unittest.TestCase):
++@@ -4225,7 +4242,7 @@ class TestDbfFunctions(unittest.TestCase):
+ for field in dbf.field_names(record):
+ self.assertEqual(record[field], samerecord[field])
+ table3.close()
+- table3 = Table(os.path.join(tempdir, 'temptable3'), dbf_type='db3')
++ table3 = Table(os.path.join(self.tempdir, 'temptable3'), dbf_type='db3')
+ table3.open()
+ for samerecord in table3:
+ for field in dbf.field_names(record):
- @@ -4192,35 +4211,35 @@ class TestDbfFunctions(unittest.TestCase):
++@@ -4284,35 +4301,35 @@ class TestDbfFunctions(unittest.TestCase):
+ dbf.write(table[0], motto='Are we there yet??')
+ self.assertEqual(table[0].motto, 'Are we there yet??')
+ table.close()
+- table = Table(os.path.join(tempdir, 'temptable4'), 'name C(50); age N(3,0)', dbf_type='db3')
++ table = Table(os.path.join(self.tempdir, 'temptable4'), 'name C(50); age N(3,0)', dbf_type='db3')
+ table.open()
+ table.append(('user', 0))
+ table.close()
+ table.open()
+ table.close()
+- table = Table(os.path.join(tempdir, 'temptable4'), dbf_type='db3')
++ table = Table(os.path.join(self.tempdir, 'temptable4'), dbf_type='db3')
+ table.open()
+ table.add_fields('motto M')
+ dbf.write(table[0], motto='Are we there yet??')
+ self.assertEqual(table[0].motto, 'Are we there yet??')
+ table.close()
+- table = Table(os.path.join(tempdir, 'temptable4'), dbf_type='db3')
++ table = Table(os.path.join(self.tempdir, 'temptable4'), dbf_type='db3')
+ table.open()
+ self.assertEqual(table[0].motto, 'Are we there yet??')
+ table.close()
+- table = Table(os.path.join(tempdir, 'temptable4'), 'name C(50); age N(3,0)', dbf_type='vfp')
++ table = Table(os.path.join(self.tempdir, 'temptable4'), 'name C(50); age N(3,0)', dbf_type='vfp')
+ table.open()
+ table.append(('user', 0))
+ table.close()
+ table.open()
+ table.close()
+- table = Table(os.path.join(tempdir, 'temptable4'), dbf_type='vfp')
++ table = Table(os.path.join(self.tempdir, 'temptable4'), dbf_type='vfp')
+ table.open()
+ table.add_fields('motto M')
+ dbf.write(table[0], motto='Are we there yet??')
+ self.assertEqual(table[0].motto, 'Are we there yet??')
+ table.close()
+- table = Table(os.path.join(tempdir, 'temptable4'), dbf_type='vfp')
++ table = Table(os.path.join(self.tempdir, 'temptable4'), dbf_type='vfp')
+ table.open()
+ self.assertEqual(table[0].motto, 'Are we there yet??')
+ table.close()
- @@ -4234,49 +4253,49 @@ class TestDbfFunctions(unittest.TestCase):
++@@ -4327,49 +4344,49 @@ class TestDbfFunctions(unittest.TestCase):
+ orderlist = self.dbf_orderlist
+ desclist = self.dbf_desclist
+ dbf.export(table, table.filename, header=False)
+- csvtable = dbf.from_csv(os.path.join(tempdir, 'temptable.csv'))
++ csvtable = dbf.from_csv(os.path.join(self.tempdir, 'temptable.csv'))
+ csvtable.open()
+ for i in index(table):
+ for j in index(table.field_names):
+ self.assertEqual(str(table[i][j]), csvtable[i][j])
+ csvtable.close()
+- csvtable = dbf.from_csv(os.path.join(tempdir, 'temptable.csv'), to_disk=True, filename=os.path.join(tempdir, 'temptable5'))
++ csvtable = dbf.from_csv(os.path.join(self.tempdir, 'temptable.csv'), to_disk=True, filename=os.path.join(self.tempdir, 'temptable5'))
+ csvtable.open()
+ for i in index(table):
+ for j in index(table.field_names):
+ self.assertEqual(str(table[i][j]).strip(), csvtable[i][j].strip())
+ csvtable.close()
+- csvtable = dbf.from_csv(os.path.join(tempdir, 'temptable.csv'), field_names=['field1','field2'])
++ csvtable = dbf.from_csv(os.path.join(self.tempdir, 'temptable.csv'), field_names=['field1','field2'])
+ csvtable.open()
+ for i in index(table):
+ for j in index(table.field_names):
+ self.assertEqual(str(table[i][j]), csvtable[i][j])
+ csvtable.close()
+- csvtable = dbf.from_csv(os.path.join(tempdir, 'temptable.csv'), field_names=['field1','field2'], to_disk=True, filename=os.path.join(tempdir, 'temptable5'))
++ csvtable = dbf.from_csv(os.path.join(self.tempdir, 'temptable.csv'), field_names=['field1','field2'], to_disk=True, filename=os.path.join(self.tempdir, 'temptable5'))
+ csvtable.open()
+ for i in index(table):
+ for j in index(table.field_names):
+ self.assertEqual(str(table[i][j]).strip(), csvtable[i][j].strip())
+ csvtable.close()
+- csvtable = dbf.from_csv(os.path.join(tempdir, 'temptable.csv'), extra_fields=['count N(5,0)','id C(10)'])
++ csvtable = dbf.from_csv(os.path.join(self.tempdir, 'temptable.csv'), extra_fields=['count N(5,0)','id C(10)'])
+ csvtable.open()
+ for i in index(table):
+ for j in index(table.field_names):
+ self.assertEqual(str(table[i][j]), csvtable[i][j])
+ csvtable.close()
+- csvtable = dbf.from_csv(os.path.join(tempdir, 'temptable.csv'), extra_fields=['count N(5,0)','id C(10)'], to_disk=True, filename=os.path.join(tempdir, 'temptable5'))
++ csvtable = dbf.from_csv(os.path.join(self.tempdir, 'temptable.csv'), extra_fields=['count N(5,0)','id C(10)'], to_disk=True, filename=os.path.join(self.tempdir, 'temptable5'))
+ csvtable.open()
+ for i in index(table):
+ for j in index(table.field_names):
+ self.assertEqual(str(table[i][j]).strip(), csvtable[i][j].strip())
+ csvtable.close()
+- csvtable = dbf.from_csv(os.path.join(tempdir, 'temptable.csv'), field_names=['name','qty','paid','desc'], extra_fields='test1 C(15);test2 L'.split(';'))
++ csvtable = dbf.from_csv(os.path.join(self.tempdir, 'temptable.csv'), field_names=['name','qty','paid','desc'], extra_fields='test1 C(15);test2 L'.split(';'))
+ csvtable.open()
+ for i in index(table):
+ for j in index(table.field_names):
+ self.assertEqual(str(table[i][j]), csvtable[i][j])
+ csvtable.close()
+- csvtable = dbf.from_csv(os.path.join(tempdir, 'temptable.csv'), field_names=['name','qty','paid','desc'], extra_fields='test1 C(15);test2 L'.split(';'), to_disk=True, filename=os.path.join(tempdir, 'temptable5'))
++ csvtable = dbf.from_csv(os.path.join(self.tempdir, 'temptable.csv'), field_names=['name','qty','paid','desc'], extra_fields='test1 C(15);test2 L'.split(';'), to_disk=True, filename=os.path.join(self.tempdir, 'temptable5'))
+ csvtable.open()
+ for i in index(table):
+ for j in index(table.field_names):
- @@ -4427,9 +4446,10 @@ class TestDbfFunctions(unittest.TestCase):
-
++@@ -4527,9 +4544,10 @@ class TestDbfFunctions(unittest.TestCase):
+ class TestDbfNavigation(unittest.TestCase):
++
+ def setUp(self):
++ self.tempdir = tempfile.mkdtemp()
+ "create a dbf and vfp table"
+ self.dbf_table = table = Table(
+- os.path.join(tempdir, 'temptable'),
++ os.path.join(self.tempdir, 'temptable'),
+ 'name C(25); paid L; qty N(11,5); orderdate D; desc M', dbf_type='db3'
+ )
+ table.open()
- @@ -4453,7 +4473,7 @@ class TestDbfNavigation(unittest.TestCase):
++@@ -4553,7 +4571,7 @@ class TestDbfNavigation(unittest.TestCase):
+ table.close()
+
+ self.vfp_table = table = Table(
+- os.path.join(tempdir, 'tempvfp'),
++ os.path.join(self.tempdir, 'tempvfp'),
+ 'name C(25); paid L; qty N(11,5); orderdate D; desc M; mass B;'
+ ' weight F(18,3); age I; meeting T; misc G; photo P',
+ dbf_type='vfp',
- @@ -4502,6 +4522,7 @@ class TestDbfNavigation(unittest.TestCase):
++@@ -4603,6 +4621,7 @@ class TestDbfNavigation(unittest.TestCase):
+ def tearDown(self):
+ self.dbf_table.close()
+ self.vfp_table.close()
++ shutil.rmtree(self.tempdir, True)
+
+ def test_top(self):
+ "top, current in Tables, Lists, and Indexes"
- @@ -4728,9 +4749,10 @@ class TestDbfNavigation(unittest.TestCase):
- class TestDbfLists(unittest.TestCase):
++@@ -4831,9 +4850,10 @@ class TestDbfLists(unittest.TestCase):
+ "DbfList tests"
++
+ def setUp(self):
++ self.tempdir = tempfile.mkdtemp()
+ "create a dbf table"
+ self.dbf_table = table = Table(
+- os.path.join(tempdir, 'temptable'),
++ os.path.join(self.tempdir, 'temptable'),
+ 'name C(25); paid L; qty N(11,5); orderdate D; desc M', dbf_type='db3'
+ )
+ table.open()
- @@ -4755,6 +4777,7 @@ class TestDbfLists(unittest.TestCase):
- table.close()
++@@ -4859,6 +4879,7 @@ class TestDbfLists(unittest.TestCase):
++
+ def tearDown(self):
+ self.dbf_table.close()
++ shutil.rmtree(self.tempdir, True)
++
+ def test_exceptions(self):
+ table = self.dbf_table
- table.open()
- @@ -4879,9 +4902,10 @@ class TestDbfLists(unittest.TestCase):
- class TestWhatever(unittest.TestCase):
++@@ -4991,9 +5012,10 @@ class TestWhatever(unittest.TestCase):
+ "move tests here to run one at a time while debugging"
++
+ def setUp(self):
++ self.tempdir = tempfile.mkdtemp()
+ "create a dbf and vfp table"
+ self.dbf_table = table = Table(
+- os.path.join(tempdir, 'temptable'),
++ os.path.join(self.tempdir, 'temptable'),
+ 'name C(25); paid L; qty N(11,5); orderdate D; desc M', dbf_type='db3'
+ )
+ table.open()
- @@ -4905,7 +4929,7 @@ class TestWhatever(unittest.TestCase):
++@@ -5017,7 +5039,7 @@ class TestWhatever(unittest.TestCase):
+ table.close()
+
+ self.vfp_table = table = Table(
+- os.path.join(tempdir, 'tempvfp'),
++ os.path.join(self.tempdir, 'tempvfp'),
+ 'name C(25); paid L; qty N(11,5); orderdate D; desc M; mass B;'
+ ' weight F(18,3); age I; meeting T; misc G; photo P',
+ dbf_type='vfp',
- @@ -4954,10 +4978,7 @@ class TestWhatever(unittest.TestCase):
++@@ -5067,12 +5089,9 @@ class TestWhatever(unittest.TestCase):
+ def tearDown(self):
+ self.dbf_table.close()
+ self.vfp_table.close()
++ shutil.rmtree(self.tempdir, True)
++
++
+ # main
+ if __name__ == '__main__':
+- tempdir = tempfile.mkdtemp()
+- try:
+- unittest.main()
+- finally:
+- shutil.rmtree(tempdir, True)
++ unittest.main()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/dbf.git
More information about the Python-modules-commits
mailing list