Remove support for old python (#104)

itziakos · web-flow · commit 8fc870153cb5 · 2022-01-22T14:37:27.000Z
* Remove tox since it is not really used anymore for development
* Move compatibility code for old Python versions
* Add missing test dependency
* remove compat module from tests folder
* Add name for the checkout step
* Remove __future__ imports
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,7 +14,8 @@ jobs:
         os: [windows-2019]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v2
+    - name: Checkout repository
+      uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
       with:
diff --git a/setup.py b/setup.py
@@ -19,15 +19,8 @@
     packages=find_packages(),
     license="BSD",
     classifiers=[
-        "Programming Language :: Python :: 2.6",
-        "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3.2",
-        "Programming Language :: Python :: 3.3",
-        "Programming Language :: Python :: 3.4",
-        "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
     ],
     zip_safe=False,
-    test_suite='win32ctypes.tests',
-)
+    test_suite='win32ctypes.tests')
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -2,5 +2,4 @@ coverage
 haas
 --only-binary pywin32
 --only-binary pypiwin32
-pypiwin32 < 220; python_version == '3.3' or python_version == '3.4'
-pywin32; python_version == '2.7' or python_version > '3.4'
+pywin32
diff --git a/win32ctypes/core/__init__.py b/win32ctypes/core/__init__.py
@@ -5,8 +5,6 @@
 # This file is open source software distributed according to the terms in
 # LICENSE.txt
 #
-from __future__ import absolute_import
-
 import sys
 import importlib
 
diff --git a/win32ctypes/core/cffi/_authentication.py b/win32ctypes/core/cffi/_authentication.py
@@ -5,8 +5,6 @@
 # This file is open source software distributed according to the terms in
 # LICENSE.txt
 #
-from __future__ import absolute_import
-
 from weakref import WeakKeyDictionary
 
 from win32ctypes.core.compat import is_text
diff --git a/win32ctypes/core/cffi/_common.py b/win32ctypes/core/cffi/_common.py
@@ -5,8 +5,6 @@
 # This file is open source software distributed according to the terms in
 # LICENSE.txt
 #
-from __future__ import absolute_import
-
 from weakref import WeakKeyDictionary
 
 from ._util import ffi
diff --git a/win32ctypes/core/cffi/_dll.py b/win32ctypes/core/cffi/_dll.py
@@ -5,9 +5,6 @@
 # This file is open source software distributed according to the terms in
 # LICENSE.txt
 #
-from __future__ import absolute_import
-
-from win32ctypes.core.compat import text_type
 from ._util import ffi, check_null, check_false, dlls, HMODULE, PVOID
 
 
@@ -22,7 +19,7 @@
 def _LoadLibraryEx(lpFilename, hFile, dwFlags):
     result = check_null(
         dlls.kernel32.LoadLibraryExW(
-            text_type(lpFilename), ffi.NULL, dwFlags),
+            str(lpFilename), ffi.NULL, dwFlags),
         function_name='LoadLibraryEx')
     return HMODULE(result)
 
diff --git a/win32ctypes/core/cffi/_nl_support.py b/win32ctypes/core/cffi/_nl_support.py
@@ -5,8 +5,6 @@
 # This file is open source software distributed according to the terms in
 # LICENSE.txt
 #
-from __future__ import absolute_import
-
 from ._util import ffi, dlls
 
 ffi.cdef("""
diff --git a/win32ctypes/core/cffi/_resource.py b/win32ctypes/core/cffi/_resource.py
@@ -5,10 +5,6 @@
 # This file is open source software distributed according to the terms in
 # LICENSE.txt
 #
-from __future__ import absolute_import
-
-
-from win32ctypes.core.compat import text_type
 from ._util import (
     ffi, check_null, check_zero, check_false, HMODULE,
     PVOID, RESOURCE, resource, dlls)
@@ -117,7 +113,7 @@ def _LockResource(hResData):
 def _BeginUpdateResource(pFileName, bDeleteExistingResources):
     result = check_null(
         dlls.kernel32.BeginUpdateResourceW(
-            text_type(pFileName), bDeleteExistingResources))
+            str(pFileName), bDeleteExistingResources))
     return HMODULE(result)
 
 
diff --git a/win32ctypes/core/cffi/_system_information.py b/win32ctypes/core/cffi/_system_information.py
@@ -5,8 +5,6 @@
 # This file is open source software distributed according to the terms in
 # LICENSE.txt
 #
-from __future__ import absolute_import
-
 from ._util import ffi, dlls
 
 # TODO: retrieve this value using ffi
diff --git a/win32ctypes/core/cffi/_time.py b/win32ctypes/core/cffi/_time.py
@@ -5,8 +5,6 @@
 # This file is open source software distributed according to the terms in
 # LICENSE.txt
 #
-from __future__ import absolute_import
-
 from ._util import ffi, dlls
 
 ffi.cdef("""
diff --git a/win32ctypes/core/cffi/_util.py b/win32ctypes/core/cffi/_util.py
@@ -5,12 +5,9 @@
 # This file is open source software distributed according to the terms in
 # LICENSE.txt
 #
-
 """ Utility functions to help with cffi wrapping.
 """
-from __future__ import absolute_import
-
-from win32ctypes.core.compat import is_bytes, is_integer, text_type
+from win32ctypes.core.compat import is_bytes, is_integer
 from cffi import FFI
 
 ffi = FFI()
@@ -39,7 +36,7 @@ def RESOURCE(resource):
     if is_integer(resource):
         resource = ffi.cast('wchar_t *', resource)
     elif is_bytes(resource):
-        resource = text_type(resource)
+        resource = str(resource)
     return resource
 
 
diff --git a/win32ctypes/core/compat.py b/win32ctypes/core/compat.py
@@ -1,31 +1,10 @@
-import sys
+def is_bytes(b):
+    return isinstance(b, bytes)
 
-if sys.version_info[0] >= 3:
-    PY3 = True
-    PY2 = False
-else:
-    PY3 = False
-    PY2 = True
 
-if PY3:
-    def is_bytes(b):
-        return isinstance(b, bytes)
+def is_text(s):
+    return isinstance(s, str)
 
-    def is_text(s):
-        return isinstance(s, str)
 
-    def is_integer(i):
-        return isinstance(i, int)
-
-    text_type = str
-else:
-    def is_text(s):
-        return isinstance(s, unicode)  # noqa
-
-    def is_bytes(b):
-        return isinstance(b, (bytes, str))
-
-    def is_integer(i):
-        return isinstance(i, (int, long))  # noqa
-
-    text_type = unicode  # noqa
+def is_integer(i):
+    return isinstance(i, int)
diff --git a/win32ctypes/core/ctypes/_authentication.py b/win32ctypes/core/ctypes/_authentication.py
@@ -5,8 +5,6 @@
 # This file is open source software distributed according to the terms in
 # LICENSE.txt
 #
-from __future__ import absolute_import
-
 import ctypes
 from ctypes import POINTER, Structure, c_void_p, c_wchar_p, c_char_p, cast
 from ctypes.wintypes import (
diff --git a/win32ctypes/core/ctypes/_common.py b/win32ctypes/core/ctypes/_common.py
@@ -5,8 +5,6 @@
 # This file is open source software distributed according to the terms in
 # LICENSE.txt
 #
-from __future__ import absolute_import
-
 import ctypes
 import sys
 from ctypes import (
@@ -15,7 +13,6 @@
 from ctypes import cast  # noqa imported here for convenience
 from ctypes.wintypes import BYTE
 
-from win32ctypes.core.compat import PY3
 from ._util import function_factory
 
 PPy_UNICODE = c_void_p
@@ -28,16 +25,10 @@
 elif ctypes.sizeof(c_longlong) == ctypes.sizeof(c_void_p):
     LONG_PTR = c_longlong
 
-if PY3:
-    _PyBytes_FromStringAndSize = function_factory(
-        pythonapi.PyBytes_FromStringAndSize,
-        [c_char_p, Py_ssize_t],
-        return_type=py_object)
-else:
-    _PyBytes_FromStringAndSize = function_factory(
-        pythonapi.PyString_FromStringAndSize,
-        [c_char_p, Py_ssize_t],
-        return_type=py_object)
+_PyBytes_FromStringAndSize = function_factory(
+    pythonapi.PyBytes_FromStringAndSize,
+    [c_char_p, Py_ssize_t],
+    return_type=py_object)
 
 
 def IS_INTRESOURCE(x):
diff --git a/win32ctypes/core/ctypes/_dll.py b/win32ctypes/core/ctypes/_dll.py
@@ -5,8 +5,6 @@
 # This file is open source software distributed according to the terms in
 # LICENSE.txt
 #
-from __future__ import absolute_import
-
 from ctypes.wintypes import BOOL, DWORD, HANDLE, HMODULE, LPCWSTR
 
 from ._util import check_null, check_false, function_factory, dlls
diff --git a/win32ctypes/core/ctypes/_nl_support.py b/win32ctypes/core/ctypes/_nl_support.py
@@ -5,8 +5,6 @@
 # This file is open source software distributed according to the terms in
 # LICENSE.txt
 #
-from __future__ import absolute_import
-
 from ctypes.wintypes import UINT
 
 from ._util import function_factory, dlls
diff --git a/win32ctypes/core/ctypes/_resource.py b/win32ctypes/core/ctypes/_resource.py
@@ -5,8 +5,6 @@
 # This file is open source software distributed according to the terms in
 # LICENSE.txt
 #
-from __future__ import absolute_import
-
 import ctypes
 from ctypes.wintypes import (
     BOOL, DWORD, HANDLE, HMODULE, LPCWSTR, WORD, HRSRC,
diff --git a/win32ctypes/core/ctypes/_system_information.py b/win32ctypes/core/ctypes/_system_information.py
@@ -5,8 +5,6 @@
 # This file is open source software distributed according to the terms in
 # LICENSE.txt
 #
-from __future__ import absolute_import
-
 import ctypes
 from ctypes.wintypes import LPCWSTR, UINT, LPWSTR, MAX_PATH
 
diff --git a/win32ctypes/core/ctypes/_time.py b/win32ctypes/core/ctypes/_time.py
@@ -5,8 +5,6 @@
 # This file is open source software distributed according to the terms in
 # LICENSE.txt
 #
-from __future__ import absolute_import
-
 from ctypes.wintypes import DWORD
 
 from ._util import function_factory, dlls
diff --git a/win32ctypes/core/ctypes/_util.py b/win32ctypes/core/ctypes/_util.py
@@ -5,11 +5,8 @@
 # This file is open source software distributed according to the terms in
 # LICENSE.txt
 #
-
 """ Utility functions to help with ctypes wrapping.
 """
-from __future__ import absolute_import
-
 from ctypes import GetLastError, FormatError, WinDLL
 
 
diff --git a/win32ctypes/pywin32/__init__.py b/win32ctypes/pywin32/__init__.py
@@ -5,8 +5,6 @@
 # This file is open source software distributed according to the terms in
 # LICENSE.txt
 #
-from __future__ import absolute_import
-
 from win32ctypes.pywin32 import pywintypes
 from win32ctypes.pywin32 import win32api
 from win32ctypes.pywin32 import win32cred
diff --git a/win32ctypes/pywin32/pywintypes.py b/win32ctypes/pywin32/pywintypes.py
@@ -6,8 +6,6 @@
 # LICENSE.txt
 #
 """ A module which supports common Windows types. """
-
-from __future__ import absolute_import
 import contextlib
 
 
diff --git a/win32ctypes/pywin32/win32api.py b/win32ctypes/pywin32/win32api.py
@@ -6,9 +6,6 @@
 # LICENSE.txt
 #
 """ A module, encapsulating the Windows Win32 API. """
-
-from __future__ import absolute_import
-
 from win32ctypes.core import (
     _common, _dll, _resource, _system_information, _backend, _time)
 from win32ctypes.pywin32.pywintypes import pywin32error as _pywin32error
diff --git a/win32ctypes/pywin32/win32cred.py b/win32ctypes/pywin32/win32cred.py
@@ -6,9 +6,6 @@
 # LICENSE.txt
 #
 """ Interface to credentials management functions. """
-
-from __future__ import absolute_import
-
 from win32ctypes.core import _authentication, _common, _backend
 from win32ctypes.pywin32.pywintypes import pywin32error as _pywin32error
 
diff --git a/win32ctypes/tests/__init__.py b/win32ctypes/tests/__init__.py
@@ -5,16 +5,17 @@
 # This file is open source software distributed according to the terms in
 # LICENSE.txt
 #
-from __future__ import print_function
 import os
 
 if 'SHOW_TEST_ENV' in os.environ:
     import sys
     from win32ctypes.core import _backend
     is_64bits = sys.maxsize > 2**32
-    print('=' * 30)
-    print('Running on python: {} {}'.format(
-        sys.version, '64bit' if is_64bits else '32bit'))
-    print('The executable is: {}'.format(sys.executable))
-    print('Using the {} backend'.format(_backend))
-    print('=' * 30)
+    print('=' * 30, file=sys.stderr)
+    print(
+        'Running on python: {} {}'.format(
+            sys.version, '64bit' if is_64bits else '32bit'),
+        file=sys.stderr)
+    print('The executable is: {}'.format(sys.executable), file=sys.stderr)
+    print('Using the {} backend'.format(_backend), file=sys.stderr)
+    print('=' * 30, file=sys.stderr, flush=True)
diff --git a/win32ctypes/tests/compat.py b/win32ctypes/tests/compat.py
diff --git a/win32ctypes/tests/test_win32api.py b/win32ctypes/tests/test_win32api.py
diff --git a/win32ctypes/tests/test_win32cred.py b/win32ctypes/tests/test_win32cred.py

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,6 @@`
`5`	`5`	`# This file is open source software distributed according to the terms in`
`6`	`6`	`# LICENSE.txt`
`7`	`7`	`#`
`8`		`-from __future__ import absolute_import`
`9`		`-`
`10`	`8`	`import sys`
`11`	`9`	`import importlib`
`12`	`10`