Merge remote-tracking branch 'remotes/upstream/master' into feature/mro_resolution

# Conflicts:
#	vm/src/obj/objsuper.rs
#	vm/src/obj/objtype.rs

Author: IdanDor

.github/workflows/ci.yaml

@@ -31,8 +31,8 @@ jobs:
           command: test
           args: --verbose --all
 
-  snippets:
-    name: Run snippets tests
+  snippets_cpython:
+    name: Run snippets and cpython tests
     runs-on:  ${{ matrix.os }}
     strategy:
       matrix:
@@ -68,6 +68,11 @@ jobs:
       - name: run snippets
         run: pipenv run pytest -v
         working-directory: ./tests
+      - name: run cpython tests
+        run: cargo run --release -- -m test -v
+        env:
+          RUSTPYTHONPATH: ${{ github.workspace }}/Lib
+        if: runner.os != 'Windows'
 
   format:
     name: Check Rust code with rustfmt and clippy
@@ -104,21 +109,6 @@ jobs:
       - name: run lint
         run: flake8 . --count --exclude=./.*,./Lib,./vm/Lib  --select=E9,F63,F7,F82 --show-source --statistics
 
-  cpython:
-    name: Run CPython test suite
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@master
-      - name: build rustpython
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --verbose --all
-      - name: run tests
-        run: |
-          export RUSTPYTHONPATH=`pwd`/Lib
-          cargo run -- -m test -v
-
   wasm:
     name: Check the WASM package and demo
     runs-on: ubuntu-latest

.gitpod.Dockerfile

@@ -0,0 +1,14 @@
+FROM gitpod/workspace-full
+
+USER gitpod
+
+# Update Rust to the latest version
+RUN rm -rf ~/.rustup && \
+    export PATH=$HOME/.cargo/bin:$PATH && \
+    rustup update stable && \
+    rustup component add rls && \
+    # Set up wasm-pack and wasm32-unknown-unknown for rustpython_wasm
+    curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh && \
+    rustup target add wasm32-unknown-unknown
+
+USER root

.gitpod.yml

@@ -0,0 +1,2 @@
+image:
+  file: .gitpod.Dockerfile

Cargo.lock

@@ -1575,21 +1575,22 @@ def _setup(_bootstrap_module):
         setattr(self_module, builtin_name, builtin_module)
 
     # Directly load the os module (needed during bootstrap).
-    # XXX Changed to fit RustPython!!!
-    builtin_os = "_os"
-    if builtin_os in sys.modules:
-        os_module = sys.modules[builtin_os]
+    os_details = ('posix', ['/']), ('nt', ['\\', '/'])
+    for builtin_os, path_separators in os_details:
+        # Assumption made in _path_join()
+        assert all(len(sep) == 1 for sep in path_separators)
+        path_sep = path_separators[0]
+        if builtin_os in sys.modules:
+            os_module = sys.modules[builtin_os]
+            break
+        else:
+            try:
+                os_module = _bootstrap._builtin_from_name(builtin_os)
+                break
+            except ImportError:
+                continue
     else:
-        try:
-            os_module = _bootstrap._builtin_from_name(builtin_os)
-        except ImportError:
-            raise ImportError('importlib requires _os')
-    path_separators = ['\\', '/'] if os_module.name == 'nt' else ['/']
-    
-    # Assumption made in _path_join()
-    assert all(len(sep) == 1 for sep in path_separators)
-    path_sep = path_separators[0]
-
+        raise ImportError('importlib requires posix or nt')
     setattr(self_module, '_os', os_module)
     setattr(self_module, 'path_sep', path_sep)
     setattr(self_module, 'path_separators', ''.join(path_separators))
@@ -1604,7 +1605,8 @@ def _setup(_bootstrap_module):
     setattr(self_module, '_weakref', weakref_module)
 
     # Directly load the winreg module (needed during bootstrap).
-    if builtin_os == 'nt':
+    # XXX RustPython TODO: winreg module
+    if builtin_os == 'nt' and False:
         winreg_module = _bootstrap._builtin_from_name('winreg')
         setattr(self_module, '_winreg', winreg_module)
 

Lib/importlib/_bootstrap_external.py

@@ -43,21 +43,50 @@ def _get_exports_list(module):
     except AttributeError:
         return [n for n in dir(module) if n[0] != '_']
 
-import _os
-from _os import *
-from _os import _exit
-__all__.extend(_get_exports_list(_os))
-del _os
-
 # Any new dependencies of the os module and/or changes in path separator
 # requires updating importlib as well.
-if name == 'nt':
-    linesep = '\r\n'
-    import ntpath as path
-else:
+if 'posix' in _names:
+    name = 'posix'
     linesep = '\n'
+    from posix import *
+    try:
+        from posix import _exit
+        __all__.append('_exit')
+    except ImportError:
+        pass
     import posixpath as path
 
+    try:
+        from posix import _have_functions
+    except ImportError:
+        pass
+
+    import posix
+    __all__.extend(_get_exports_list(posix))
+    del posix
+
+elif 'nt' in _names:
+    name = 'nt'
+    linesep = '\r\n'
+    from nt import *
+    try:
+        from nt import _exit
+        __all__.append('_exit')
+    except ImportError:
+        pass
+    import ntpath as path
+
+    import nt
+    __all__.extend(_get_exports_list(nt))
+    del nt
+
+    try:
+        from nt import _have_functions
+    except ImportError:
+        pass
+
+else:
+    raise ImportError('no os specific module found')
 
 sys.modules['os.path'] = path
 from os.path import (curdir, pardir, sep, pathsep, defpath, extsep, altsep,