fixed a crash with pypy2

Author: burgerbecky

build_rules.py

@@ -18,13 +18,16 @@
 """
 
 # pylint: disable=unused-argument
+# pylint: disable=consider-using-f-string
 
 from __future__ import absolute_import, print_function, unicode_literals
 
 import os
 import sys
 from burger import clean_directories, clean_files, run_command, \
-    lock_files, unlock_files, delete_directory
+    lock_files, unlock_files, delete_directory, create_setup_py, \
+    delete_file
+
 from wslwinreg import __version__
 
 # If set to True, ``buildme -r``` will not parse directories in this folder.
@@ -86,6 +89,10 @@ def build(working_directory, configuration):
         None if not implemented, otherwise an integer error code.
     """
 
+    input_file = os.path.join(working_directory, "pyproject.toml")
+    output_file = os.path.join(working_directory, "setup.py")
+    create_setup_py(input_file, output_file)
+
     # Unlock the files to handle Perforce locking
     lock_list = unlock_files(working_directory) + \
         unlock_files(os.path.join(working_directory, "wslwinreg"))
@@ -129,6 +136,7 @@ def clean(working_directory):
 
     # Get rid of extra binaries
     delete_directory(os.path.join(working_directory, "wslwinreg", "bin"))
+    delete_file(os.path.join(working_directory, "setup.py"))
 
     clean_directories(
         working_directory,

pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 description = "Drop in replacement for winreg for Cygwin, MSYS2 and WSL"
 license = "MIT"
 license-files = ["LICENSE.txt"]
-dependencies = ["setuptools >= 77.0.0", "enum34>=1.0.0"]
+dependencies = ["setuptools >=44.0.0", "enum34>=1.0.0"]
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Environment :: Console",
@@ -51,6 +51,10 @@ keywords = [
     "burger",
 ]
 
+[tool.setuptools]
+platforms = ["Any"]
+zip-safe = false
+
 [tool.setuptools.dynamic]
 version = { attr = "wslwinreg.__version__" }
 
@@ -60,9 +64,9 @@ Documentation = "http://wslwinreg.readthedocs.io"
 Source = "https://github.com/burgerbecky/wslwinreg"
 
 [tool.setuptools.packages.find]
-include = ["wslwinreg"]
+include = ["wslwinreg", "wslwinreg.bin"]
 exclude = ["unittests", "src"]
-namespaces = false
+namespaces = true
 
 [tool.setuptools.package-data]
 wslwinreg = ["bin/*.exe"]

unittests/test_winreg.py

@@ -24,6 +24,7 @@
 # pylint: disable=invalid-name
 # pylint: disable=consider-using-f-string
 
+# Some tests are unstable on pypy
 USING_PYPY = python_implementation().lower() == "pypy"
 
 try:
@@ -66,16 +67,16 @@ def win32_edition():
     WIN_VER = (10, 0)
 
 # Some tests should only run on 64-bit architectures where WOW64 will be.
-WIN64_MACHINE = True if machine() == "AMD64" or machine() == "x86_64" else False
+WIN64_MACHINE = bool(machine() == "AMD64" or machine() == "x86_64")
 
 # Starting with Windows 7 and Windows Server 2008 R2, WOW64 no longer uses
 # registry reflection and formerly reflected keys are shared instead.
 # Windows 7 and Windows Server 2008 R2 are version 6.1. Due to this, some
 # tests are only valid up until 6.1
-HAS_REFLECTION = True if WIN_VER < (6, 1) else False
+HAS_REFLECTION = bool(WIN_VER < (6, 1))
 
-STRING_WITH_NULL_WORKS = True if sys.version_info >= (3, 6, 0) or \
-    sys.version_info[0] == 2 else False
+STRING_WITH_NULL_WORKS = bool(sys.version_info >= (3, 6, 0) or \
+    sys.version_info[0] == 2)
 
 # Use a per-process key to prevent concurrent test runs (buildbot!) from
 # stomping on each other.
@@ -264,24 +265,22 @@ class LocalWinregTests(BaseWinregTests):
     Run tests only on local machine
     """
 
+    @unittest.skipIf(USING_PYPY, "Test doesn't work on PYPY")
     def test_registry_works(self):
         """
         Try unicode
         """
-        if not USING_PYPY:
-            self._test_all(HKEY_CURRENT_USER)
-            self._test_all(HKEY_CURRENT_USER, "日本-subkey")
+        self._test_all(HKEY_CURRENT_USER)
+        self._test_all(HKEY_CURRENT_USER, "日本-subkey")
 
+    @unittest.skipIf(USING_PYPY, "Test doesn't work on PYPY")
     def test_registry_works_extended_functions(self):
         """
         Substitute the regular CreateKey and OpenKey calls with their
         extended counterparts.
         Note: DeleteKeyEx is not used here because it is platform dependent
         """
 
-        if USING_PYPY:
-            return
-
         def cke(key, sub_key):
             return CreateKeyEx(
                 key,
@@ -349,6 +348,7 @@ def test_context_manager(self):
         except OSError:
             self.assertEqual(h.handle, 0)
 
+    @unittest.skipIf(USING_PYPY, "Test doesn't work on PYPY")
     def test_changing_value(self):
         """
         Issue2810: A race condition in 2.6 and 3.1 may cause
@@ -403,6 +403,7 @@ def test_long_key(self):
             DeleteKey(HKEY_CURRENT_USER, "\\".join((test_key_name, name)))
             DeleteKey(HKEY_CURRENT_USER, test_key_name)
 
+    @unittest.skipIf(USING_PYPY, "Test doesn't work on PYPY")
     def test_dynamic_key(self):
         """
         Issue2810, when the value is dynamically generated, these

wslwinreg/__init__.py

@@ -63,7 +63,7 @@
     PFILETIME, SUBLANG_DEFAULT
 
 ## Numeric version
-__numversion__ = (1, 1, 1)
+__numversion__ = (1, 1, 2)
 
 ## Current version of the library
 __version__ = ".".join([str(num) for num in __numversion__])

wslwinreg/wslapi.py

@@ -45,6 +45,16 @@
     # Fake it for Python 3
     basestring = str
 
+try:
+    FileNotFoundError   # type: ignore
+except NameError:
+    class FileNotFoundError(OSError):
+        """
+        pypy2 does not define this exception
+        """
+        # pylint: disable=unnecessary-pass
+        pass
+
 ## Loopback address
 _LOCALHOST = "127.0.0.1"