remove deprecation warnings

1 files changed, 615 insertions, 615 deletions

diff --git a/test/test-suite b/test/test-suite
index 49f2882..42c7a4c 100755
--- a/test/test-suite
+++ b/test/test-suite
@@ -242,7 +242,7 @@ class BasicTests(AbstractQTestCase):
         self.assertTrue(len(o) == 0)
         self.assertTrue(len(e) == 1)
 
-        self.assertEquals(e[0],six.b('Cannot decompress standard input. Pipe the input through zcat in order to decompress.'))
+        self.assertEqual(e[0],six.b('Cannot decompress standard input. Pipe the input through zcat in order to decompress.'))
 
         self.cleanup(tmpfile)
 
@@ -253,8 +253,8 @@ class BasicTests(AbstractQTestCase):
         retcode, o, e = run_command(cmd)
 
         self.assertNotEquals(retcode, 0)
-        self.assertEquals(len(o), 0)
-        self.assertEquals(len(e), 3)
+        self.assertEqual(len(o), 0)
+        self.assertEqual(len(e), 3)
 
         self.assertTrue(e[0].startswith(
             six.b("Warning: column count is one - did you provide the correct delimiter")))
@@ -269,11 +269,11 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d , "select c2 from %s where regexp(\'^1\',c2)"' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 0)
-        self.assertEquals(len(o), 1)
-        self.assertEquals(len(e), 0)
+        self.assertEqual(retcode, 0)
+        self.assertEqual(len(o), 1)
+        self.assertEqual(len(e), 0)
 
-        self.assertEquals(o[0],six.b("1"))
+        self.assertEqual(o[0],six.b("1"))
 
         self.cleanup(tmpfile)
 
@@ -283,11 +283,11 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d , "select count(*) from %s where regexp(\'^\',c2)"' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 0)
-        self.assertEquals(len(o), 1)
-        self.assertEquals(len(e), 0)
+        self.assertEqual(retcode, 0)
+        self.assertEqual(len(o), 1)
+        self.assertEqual(len(e), 0)
 
-        self.assertEquals(o[0],six.b("2"))
+        self.assertEqual(o[0],six.b("2"))
 
         self.cleanup(tmpfile)
 
@@ -297,11 +297,11 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d , "select c1 from %s"' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 0)
-        self.assertEquals(len(o), 3)
-        self.assertEquals(len(e), 0)
+        self.assertEqual(retcode, 0)
+        self.assertEqual(len(o), 3)
+        self.assertEqual(len(e), 0)
 
-        self.assertEquals(six.b(" ").join(o), six.b('a b c'))
+        self.assertEqual(six.b(" ").join(o), six.b('a b c'))
 
         self.cleanup(tmpfile)
 
@@ -311,12 +311,12 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -t "select c1,c2,c3 from %s"' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 0)
-        self.assertEquals(len(o), 3)
-        self.assertEquals(len(e), 0)
-        self.assertEquals(o[0], sample_data_rows[0].replace(six.b(","), six.b("\t")))
-        self.assertEquals(o[1], sample_data_rows[1].replace(six.b(","), six.b("\t")))
-        self.assertEquals(o[2], sample_data_rows[2].replace(six.b(","), six.b("\t")))
+        self.assertEqual(retcode, 0)
+        self.assertEqual(len(o), 3)
+        self.assertEqual(len(e), 0)
+        self.assertEqual(o[0], sample_data_rows[0].replace(six.b(","), six.b("\t")))
+        self.assertEqual(o[1], sample_data_rows[1].replace(six.b(","), six.b("\t")))
+        self.assertEqual(o[2], sample_data_rows[2].replace(six.b(","), six.b("\t")))
 
         self.cleanup(tmpfile)
 
@@ -326,12 +326,12 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -t -d , "select c1,c2,c3 from %s"' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 0)
-        self.assertEquals(len(o), 3)
-        self.assertEquals(len(e), 0)
-        self.assertEquals(o[0], sample_data_rows[0].replace(six.b(","), six.b("\t")))
-        self.assertEquals(o[1], sample_data_rows[1].replace(six.b(","), six.b("\t")))
-        self.assertEquals(o[2], sample_data_rows[2].replace(six.b(","), six.b("\t")))
+        self.assertEqual(retcode, 0)
+        self.assertEqual(len(o), 3)
+        self.assertEqual(len(e), 0)
+        self.assertEqual(o[0], sample_data_rows[0].replace(six.b(","), six.b("\t")))
+        self.assertEqual(o[1], sample_data_rows[1].replace(six.b(","), six.b("\t")))
+        self.assertEqual(o[2], sample_data_rows[2].replace(six.b(","), six.b("\t")))
 
         self.cleanup(tmpfile)
 
@@ -340,13 +340,13 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d , -D "|" "select c1,c2,c3 from %s"' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 0)
-        self.assertEquals(len(o), 3)
-        self.assertEquals(len(e), 0)
+        self.assertEqual(retcode, 0)
+        self.assertEqual(len(o), 3)
+        self.assertEqual(len(e), 0)
 
-        self.assertEquals(o[0], sample_data_rows[0].replace(six.b(","), six.b("|")))
-        self.assertEquals(o[1], sample_data_rows[1].replace(six.b(","), six.b("|")))
-        self.assertEquals(o[2], sample_data_rows[2].replace(six.b(","), six.b("|")))
+        self.assertEqual(o[0], sample_data_rows[0].replace(six.b(","), six.b("|")))
+        self.assertEqual(o[1], sample_data_rows[1].replace(six.b(","), six.b("|")))
+        self.assertEqual(o[2], sample_data_rows[2].replace(six.b(","), six.b("|")))
 
         self.cleanup(tmpfile)
 
@@ -355,13 +355,13 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d , -T "select c1,c2,c3 from %s"' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 0)
-        self.assertEquals(len(o), 3)
-        self.assertEquals(len(e), 0)
+        self.assertEqual(retcode, 0)
+        self.assertEqual(len(o), 3)
+        self.assertEqual(len(e), 0)
 
-        self.assertEquals(o[0], sample_data_rows[0].replace(six.b(","), six.b("\t")))
-        self.assertEquals(o[1], sample_data_rows[1].replace(six.b(","), six.b("\t")))
-        self.assertEquals(o[2], sample_data_rows[2].replace(six.b(","), six.b("\t")))
+        self.assertEqual(o[0], sample_data_rows[0].replace(six.b(","), six.b("\t")))
+        self.assertEqual(o[1], sample_data_rows[1].replace(six.b(","), six.b("\t")))
+        self.assertEqual(o[2], sample_data_rows[2].replace(six.b(","), six.b("\t")))
 
         self.cleanup(tmpfile)
 
@@ -370,13 +370,13 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d , -T -D "|" "select c1,c2,c3 from %s"' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 0)
-        self.assertEquals(len(o), 3)
-        self.assertEquals(len(e), 0)
+        self.assertEqual(retcode, 0)
+        self.assertEqual(len(o), 3)
+        self.assertEqual(len(e), 0)
 
-        self.assertEquals(o[0], sample_data_rows[0].replace(six.b(","), six.b("\t")))
-        self.assertEquals(o[1], sample_data_rows[1].replace(six.b(","), six.b("\t")))
-        self.assertEquals(o[2], sample_data_rows[2].replace(six.b(","), six.b("\t")))
+        self.assertEqual(o[0], sample_data_rows[0].replace(six.b(","), six.b("\t")))
+        self.assertEqual(o[1], sample_data_rows[1].replace(six.b(","), six.b("\t")))
+        self.assertEqual(o[2], sample_data_rows[2].replace(six.b(","), six.b("\t")))
 
         self.cleanup(tmpfile)
 
@@ -384,26 +384,26 @@ class BasicTests(AbstractQTestCase):
         cmd = six.b('printf "%s" | ../bin/q -d , "select c1,c2,c3 from -"') % sample_data_no_header
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 0)
-        self.assertEquals(len(o), 3)
-        self.assertEquals(len(e), 0)
+        self.assertEqual(retcode, 0)
+        self.assertEqual(len(o), 3)
+        self.assertEqual(len(e), 0)
 
-        self.assertEquals(o[0], sample_data_rows[0])
-        self.assertEquals(o[1], sample_data_rows[1])
-        self.assertEquals(o[2], sample_data_rows[2])
+        self.assertEqual(o[0], sample_data_rows[0])
+        self.assertEqual(o[1], sample_data_rows[1])
+        self.assertEqual(o[2], sample_data_rows[2])
 
     def test_column_separation(self):
         tmpfile = self.create_file_with_data(sample_data_no_header)
         cmd = '../bin/q -d , "select c1,c2,c3 from %s"' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 0)
-        self.assertEquals(len(o), 3)
-        self.assertEquals(len(e), 0)
+        self.assertEqual(retcode, 0)
+        self.assertEqual(len(o), 3)
+        self.assertEqual(len(e), 0)
 
-        self.assertEquals(o[0], sample_data_rows[0])
-        self.assertEquals(o[1], sample_data_rows[1])
-        self.assertEquals(o[2], sample_data_rows[2])
+        self.assertEqual(o[0], sample_data_rows[0])
+        self.assertEqual(o[1], sample_data_rows[1])
+        self.assertEqual(o[2], sample_data_rows[2])
 
         self.cleanup(tmpfile)
 
@@ -413,11 +413,11 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d , "select c1 from %s" -A' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 0)
-        self.assertEquals(o[0], six.b('Table for file: %s' % tmpfile.name))
-        self.assertEquals(o[1].strip(), six.b('`c1` - text'))
-        self.assertEquals(o[2].strip(), six.b('`c2` - int'))
-        self.assertEquals(o[3].strip(), six.b('`c3` - int'))
+        self.assertEqual(retcode, 0)
+        self.assertEqual(o[0], six.b('Table for file: %s' % tmpfile.name))
+        self.assertEqual(o[1].strip(), six.b('`c1` - text'))
+        self.assertEqual(o[2].strip(), six.b('`c2` - int'))
+        self.assertEqual(o[3].strip(), six.b('`c3` - int'))
 
         self.cleanup(tmpfile)
 
@@ -427,11 +427,11 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d , "select c1 from %s" -A' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 0)
-        self.assertEquals(o[0], six.b('Table for file: %s' % tmpfile.name))
-        self.assertEquals(o[1].strip(), six.b('`c1` - text'))
-        self.assertEquals(o[2].strip(), six.b('`c2` - int'))
-        self.assertEquals(o[3].strip(), six.b('`c3` - int'))
+        self.assertEqual(retcode, 0)
+        self.assertEqual(o[0], six.b('Table for file: %s' % tmpfile.name))
+        self.assertEqual(o[1].strip(), six.b('`c1` - text'))
+        self.assertEqual(o[2].strip(), six.b('`c2` - int'))
+        self.assertEqual(o[3].strip(), six.b('`c3` - int'))
 
     def test_header_exception_on_numeric_header_data(self):
         tmpfile = self.create_file_with_data(sample_data_no_header)
@@ -439,8 +439,8 @@ class BasicTests(AbstractQTestCase):
         retcode, o, e = run_command(cmd)
 
         self.assertNotEquals(retcode, 0)
-        self.assertEquals(len(o), 0)
-        self.assertEquals(len(e), 3)
+        self.assertEqual(len(o), 0)
+        self.assertEqual(len(e), 3)
         self.assertTrue(
             six.b('Bad header row: Header must contain only strings') in e[0])
         self.assertTrue(six.b("Column name must be a string") in e[1])
@@ -454,13 +454,13 @@ class BasicTests(AbstractQTestCase):
         retcode, o, e = run_command(cmd)
 
         self.assertNotEquals(retcode, 0)
-        self.assertEquals(len(o),4)
-        self.assertEquals(len(e),2)
-        self.assertEquals(o[0], six.b('Table for file: %s' % tmpfile.name))
-        self.assertEquals(o[1].strip(), six.b('`name` - text'))
-        self.assertEquals(o[2].strip(), six.b('`value1` - int'))
-        self.assertEquals(o[3].strip(), six.b('`value2` - int'))
-        self.assertEquals(e[0].strip(),six.b('query error: no such column: c1'))
+        self.assertEqual(len(o),4)
+        self.assertEqual(len(e),2)
+        self.assertEqual(o[0], six.b('Table for file: %s' % tmpfile.name))
+        self.assertEqual(o[1].strip(), six.b('`name` - text'))
+        self.assertEqual(o[2].strip(), six.b('`value1` - int'))
+        self.assertEqual(o[3].strip(), six.b('`value2` - int'))
+        self.assertEqual(e[0].strip(),six.b('query error: no such column: c1'))
         self.assertTrue(e[1].startswith(six.b('Warning - There seems to be a ')))
 
         self.cleanup(tmpfile)
@@ -470,9 +470,9 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d , "select name from %s" -H' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 0)
-        self.assertEquals(len(o), 3)
-        self.assertEquals(six.b(" ").join(o), six.b("a b c"))
+        self.assertEqual(retcode, 0)
+        self.assertEqual(len(o), 3)
+        self.assertEqual(six.b(" ").join(o), six.b("a b c"))
 
         self.cleanup(tmpfile)
 
@@ -481,12 +481,12 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d , "select name from %s" -H -O' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 0)
-        self.assertEquals(len(o), 4)
-        self.assertEquals(o[0],six.b('name'))
-        self.assertEquals(o[1],six.b('a'))
-        self.assertEquals(o[2],six.b('b'))
-        self.assertEquals(o[3],six.b('c'))
+        self.assertEqual(retcode, 0)
+        self.assertEqual(len(o), 4)
+        self.assertEqual(o[0],six.b('name'))
+        self.assertEqual(o[1],six.b('a'))
+        self.assertEqual(o[2],six.b('b'))
+        self.assertEqual(o[3],six.b('c'))
 
         self.cleanup(tmpfile)
 
@@ -497,10 +497,10 @@ class BasicTests(AbstractQTestCase):
         retcode, o, e = run_command(cmd)
 
         self.assertNotEquals(retcode, 0)
-        self.assertEquals(len(o), 0)
-        self.assertEquals(len(e), 2)
+        self.assertEqual(len(o), 0)
+        self.assertEqual(len(e), 2)
         self.assertTrue(six.b('no such column: c3') in e[0])
-        self.assertEquals(
+        self.assertEqual(
             e[1], six.b('Warning - There seems to be a "no such column" error, and -H (header line) exists. Please make sure that you are using the column names from the header line and not the default (cXX) column names'))
 
         self.cleanup(tmpfile)
@@ -510,16 +510,16 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d , "select c1 from %s" -A' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 0)
-        self.assertEquals(len(o), 4)
-        self.assertEquals(len(e), 1)
+        self.assertEqual(retcode, 0)
+        self.assertEqual(len(o), 4)
+        self.assertEqual(len(e), 1)
 
-        self.assertEquals(o[0], six.b('Table for file: %s' % tmpfile.name))
-        self.assertEquals(o[1].strip(), six.b('`c1` - text'))
-        self.assertEquals(o[2].strip(), six.b('`c2` - text'))
-        self.assertEquals(o[3].strip(), six.b('`c3` - text'))
+        self.assertEqual(o[0], six.b('Table for file: %s' % tmpfile.name))
+        self.assertEqual(o[1].strip(), six.b('`c1` - text'))
+        self.assertEqual(o[2].strip(), six.b('`c2` - text'))
+        self.assertEqual(o[3].strip(), six.b('`c3` - text'))
 
-        self.assertEquals(
+        self.assertEqual(
             e[0], six.b('Warning - There seems to be header line in the file, but -H has not been specified. All fields will be detected as text fields, and the header line will appear as part of the data'))
 
         self.cleanup(tmpfile)
@@ -529,9 +529,9 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d , "select c1 from %s"' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 0)
-        self.assertEquals(len(o), 0)
-        self.assertEquals(len(e), 1)
+        self.assertEqual(retcode, 0)
+        self.assertEqual(len(o), 0)
+        self.assertEqual(len(e), 1)
 
         self.assertTrue(six.b('Warning - data is empty') in e[0])
 
@@ -543,8 +543,8 @@ class BasicTests(AbstractQTestCase):
         retcode, o, e = run_command(cmd)
 
         self.assertNotEquals(retcode, 0)
-        self.assertEquals(len(o), 0)
-        self.assertEquals(len(e), 1)
+        self.assertEqual(len(o), 0)
+        self.assertEqual(len(e), 1)
 
         m = six.b("Header line is expected but missing in file %s" % tmpfile.name)
         self.assertTrue(m in e[0])
@@ -556,11 +556,11 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d , "select c2 from %s"' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 0)
-        self.assertEquals(len(o), 1)
-        self.assertEquals(len(e), 0)
+        self.assertEqual(retcode, 0)
+        self.assertEqual(len(o), 1)
+        self.assertEqual(len(e), 0)
 
-        self.assertEquals(o[0], six.b('value1'))
+        self.assertEqual(o[0], six.b('value1'))
 
         self.cleanup(tmpfile)
 
@@ -569,9 +569,9 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d , "select c2 from %s" -H' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 0)
-        self.assertEquals(len(o), 0)
-        self.assertEquals(len(e), 1)
+        self.assertEqual(retcode, 0)
+        self.assertEqual(len(o), 0)
+        self.assertEqual(len(e), 1)
 
         self.assertTrue(six.b('Warning - data is empty') in e[0])
 
@@ -582,13 +582,13 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d , "select c1 from %s"' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 0)
-        self.assertEquals(len(e), 0)
-        self.assertEquals(len(o), 3)
+        self.assertEqual(retcode, 0)
+        self.assertEqual(len(e), 0)
+        self.assertEqual(len(o), 3)
 
-        self.assertEquals(o[0], six.b('a'))
-        self.assertEquals(o[1], six.b('b'))
-        self.assertEquals(o[2], six.b('c'))
+        self.assertEqual(o[0], six.b('a'))
+        self.assertEqual(o[1], six.b('b'))
+        self.assertEqual(o[2], six.b('c'))
 
         self.cleanup(tmpfile)
 
@@ -597,13 +597,13 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d , "select c1 from %s" -k' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 0)
-        self.assertEquals(len(e), 0)
-        self.assertEquals(len(o), 3)
+        self.assertEqual(retcode, 0)
+        self.assertEqual(len(e), 0)
+        self.assertEqual(len(o), 3)
 
-        self.assertEquals(o[0], six.b('a'))
-        self.assertEquals(o[1], six.b('   b'))
-        self.assertEquals(o[2], six.b('c'))
+        self.assertEqual(o[0], six.b('a'))
+        self.assertEqual(o[1], six.b('   b'))
+        self.assertEqual(o[2], six.b('c'))
 
         self.cleanup(tmpfile)
 
@@ -612,14 +612,14 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d , "select c2 from %s" -k -A' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 0)
-        self.assertEquals(len(e), 0)
-        self.assertEquals(len(o), 4)
+        self.assertEqual(retcode, 0)
+        self.assertEqual(len(e), 0)
+        self.assertEqual(len(o), 4)
 
-        self.assertEquals(o[0], six.b('Table for file: %s' % tmpfile.name))
-        self.assertEquals(o[1].strip(), six.b('`c1` - text'))
-        self.assertEquals(o[2].strip(), six.b('`c2` - int'))
-        self.assertEquals(o[3].strip(), six.b('`c3` - int'))
+        self.assertEqual(o[0], six.b('Table for file: %s' % tmpfile.name))
+        self.assertEqual(o[1].strip(), six.b('`c1` - text'))
+        self.assertEqual(o[2].strip(), six.b('`c2` - int'))
+        self.assertEqual(o[3].strip(), six.b('`c3` - int'))
 
         self.cleanup(tmpfile)
 
@@ -629,13 +629,13 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d , "select name,\`value 1\` from %s" -H' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 0)
-        self.assertEquals(len(e), 0)
-        self.assertEquals(len(o), 3)
+        self.assertEqual(retcode, 0)
+        self.assertEqual(len(e), 0)
+        self.assertEqual(len(o), 3)
 
-        self.assertEquals(o[0], six.b('a,1'))
-        self.assertEquals(o[1], six.b('b,2'))
-        self.assertEquals(o[2], six.b('c,'))
+        self.assertEqual(o[0], six.b('a,1'))
+        self.assertEqual(o[1], six.b('b,2'))
+        self.assertEqual(o[2], six.b('c,'))
 
         self.cleanup(tmpfile)
 
@@ -645,14 +645,14 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d , "select name,\`value 1\` from %s" -H -A' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 0)
-        self.assertEquals(len(e), 0)
-        self.assertEquals(len(o), 4)
+        self.assertEqual(retcode, 0)
+        self.assertEqual(len(e), 0)
+        self.assertEqual(len(o), 4)
 
-        self.assertEquals(o[0], six.b('Table for file: %s' % tmpfile.name))
-        self.assertEquals(o[1].strip(), six.b('`name` - text'))
-        self.assertEquals(o[2].strip(), six.b('`value 1` - int'))
-        self.assertEquals(o[3].strip(), six.b('`value2` - int'))
+        self.assertEqual(o[0], six.b('Table for file: %s' % tmpfile.name))
+        self.assertEqual(o[1].strip(), six.b('`name` - text'))
+        self.assertEqual(o[2].strip(), six.b('`value 1` - int'))
+        self.assertEqual(o[3].strip(), six.b('`value2` - int'))
 
         self.cleanup(tmpfile)
 
@@ -660,64 +660,64 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d , ""'
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 1)
-        self.assertEquals(len(e), 1)
-        self.assertEquals(len(o), 0)
+        self.assertEqual(retcode, 1)
+        self.assertEqual(len(e), 1)
+        self.assertEqual(len(o), 0)
 
-        self.assertEquals(e[0],six.b('Query cannot be empty (query number 1)'))
+        self.assertEqual(e[0],six.b('Query cannot be empty (query number 1)'))
 
     def test_empty_query_in_command_line(self):
         cmd = '../bin/q -d , "  "'
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 1)
-        self.assertEquals(len(e), 1)
-        self.assertEquals(len(o), 0)
+        self.assertEqual(retcode, 1)
+        self.assertEqual(len(e), 1)
+        self.assertEqual(len(o), 0)
 
-        self.assertEquals(e[0],six.b('Query cannot be empty (query number 1)'))
+        self.assertEqual(e[0],six.b('Query cannot be empty (query number 1)'))
 
     def test_failure_in_query_stops_processing_queries(self):
         cmd = '../bin/q -d , "select 500" "select 300" "wrong-query" "select 8000"'
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 1)
-        self.assertEquals(len(e), 1)
-        self.assertEquals(len(o), 2)
-        self.assertEquals(o[0],six.b('500'))
-        self.assertEquals(o[1],six.b('300'))
+        self.assertEqual(retcode, 1)
+        self.assertEqual(len(e), 1)
+        self.assertEqual(len(o), 2)
+        self.assertEqual(o[0],six.b('500'))
+        self.assertEqual(o[1],six.b('300'))
 
     def test_multiple_queries_in_command_line(self):
         cmd = '../bin/q -d , "select 500" "select 300+100" "select 300" "select 200"'
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 0)
-        self.assertEquals(len(e), 0)
-        self.assertEquals(len(o), 4)
+        self.assertEqual(retcode, 0)
+        self.assertEqual(len(e), 0)
+        self.assertEqual(len(o), 4)
 
-        self.assertEquals(o[0],six.b('500'))
-        self.assertEquals(o[1],six.b('400'))
-        self.assertEquals(o[2],six.b('300'))
-        self.assertEquals(o[3],six.b('200'))
+        self.assertEqual(o[0],six.b('500'))
+        self.assertEqual(o[1],six.b('400'))
+        self.assertEqual(o[2],six.b('300'))
+        self.assertEqual(o[3],six.b('200'))
 
     def test_literal_calculation_query(self):
         cmd = '../bin/q -d , "select 1+40/6"'
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 0)
-        self.assertEquals(len(e), 0)
-        self.assertEquals(len(o), 1)
+        self.assertEqual(retcode, 0)
+        self.assertEqual(len(e), 0)
+        self.assertEqual(len(o), 1)
 
-        self.assertEquals(o[0],six.b('7'))
+        self.assertEqual(o[0],six.b('7'))
 
     def test_literal_calculation_query_float_result(self):
         cmd = '../bin/q -d , "select 1+40/6.0"'
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 0)
-        self.assertEquals(len(e), 0)
-        self.assertEquals(len(o), 1)
+        self.assertEqual(retcode, 0)
+        self.assertEqual(len(e), 0)
+        self.assertEqual(len(o), 1)
 
-        self.assertEquals(o[0],six.b('7.666666666666667'))
+        self.assertEqual(o[0],six.b('7.666666666666667'))
 
     def test_use_query_file(self):
         tmp_data_file = self.create_file_with_data(sample_data_with_header)
@@ -726,13 +726,13 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d , -q %s -H' % tmp_query_file.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 0)
-        self.assertEquals(len(e), 0)
-        self.assertEquals(len(o), 3)
+        self.assertEqual(retcode, 0)
+        self.assertEqual(len(e), 0)
+        self.assertEqual(len(o), 3)
 
-        self.assertEquals(o[0], six.b('a'))
-        self.assertEquals(o[1], six.b('b'))
-        self.assertEquals(o[2], six.b('c'))
+        self.assertEqual(o[0], six.b('a'))
+        self.assertEqual(o[1], six.b('b'))
+        self.assertEqual(o[2], six.b('c'))
 
         self.cleanup(tmp_data_file)
         self.cleanup(tmp_query_file)
@@ -744,9 +744,9 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d , -q %s -H -Q ascii' % tmp_query_file.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode,3)
-        self.assertEquals(len(o),0)
-        self.assertEquals(len(e),1)
+        self.assertEqual(retcode,3)
+        self.assertEqual(len(o),0)
+        self.assertEqual(len(e),1)
 
         self.assertTrue(e[0].startswith(six.b('Could not decode query number 1 using the provided query encoding (ascii)')))
 
@@ -760,14 +760,14 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d , -q %s -H -Q utf-8 -O' % tmp_query_file.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode,0)
-        self.assertEquals(len(o),4)
-        self.assertEquals(len(e),0)
+        self.assertEqual(retcode,0)
+        self.assertEqual(len(o),4)
+        self.assertEqual(len(e),0)
 
-        self.assertEquals(o[0].decode(SYSTEM_ENCODING), u'name,Hr\xe1\u010d')
-        self.assertEquals(o[1].decode(SYSTEM_ENCODING), u'a,Hr\xe1\u010d')
-        self.assertEquals(o[2].decode(SYSTEM_ENCODING), u'b,Hr\xe1\u010d')
-        self.assertEquals(o[3].decode(SYSTEM_ENCODING), u'c,Hr\xe1\u010d')
+        self.assertEqual(o[0].decode(SYSTEM_ENCODING), u'name,Hr\xe1\u010d')
+        self.assertEqual(o[1].decode(SYSTEM_ENCODING), u'a,Hr\xe1\u010d')
+        self.assertEqual(o[2].decode(SYSTEM_ENCODING), u'b,Hr\xe1\u010d')
+        self.assertEqual(o[3].decode(SYSTEM_ENCODING), u'c,Hr\xe1\u010d')
 
         self.cleanup(tmp_data_file)
         self.cleanup(tmp_query_file)
@@ -779,13 +779,13 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d , -q %s -H -Q utf-8' % tmp_query_file.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 0)
-        self.assertEquals(len(e), 0)
-        self.assertEquals(len(o), 3)
+        self.assertEqual(retcode, 0)
+        self.assertEqual(len(e), 0)
+        self.assertEqual(len(o), 3)
 
-        self.assertEquals(o[0].decode(SYSTEM_ENCODING), u'a,Hr\xe1\u010d')
-        self.assertEquals(o[1].decode(SYSTEM_ENCODING), u'b,Hr\xe1\u010d')
-        self.assertEquals(o[2].decode(SYSTEM_ENCODING), u'c,Hr\xe1\u010d')
+        self.assertEqual(o[0].decode(SYSTEM_ENCODING), u'a,Hr\xe1\u010d')
+        self.assertEqual(o[1].decode(SYSTEM_ENCODING), u'b,Hr\xe1\u010d')
+        self.assertEqual(o[2].decode(SYSTEM_ENCODING), u'c,Hr\xe1\u010d')
 
         self.cleanup(tmp_data_file)
         self.cleanup(tmp_query_file)
@@ -797,9 +797,9 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d , -q %s -H "select * from ppp"' % tmp_query_file.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 1)
-        self.assertEquals(len(e), 1)
-        self.assertEquals(len(o), 0)
+        self.assertEqual(retcode, 1)
+        self.assertEqual(len(e), 1)
+        self.assertEqual(len(o), 0)
 
         self.assertTrue(e[0].startswith(six.b("Can't provide both a query file and a query on the command line")))
 
@@ -814,13 +814,13 @@ class BasicTests(AbstractQTestCase):
             cmd = '../bin/q -d , -q %s -H -Q utf-8 -E %s' % (tmp_query_file.name,target_encoding)
             retcode, o, e = run_command(cmd)
 
-            self.assertEquals(retcode, 0)
-            self.assertEquals(len(e), 0)
-            self.assertEquals(len(o), 3)
+            self.assertEqual(retcode, 0)
+            self.assertEqual(len(e), 0)
+            self.assertEqual(len(o), 3)
 
-            self.assertEquals(o[0].decode(target_encoding), u'Hr\xe1\u010d')
-            self.assertEquals(o[1].decode(target_encoding), u'Hr\xe1\u010d')
-            self.assertEquals(o[2].decode(target_encoding), u'Hr\xe1\u010d')
+            self.assertEqual(o[0].decode(target_encoding), u'Hr\xe1\u010d')
+            self.assertEqual(o[1].decode(target_encoding), u'Hr\xe1\u010d')
+            self.assertEqual(o[2].decode(target_encoding), u'Hr\xe1\u010d')
 
         self.cleanup(tmp_data_file)
         self.cleanup(tmp_query_file)
@@ -832,9 +832,9 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d , -q %s -H -Q utf-8 -E ascii' % tmp_query_file.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 3)
-        self.assertEquals(len(e), 1)
-        self.assertEquals(len(o), 0)
+        self.assertEqual(retcode, 3)
+        self.assertEqual(len(e), 1)
+        self.assertEqual(len(o), 0)
 
         self.assertTrue(e[0].startswith(six.b('Cannot encode data')))
 
@@ -848,9 +848,9 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d , -q %s -H' % tmp_query_file.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 1)
-        self.assertEquals(len(e), 1)
-        self.assertEquals(len(o), 0)
+        self.assertEqual(retcode, 1)
+        self.assertEqual(len(e), 1)
+        self.assertEqual(len(o), 0)
 
         self.assertTrue(e[0].startswith(six.b("Query cannot be empty")))
 
@@ -860,9 +860,9 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d , -q non-existent-query-file -H'
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode, 1)
-        self.assertEquals(len(e), 1)
-        self.assertEquals(len(o), 0)
+        self.assertEqual(retcode, 1)
+        self.assertEqual(len(e), 1)
+        self.assertEqual(len(o), 0)
 
         self.assertTrue(e[0].startswith(six.b("Could not read query from file")))
 
@@ -873,9 +873,9 @@ class BasicTests(AbstractQTestCase):
         retcode, o, e = run_command(cmd)
 
 
-        self.assertEquals(retcode,0)
-        self.assertEquals(len(e),0)
-        self.assertEquals(len(o),4)
+        self.assertEqual(retcode,0)
+        self.assertEqual(len(e),0)
+        self.assertEqual(len(o),4)
 
         self.assertTrue(o[0],'non_quoted')
         self.assertTrue(o[1],'control-value-1')
@@ -890,9 +890,9 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d " " "select c2 from %s"' % tmp_data_file.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode,0)
-        self.assertEquals(len(e),0)
-        self.assertEquals(len(o),4)
+        self.assertEqual(retcode,0)
+        self.assertEqual(len(e),0)
+        self.assertEqual(len(o),4)
 
         self.assertTrue(o[0],'regular_double_quoted')
         self.assertTrue(o[1],'control-value-2')
@@ -907,9 +907,9 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d " " "select c3 from %s"' % tmp_data_file.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode,0)
-        self.assertEquals(len(e),0)
-        self.assertEquals(len(o),4)
+        self.assertEqual(retcode,0)
+        self.assertEqual(len(e),0)
+        self.assertEqual(len(o),4)
 
         self.assertTrue(o[0],'double_double_quoted')
         self.assertTrue(o[1],'control-value-3')
@@ -924,9 +924,9 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d " " "select c4 from %s"' % tmp_data_file.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode,0)
-        self.assertEquals(len(e),0)
-        self.assertEquals(len(o),4)
+        self.assertEqual(retcode,0)
+        self.assertEqual(len(e),0)
+        self.assertEqual(len(o),4)
 
         self.assertTrue(o[0],'escaped_double_quoted')
         self.assertTrue(o[1],'control-value-4')
@@ -941,12 +941,12 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d " " -m relaxed -D , -w none -W none "select * from %s"' % tmp_data_file.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode,0)
-        self.assertEquals(len(e),0)
-        self.assertEquals(len(o),2)
+        self.assertEqual(retcode,0)
+        self.assertEqual(len(e),0)
+        self.assertEqual(len(o),2)
 
-        self.assertEquals(o[0],six.b('"quoted,data",23'))
-        self.assertEquals(o[1],six.b('unquoted-data,54,'))
+        self.assertEqual(o[0],six.b('"quoted,data",23'))
+        self.assertEqual(o[1],six.b('unquoted-data,54,'))
 
         self.cleanup(tmp_data_file)
 
@@ -957,8 +957,8 @@ class BasicTests(AbstractQTestCase):
         retcode, o, e = run_command(cmd)
 
         self.assertNotEquals(retcode,0)
-        self.assertEquals(len(e),1)
-        self.assertEquals(len(o),0)
+        self.assertEqual(len(e),1)
+        self.assertEqual(len(o),0)
 
         self.assertTrue(e[0].startswith(six.b('Strict mode. Column Count is expected to identical')))
 
@@ -970,12 +970,12 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d " " -D , -w minimal "select * from %s"' % tmp_data_file.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode,0)
-        self.assertEquals(len(e),0)
-        self.assertEquals(len(o),2)
+        self.assertEqual(retcode,0)
+        self.assertEqual(len(e),0)
+        self.assertEqual(len(o),2)
 
-        self.assertEquals(o[0],six.b('quoted data,23'))
-        self.assertEquals(o[1],six.b('unquoted-data,54'))
+        self.assertEqual(o[0],six.b('quoted data,23'))
+        self.assertEqual(o[1],six.b('unquoted-data,54'))
 
         self.cleanup(tmp_data_file)
 
@@ -985,12 +985,12 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d " " -D , -w all "select * from %s"' % tmp_data_file.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode,0)
-        self.assertEquals(len(e),0)
-        self.assertEquals(len(o),2)
+        self.assertEqual(retcode,0)
+        self.assertEqual(len(e),0)
+        self.assertEqual(len(o),2)
 
-        self.assertEquals(o[0],six.b('quoted data,23'))
-        self.assertEquals(o[1],six.b('unquoted-data,54'))
+        self.assertEqual(o[0],six.b('quoted data,23'))
+        self.assertEqual(o[1],six.b('unquoted-data,54'))
 
         self.cleanup(tmp_data_file)
 
@@ -1001,8 +1001,8 @@ class BasicTests(AbstractQTestCase):
         retcode, o, e = run_command(cmd)
 
         self.assertNotEquals(retcode,0)
-        self.assertEquals(len(e),1)
-        self.assertEquals(len(o),0)
+        self.assertEqual(len(e),1)
+        self.assertEqual(len(o),0)
 
         self.assertTrue(e[0].startswith(six.b('Input quoting mode can only be one of all,minimal,none')))
         self.assertTrue(six.b('unknown_wrapping_mode') in e[0])
@@ -1015,12 +1015,12 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d " " -D , -w all -W none "select * from %s"' % tmp_data_file.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode,0)
-        self.assertEquals(len(e),0)
-        self.assertEquals(len(o),2)
+        self.assertEqual(retcode,0)
+        self.assertEqual(len(e),0)
+        self.assertEqual(len(o),2)
 
-        self.assertEquals(o[0],six.b('quoted data,23'))
-        self.assertEquals(o[1],six.b('unquoted-data,54'))
+        self.assertEqual(o[0],six.b('quoted data,23'))
+        self.assertEqual(o[1],six.b('unquoted-data,54'))
 
         self.cleanup(tmp_data_file)
 
@@ -1030,12 +1030,12 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d " " -D , -w all -W minimal "select * from %s"' % tmp_data_file.name
         retcode, o, e = run_command(cmd)
 
-        self.assertEquals(retcode,0)
-        self.assertEquals(len(e),0)
-        self.assertEquals(len(o),2)
+        self.assertEqual(retcode,0)
+        self.assertEqual(len(e),0)
+        self.assertEqual(len(o),2)
 
-        self.assertEquals(o[0],six.b('quoted data,23'))
-        self.assertEquals(o[1],six.b('unquoted-data,54'))
+        self.assertEqual(o[0],six.b('quoted data,23'))
+        self.assertEqual(o[1],six.b('unquoted-data,54'))
 
         self.cleanup(tmp_data_file)
 
@@ -1046,12 +1046,12 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d " " -D " " -w all -W minimal "select * from %s"' % tmp_data_file.name
         retcode, o, e = run_command(cmd)