Support Python 3.8 and Python 3.9 (Issues cztomczak#546 and cztomczak#593).

cztomczak · cztomczak · commit d6deaf8e2b87 · 2021-02-14T23:44:38.000+01:00
diff --git a/README.md b/README.md
@@ -210,9 +210,9 @@ support old operating systems then choose the v31 release.
 
 OS | Py2 | Py3 | 32bit | 64bit | Requirements
 --- | --- | --- | --- | --- | ---
-Windows | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 / 3.8 | Yes | Yes | Windows 7+
-Linux | 2.7 | 3.4 / 3.5 / 3.6 / 3.7  3.8 | Yes | Yes | Debian 8+, Ubuntu 14.04+,<br> Fedora 24+, openSUSE 13.3+
-Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 / 3.8 | No | Yes | MacOS 10.9+
+Windows | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 / 3.8 / 3.9 | Yes | Yes | Windows 7+ (Note that Python 3.9 supports Windows 8.1+)
+Linux | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | Yes | Yes | Debian 8+, Ubuntu 14.04+,<br> Fedora 24+, openSUSE 13.3+
+Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | No | Yes | MacOS 10.9+
 
 These platforms are not supported yet:
 - ARM - see [Issue #267](../../issues/267)
diff --git a/docs/Build-instructions.md b/docs/Build-instructions.md
@@ -66,8 +66,9 @@ are named "cefpythonXX" where XX is Chromium version number.
   from [here](https://www.microsoft.com/en-us/download/details.aspx?id=44266)
 
 5) For Python 2.7 and when using using "Visual C++ compiler for Python 2.7"
-   you have to install "Visual C++ 2008 Redistributable Package (x64)"
-   from [here](https://www.microsoft.com/en-us/download/details.aspx?id=15336)
+   you have to install "Visual C++ 2008 Redistributable Package"
+   from [here](https://www.microsoft.com/en-us/download/details.aspx?id=29)
+   and [here](https://www.microsoft.com/en-us/download/details.aspx?id=15336)
 
 6) Clone cefpython, checkout for example "cefpython57" branch
    that includes Chromium v57, then create a build/ directory and enter it:
@@ -164,7 +165,8 @@ requirements common for all platforms.
     * For Python 2.7 install "Microsoft Visual C++ Compiler for Python 2.7"
       from [here](https://www.microsoft.com/en-us/download/details.aspx?id=44266)
     * When using "Visual C++ compiler for Python 2.7" you have to install
-      "Microsoft Visual C++ 2008 Redistributable Package (x64)" from
+      "Microsoft Visual C++ 2008 Redistributable Package" from
+      [here](https://www.microsoft.com/en-us/download/details.aspx?id=29) and
       [here](https://www.microsoft.com/en-us/download/details.aspx?id=15336)
     * For Python 2.7 copy "cefpython/src/windows/py27/stdint.h" to
       "%LocalAppData%\Programs\Common\Microsoft\Visual C++ for Python\9.0\VC\include\"
diff --git a/examples/screenshot.py b/examples/screenshot.py
@@ -42,7 +42,7 @@
 import sys
 
 try:
-    from PIL import Image, PILLOW_VERSION
+    from PIL import Image, __version__ as PILLOW_VERSION
 except ImportError:
     print("[screenshot.py] Error: PIL module not available. To install"
           " type: pip install Pillow")
diff --git a/src/common/cefpython_public_api.h b/src/common/cefpython_public_api.h
@@ -48,6 +48,8 @@
 #include "../../build/build_cefpython/cefpython_py37_fixed.h"
 #elif PY_MINOR_VERSION == 8
 #include "../../build/build_cefpython/cefpython_py38_fixed.h"
+#elif PY_MINOR_VERSION == 9
+#include "../../build/build_cefpython/cefpython_py39_fixed.h"
 #endif // PY_MINOR_VERSION
 #endif // PY_MAJOR_VERSION
 
diff --git a/src/compile_time_constants.pxi b/src/compile_time_constants.pxi
@@ -5,3 +5,6 @@
 
 DEF UNAME_SYSNAME = "Windows"
 DEF PY_MAJOR_VERSION = 3
+cdef extern from "limits.h":
+    cdef int INT_MIN
+    cdef int INT_MAX
diff --git a/src/subprocess/main_message_loop/util_win.cpp b/src/subprocess/main_message_loop/util_win.cpp
@@ -136,8 +136,8 @@ int GetCefKeyboardModifiers(WPARAM wparam, LPARAM lparam) {
   return modifiers;
 }
 
-bool IsKeyDown(WPARAM wparam) {
-  return (GetKeyState(wparam) & 0x8000) != 0;
+bool IsKeyDown(int keycode) {
+  return (GetKeyState(keycode) & 0x8000) != 0;
 }
 
 float GetDeviceScaleFactor() {
diff --git a/src/subprocess/main_message_loop/util_win.h b/src/subprocess/main_message_loop/util_win.h
@@ -31,7 +31,7 @@ WNDPROC SetWndProcPtr(HWND hWnd, WNDPROC wndProc);
 
 int GetCefMouseModifiers(WPARAM wparam);
 int GetCefKeyboardModifiers(WPARAM wparam, LPARAM lparam);
-bool IsKeyDown(WPARAM wparam);
+bool IsKeyDown(int keycode);
 
 // Returns the device scale factor. For example, 200% display scaling will
 // return 2.0.
diff --git a/tools/build.py b/tools/build.py
@@ -809,7 +809,7 @@ def build_cefpython_module():
             args = list()
             args.append("\"{python}\"".format(python=sys.executable))
             args.append(os.path.join(TOOLS_DIR, os.path.basename(__file__)))
-            assert __file__ in sys.argv[0]
+            assert os.path.basename(__file__) in sys.argv[0]
             args.extend(SYS_ARGV_ORIGINAL[1:])
             command = " ".join(args)
             print("[build.py] Running command: %s" % command)
diff --git a/tools/build_distrib.py b/tools/build_distrib.py
@@ -80,13 +80,14 @@
 ALLOW_PARTIAL = False
 
 # Python versions
-SUPPORTED_PYTHON_VERSIONS = [(2, 7), (3, 4), (3, 5), (3, 6), (3, 7), (3, 8)]
+SUPPORTED_PYTHON_VERSIONS = [(2, 7), (3, 4), (3, 5), (3, 6), (3, 7), (3, 8), (3, 9)]
 
 # Python search paths. It will use first Python found for specific version.
 # Supports replacement of one environment variable in path eg.: %ENV_KEY%.
 PYTHON_SEARCH_PATHS = dict(
     WINDOWS=[
         "C:\\Python*\\",
+        "C:\\Pythons\\Python*\\",
         "%LOCALAPPDATA%\\Programs\\Python\\Python*\\",
         "C:\\Program Files\\Python*\\",
         "C:\\Program Files (x86)\\Python*\\",
@@ -614,7 +615,7 @@ def check_cpp_extension_dependencies_issue359(setup_dir, all_pythons):
         return
     checked_any = False
     for python in all_pythons:
-        if python["version2"] in ((3, 5), (3, 6), (3, 7)):
+        if python["version2"] in ((3, 5), (3, 6), (3, 7), (3, 8), (3, 9)):
             checked_any = True
             if not os.path.exists(os.path.join(setup_dir, "cefpython3",
                                                "msvcp140.dll")):
diff --git a/tools/common.py b/tools/common.py
@@ -219,15 +219,19 @@
 
 VS_PLATFORM_ARG = "x86" if ARCH32 else "amd64"
 
+# Python 3.5 / 3.6 / 3.7 / 3.8 / 3.9
 VS2015_VCVARS = ("C:\\Program Files (x86)\\Microsoft Visual Studio 14.0"
                  "\\VC\\vcvarsall.bat")
 
+# Required for building old CEF branches < 2704
 VS2013_VCVARS = ("C:\\Program Files (x86)\\Microsoft Visual Studio 12.0"
                  "\\VC\\vcvarsall.bat")
 
+# Python 3.4
 VS2010_VCVARS = ("C:\\Program Files (x86)\\Microsoft Visual Studio 10.0"
                  "\\VC\\vcvarsall.bat")
 
+# Python 2.7
 VS2008_VCVARS = ("C:\\Program Files (x86)\\Microsoft Visual Studio 9.0"
                  "\\VC\\vcvarsall.bat")
 
@@ -475,6 +479,8 @@ def get_msvs_for_python(vs_prefix=False):
         return "VS2015" if vs_prefix else "2015"
     elif sys.version_info[:2] == (3, 8):
         return "VS2015" if vs_prefix else "2015"
+    elif sys.version_info[:2] == (3, 9):
+        return "VS2015" if vs_prefix else "2015"
     else:
         print("ERROR: This version of Python is not supported")
         sys.exit(1)
diff --git a/tools/cython_setup.py b/tools/cython_setup.py
@@ -147,17 +147,15 @@ def get_winsdk_lib():
     if WINDOWS:
         if ARCH32:
             winsdk_libs = [
+                # Windows 7 SDKs.
                 r"C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\Lib",
                 r"C:\\Program Files\\Microsoft SDKs\\Windows\\v7.0\\Lib",
-                # Visual Studio 2008 installation
-                r"C:\\Program Files\\Microsoft SDKs\\Windows\\v6.0A\\Lib",
             ]
         elif ARCH64:
             winsdk_libs = [
+                # Windows 7 SDKs.
                 r"C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\Lib\\x64",
                 r"C:\\Program Files\\Microsoft SDKs\\Windows\\v7.0\\Lib\\x64",
-                # Visual Studio 2008 installation
-                r"C:\\Program Files\\Microsoft SDKs\\Windows\\v6.0A\\Lib\\x64",
             ]
         else:
             raise Exception("Unknown architecture")
@@ -433,6 +431,7 @@ def get_ext_modules(options):
         # > Unknown Extension options: 'cython_directives' warnings.warn(msg)
         cython_directives={
             # Any conversion to unicode must be explicit using .decode().
+            "language_level": 2,  # Yes, Py2 for all python versions.
             "c_string_type": "bytes",
             "c_string_encoding": "utf-8",
             "profile": ENABLE_PROFILING,
diff --git a/tools/installer/cefpython3.__init__.py b/tools/installer/cefpython3.__init__.py
@@ -67,5 +67,8 @@
 elif sys.version_info[:2] == (3, 8):
     # noinspection PyUnresolvedReferences
     from . import cefpython_py38 as cefpython
+elif sys.version_info[:2] == (3, 9):
+    # noinspection PyUnresolvedReferences
+    from . import cefpython_py39 as cefpython
 else:
     raise Exception("Python version not supported: " + sys.version)
diff --git a/tools/installer/cefpython3.setup.py b/tools/installer/cefpython3.setup.py
@@ -149,6 +149,7 @@ def main():
             "Programming Language :: Python :: 3.6",
             "Programming Language :: Python :: 3.7",
             "Programming Language :: Python :: 3.8",
+            "Programming Language :: Python :: 3.9",
             "Topic :: Desktop Environment",
             "Topic :: Internet",
             "Topic :: Internet :: WWW/HTTP",
diff --git a/tools/make_installer.py b/tools/make_installer.py
@@ -338,7 +338,7 @@ def create_empty_log_file(log_file):
 
 def copy_cpp_extension_dependencies_issue359(pkg_dir):
     """CEF Python module is written in Cython and is a Python C++
-    extension and depends on msvcpXX.dll. For Python 3.5 / 3.6 / 3.7
+    extension and depends on msvcpXX.dll. For Python 3.5 / 3.6 / 3.7 / 3.8 / 3.9
     msvcp140.dll is required. See Issue #359. For Python 2.7
     msvcp90.dll is required. Etc. These dependencies are not included
     with Python binaries from Python.org."""
@@ -365,10 +365,12 @@ def copy_cpp_extension_dependencies_issue359(pkg_dir):
     # in the package. Thus if included, msvcpxx.dll dependency is
     # required as well.
 
-    # Python 3.5 / 3.6 / 3.7
+    # Python 3.5 / 3.6 / 3.7 / 3.8 / 3.9
     if os.path.exists(os.path.join(pkg_dir, "cefpython_py35.pyd")) \
             or os.path.exists(os.path.join(pkg_dir, "cefpython_py36.pyd")) \
-            or os.path.exists(os.path.join(pkg_dir, "cefpython_py37.pyd")):
+            or os.path.exists(os.path.join(pkg_dir, "cefpython_py37.pyd")) \
+            or os.path.exists(os.path.join(pkg_dir, "cefpython_py38.pyd")) \
+            or os.path.exists(os.path.join(pkg_dir, "cefpython_py39.pyd")):
         search_paths = [
             # This is where Microsoft Visual C++ 2015 Update 3 installs
             # (14.00.24212).

Original file line number	Diff line number	Diff line change
`@@ -136,8 +136,8 @@ int GetCefKeyboardModifiers(WPARAM wparam, LPARAM lparam) {`
`136`	`136`	`return modifiers;`
`137`	`137`	`}`
`138`	`138`
`139`		`-bool IsKeyDown(WPARAM wparam) {`
`140`		`- return (GetKeyState(wparam) & 0x8000) != 0;`
	`139`	`+bool IsKeyDown(int keycode) {`
	`140`	`+ return (GetKeyState(keycode) & 0x8000) != 0;`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`float GetDeviceScaleFactor() {`