From 53c1c5dcc1da6aa36ee9f53c5276739053b85897 Mon Sep 17 00:00:00 2001 From: Hugo Date: Tue, 28 Nov 2017 10:22:02 +0200 Subject: [PATCH] Remove redundant hasattr checks --- setup.py | 3 +-- tests/testutils.py | 33 ++------------------------------- 2 files changed, 3 insertions(+), 33 deletions(-) diff --git a/setup.py b/setup.py index f010ef5b..efcf81d8 100644 --- a/setup.py +++ b/setup.py @@ -214,8 +214,7 @@ or with the pg_config option in 'setup.cfg'. # Support unicode paths, if this version of Python provides the # necessary infrastructure: - if sys.version_info[0] < 3 \ - and hasattr(sys, 'getfilesystemencoding'): + if sys.version_info[0] < 3: pg_config_path = pg_config_path.encode( sys.getfilesystemencoding()) diff --git a/tests/testutils.py b/tests/testutils.py index ba31e3b0..03401891 100644 --- a/tests/testutils.py +++ b/tests/testutils.py @@ -32,37 +32,8 @@ from functools import wraps from testconfig import dsn, repl_dsn -if hasattr(unittest, 'skipIf'): - skip = unittest.skip - skipIf = unittest.skipIf - -else: - import warnings - - def skipIf(cond, msg): - def skipIf_(f): - @wraps(f) - def skipIf__(self): - if cond: - with warnings.catch_warnings(): - warnings.simplefilter('always', UserWarning) - warnings.warn(msg) - return - else: - return f(self) - return skipIf__ - return skipIf_ - - def skip(msg): - return skipIf(True, msg) - - def skipTest(self, msg): - with warnings.catch_warnings(): - warnings.simplefilter('always', UserWarning) - warnings.warn(msg) - return - - unittest.TestCase.skipTest = skipTest +skip = unittest.skip +skipIf = unittest.skipIf # Silence warnings caused by the stubbornness of the Python unittest # maintainers