From f7d5d25651ccd875f7fae479da8847c0b3c0c3ea Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Sun, 26 Nov 2017 14:32:35 -0800 Subject: [PATCH] Remove io.TextIOBase workaround for Python <= 2.5 io.TextIOBase is available on all Python versions supported by psycopg2. Can remove all workarounds. --- tests/test_copy.py | 5 +---- tests/testutils.py | 14 -------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/tests/test_copy.py b/tests/test_copy.py index 96623211..c5e79138 100755 --- a/tests/test_copy.py +++ b/tests/test_copy.py @@ -25,7 +25,7 @@ import sys import string from testutils import (unittest, ConnectingTestCase, decorate_all_tests, - skip_if_no_iobase, skip_before_postgres, slow) + skip_before_postgres, slow) from cStringIO import StringIO from itertools import cycle, izip from subprocess import Popen, PIPE @@ -131,7 +131,6 @@ class CopyTests(ConnectingTestCase): finally: curs.close() - @skip_if_no_iobase def test_copy_text(self): self.conn.set_client_encoding('latin1') self._create_temp_table() # the above call closed the xn @@ -154,7 +153,6 @@ class CopyTests(ConnectingTestCase): f.seek(0) self.assertEqual(f.readline().rstrip(), about) - @skip_if_no_iobase def test_copy_bytes(self): self.conn.set_client_encoding('latin1') self._create_temp_table() # the above call closed the xn @@ -176,7 +174,6 @@ class CopyTests(ConnectingTestCase): f.seek(0) self.assertEqual(f.readline().rstrip(), about) - @skip_if_no_iobase def test_copy_expert_textiobase(self): self.conn.set_client_encoding('latin1') self._create_temp_table() # the above call closed the xn diff --git a/tests/testutils.py b/tests/testutils.py index 5c192e30..bead6967 100644 --- a/tests/testutils.py +++ b/tests/testutils.py @@ -261,20 +261,6 @@ def skip_if_no_namedtuple(f): return skip_if_no_namedtuple_ -def skip_if_no_iobase(f): - """Skip a test if io.TextIOBase is not available.""" - @wraps(f) - def skip_if_no_iobase_(self): - try: - from io import TextIOBase # noqa - except ImportError: - return self.skipTest("io.TextIOBase not found.") - else: - return f(self) - - return skip_if_no_iobase_ - - def skip_before_postgres(*ver): """Skip a test on PostgreSQL before a certain version.""" ver = ver + (0,) * (3 - len(ver))