Cleanup re #992

- remove apparently vestigial bits
- remove Python 2.6 related bits
- use pytest.skip instead of custom skip

1 files changed, 1 insertions, 36 deletions

diff --git a/tests/__init__.py b/tests/__init__.py
index e767c090..7ded9f18 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,45 +1,10 @@
-# Copyright (C) 2017 Martin Packman <gzlist@googlemail.com>
-#
-# This file is part of paramiko.
-#
-# Paramiko is free software; you can redistribute it and/or modify it under the
-# terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation; either version 2.1 of the License, or (at your option)
-# any later version.
-#
-# Paramiko is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with Paramiko; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
-
 """Base classes and helpers for testing paramiko."""
 
 import functools
 import locale
 import os
-import unittest
-
-from paramiko.py3compat import (
-    builtins,
-    )
-
-
-skip = getattr(unittest, "skip", None)
-if skip is None:
-    def skip(reason):
-        """Stub skip decorator for Python 2.6 compatibility."""
-        return lambda func: None
-
 
-def skipUnlessBuiltin(name):
-    """Skip decorated test if builtin name does not exist."""
-    if getattr(builtins, name, None) is None:
-        return skip("No builtin " + repr(name))
-    return lambda func: func
+from pytest import skip
 
 
 # List of locales which have non-ascii characters in all categories.