Drop tests._compat module entirely

pythonnet · lostmsu · Jun 20, 2020 · Jun 14, 2020 · Jun 14, 2020 · Jun 14, 2020
commit cc4211c27af7bf79f8f457f2430b8688ac03c52e
diff --git a/src/tests/_compat.py b/src/tests/_compat.py
diff --git a/src/tests/stress.py b/src/tests/stress.py
@@ -17,7 +17,7 @@
 import threading
 import time
 
-from ._compat import thread
+import _thread as thread
 from .utils import dprint
 
 

diff --git a/src/tests/test_class.py b/src/tests/test_class.py
@@ -7,7 +7,7 @@
 import System
 import pytest
 
-from ._compat import DictProxyType
+from .utils import DictProxyType
 
 
 def test_basic_reference_type():

diff --git a/src/tests/test_delegate.py b/src/tests/test_delegate.py
@@ -8,8 +8,7 @@
 import pytest
 from Python.Test import DelegateTest, StringDelegate
 
-from ._compat import DictProxyType
-from .utils import HelloClass, hello_func, MultipleHandler
+from .utils import HelloClass, hello_func, MultipleHandler, DictProxyType
 
 
 def test_delegate_standard_attrs():

diff --git a/src/tests/test_enum.py b/src/tests/test_enum.py
@@ -5,7 +5,7 @@
 import pytest
 import Python.Test as Test
 
-from ._compat import DictProxyType
+from .utils import DictProxyType
 
 
 def test_enum_standard_attrs():

diff --git a/src/tests/test_exceptions.py b/src/tests/test_exceptions.py
@@ -277,7 +277,6 @@ def test_python_compat_of_managed_exceptions():
 
     e = OverflowException(msg)
     assert str(e) == msg
-    assert str(e) == msg
 
     assert e.args == (msg,)
     assert isinstance(e.args, tuple)

diff --git a/src/tests/test_interface.py b/src/tests/test_interface.py
@@ -5,7 +5,7 @@
 import Python.Test as Test
 import pytest
 
-from ._compat import DictProxyType
+from .utils import DictProxyType
 
 
 def test_interface_standard_attrs():

diff --git a/src/tests/test_sysargv.py b/src/tests/test_sysargv.py
@@ -1,10 +1,7 @@
-# -*- coding: utf-8 -*-
-
 """Test sys.argv state."""
 
 import sys
-
-from ._compat import check_output
+from subprocess import check_output
 
 
 def test_sys_argv_state(filepath):
@@ -14,5 +11,5 @@ def test_sys_argv_state(filepath):
 
     script = filepath("argv-fixture.py")
     out = check_output([sys.executable, script, "foo", "bar"])
-    assert "foo" in out
-    assert "bar" in out
+    assert b"foo" in out
+    assert b"bar" in out
diff --git a/src/tests/test_thread.py b/src/tests/test_thread.py
@@ -5,7 +5,7 @@
 import threading
 import time
 
-from ._compat import thread
+import _thread as thread
 from .utils import dprint
 
 

diff --git a/src/tests/tests.pyproj b/src/tests/tests.pyproj
@@ -28,7 +28,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="__init__.py" />
-    <Compile Include="_compat.py" />
     <Compile Include="_missing_import.py" />
     <Compile Include="leaktest.py" />
     <Compile Include="profile.py" />

diff --git a/src/tests/utils.py b/src/tests/utils.py
@@ -5,7 +5,8 @@
 Refactor utility functions and classes
 """
 
-from __future__ import print_function
+DictProxyType = type(object.__dict__)
+
 
 def dprint(msg):
     # Debugging helper to trace thread-related tests.