python-3.9 compatibility

stonebig · stonebig · commit 332837b982fd · 2020-02-15T14:18:16.000+01:00
solves #807
diff --git a/winpython/__init__.py b/winpython/__init__.py
@@ -28,6 +28,6 @@
 OTHER DEALINGS IN THE SOFTWARE.
 """
 
-__version__ = '2.2.20200202'
+__version__ = '2.3.20200215'
 __license__ = __doc__
 __project_url__ = 'http://winpython.github.io/'
diff --git a/winpython/data/packages.ini b/winpython/data/packages.ini
@@ -857,6 +857,9 @@ description=Jupyter terminal console
 [jupyter_core]
 description=Jupyter core package. A base package on which Jupyter projects rely.
 
+[jupyter_panel_proxy]
+description=Jupyter Server Proxy for Panel
+
 [jupyterlab_pygments]
 description=JupyterLab Pygments theme
 
@@ -1004,6 +1007,9 @@ description=McCabe checker, plugin for flake8
 [mercantile]
 description=Web mercator XYZ tile utilities
 
+[mercurial]
+description=a fast scalable distributed SCM (revision control, version control) system
+
 [metakernel]
 description=Metakernel for Jupyter
 
@@ -1976,6 +1982,9 @@ description=Geometric objects, predicates, and operations
 [shiboken2]
 description=Shiboken generates bindings for C++ libraries using CPython source code
 
+[simpervisor]
+description=Simple async process supervisor
+
 [simplegeneric]
 description=Simple generic functions (similar to Python's own len(), pickle.dump(), etc.)
 
@@ -2412,6 +2421,9 @@ description=N-D labeled arrays and datasets in Python
 [yapf]
 description=A formatter for Python code.
 
+[yarl]
+description=yet another URL library.
+
 [zarr]
 description=A minimal implementation of chunked, compressed, N-dimensional arrays for Python.
 
diff --git a/winpython/disthelpers.py b/winpython/disthelpers.py
@@ -27,6 +27,7 @@
 import imp
 from subprocess import Popen, PIPE
 import warnings
+from distutils.version import LooseVersion, StrictVersion
 
 # ==============================================================================
 # Module, scripts, programs
@@ -144,6 +145,8 @@ def get_msvc_version(python_version):
         return '15.0'
     elif python_version in ('3.7', '3.8'):
         return '15.0'
+    elif StrictVersion(python_version) >= StrictVersion('3.9'):
+        return '15.0'
     else:
         raise RuntimeError(
             "Unsupported Python version %s" % python_version
diff --git a/winpython/py3compat.py b/winpython/py3compat.py
@@ -76,7 +76,10 @@
     from sys import maxsize
     import io
     import pickle
-    from collections import MutableMapping
+    try:  # Python 3.8 and more
+        from collections.abc import MutableMapping
+    except ImportError:
+        from collections import MutableMapping
     import _thread
     import reprlib
 # ==============================================================================
