refactor helper ieq in some places

petl/test/io/test_avro.py

@@ -8,13 +8,13 @@
 from decimal import Decimal
 from tempfile import NamedTemporaryFile
 
-from nose.tools import eq_
-
-from petl.compat import izip_longest, PY3
+from petl.compat import PY3
 from petl.transform.basics import cat
 from petl.util.base import dicts
 from petl.util.vis import look
 
+from petl.test.helpers import ieq
+
 from petl.io.avro import fromavro, toavro, appendavro
 
 from petl.test.io.test_avro_schemas import schema0, schema1, schema2, \
@@ -173,8 +173,8 @@ def _assert_rows_are_equals(test_expect, test_actual, print_tables=True):
             _show__rows_from('Actual:', test_actual)
             avro_schema = test_actual.get_avro_schema()
             print('\nSchema:\n', avro_schema)
-        _eq_rows(test_expect, test_actual)
-        _eq_rows(test_expect, test_actual)  # verify can iterate twice
+        ieq(test_expect, test_actual)
+        ieq(test_expect, test_actual)  # verify can iterate twice
 
     def _show__expect_rows(test_rows, print_tables=True, limit=0):
         if print_tables:
@@ -184,28 +184,6 @@ def _show__rows_from(label, test_rows, limit=0):
         print(label)
         print(look(test_rows, limit=limit))
 
-    def _eq_rows(expect, actual, cast=None):
-        '''test when values are equals for eacfh row and column'''
-        ie = iter(expect)
-        ia = iter(actual)
-        for re, ra in izip_longest(ie, ia, fillvalue=None):
-            if cast:
-                ra = cast(ra)
-            for ve, va in izip_longest(re, ra, fillvalue=None):
-                if isinstance(ve, list):
-                    for je, ja in izip_longest(ve, va, fillvalue=None):
-                        _eq2(je, ja, re, ra)
-                elif not isinstance(ve, dict):
-                    _eq2(ve, va, re, ra)
-
-    def _eq2(ve, va, re, ra):
-        try:
-            eq_(ve, va)
-        except AssertionError as ea:
-            print('\nrow: ', re, ' != ', ra)
-            print('val: ', ve, ' != ', va)
-            raise ea
-
     def _decs(float_value, rounding=12):
         return Decimal(str(round(float_value, rounding)))
 

petl/test/io/test_xml.py

@@ -9,8 +9,7 @@
 from petl.test.helpers import ieq
 from petl.util import nrows, look
 from petl.io.xml import fromxml
-from petl.compat import urlopen, izip_longest
-from nose.tools import eq_
+from petl.compat import urlopen
 
 
 def test_fromxml():
@@ -226,37 +225,13 @@ def _write_test_file(data, pre='', pos=''):
 
 def _compare(expected, actual):
     try:
-        _eq_rows(expected, actual)
+        ieq(expected, actual)
     except Exception as ex:
         print('Expected:\n', look(expected), file=sys.stderr)
         print('  Actual:\n', look(actual), file=sys.stderr)
         raise ex
 
 
-def _eq_rows(expect, actual, cast=None):
-    '''test when values are equals for eacfh row and column'''
-    ie = iter(expect)
-    ia = iter(actual)
-    for re, ra in izip_longest(ie, ia, fillvalue=None):
-        if cast:
-            ra = cast(ra)
-        for ve, va in izip_longest(re, ra, fillvalue=None):
-            if isinstance(ve, list):
-                for je, ja in izip_longest(ve, va, fillvalue=None):
-                    _eq2(je, ja, re, ra)
-            elif not isinstance(ve, dict):
-                _eq2(ve, va, re, ra)
-
-
-def _eq2(ve, va, re, ra):
-    try:
-        eq_(ve, va)
-    except AssertionError as ea:
-        print('\nrow: ', re, ' != ', ra)
-        print('val: ', ve, ' != ', va)
-        raise ea
-
-
 def test_fromxml_entity():
     _DATA1 = """
         <tr><td>foo</td><td>bar</td></tr>