Remove support for Python 2.7

Author: almarklein

.github/workflows/ci.yml

@@ -2,80 +2,98 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 
 jobs:
-  build:
+
+  lint:
+    name: Linting
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: 3.12
+    - name: Set up Node
+      uses: actions/setup-node@v4
+        with:
+          node-version: '18'
+    - name: Install dependencies
+      run: |
+          python -m pip install --upgrade pip
+          pip install ruff
+    - name: Ruff lint
+      run: |
+          ruff check --output-format=github .
+    - name: Ruff format
+      run: |
+          ruff format --check .
+
+ docs:
+    name: Docs
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: 3.13
+    - name: Install dev dependencies
+      run: |
+        python -m pip install --upgrade pip
+        #pip install -U -e .[docs]
+        pip install sphinx
+    - name: Build docs
+      run: |
+        cd docs
+        make html SPHINXOPTS="-W --keep-going"
+
+  tests:
     name: ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         include:
-          - name: Lint
-            os: ubuntu-latest
-            pyversion: '3.7'
-            dolint: 1
           - name: Linux py36
             os: ubuntu-latest
             pyversion: '3.6'
-            tests: 1
           - name: Linux py37
             os: ubuntu-latest
             pyversion: '3.7'
-            tests: 1
           - name: Linux py38
             os: ubuntu-latest
             pyversion: '3.8'
-            tests: 1
           - name: Linux py39
             os: ubuntu-latest
             pyversion: '3.9'
-            tests: 1
           - name: Linux pypy3
             os: ubuntu-latest
             pyversion: 'pypy3'
-            tests: 1
           - name: Windows py38
             os: windows-latest
             pyversion: '3.8'
-            tests: 1
           - name: MacOS py38
             os: macos-latest
             pyversion: '3.8'
-            tests: 1
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.pyversion }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.pyversion }}
-      - uses: actions/setup-node@v2
-        if: matrix.dolint == 1
-        with:
-          node-version: '14'
-      - name: Install dependencies (lint and docs)
-        if: matrix.dolint == 1
-        run: |
-            python -m pip install --upgrade pip
-            pip install invoke pycodestyle flake8 sphinx
-      - name: Install dependencies (unit tests)
-        if: matrix.tests == 1
+      - name: Install dependencies for unit tests
         run: |
             python -m pip install --upgrade pip
             pip install invoke pytest pytest-cov
-      - name: Lint
-        if: matrix.dolint == 1
-        run: |
-            invoke test --style
-      - name: Build docs
-        if: matrix.dolint == 1
-        run: |
-            invoke docs --clean --build
       - name: Test with pytest
-        if: matrix.tests == 1
         run: |
             invoke test --unit

CONTRIBUTING.md

@@ -1 +1 @@
-See https://github.com/flexxui/flexx/blob/master/CONTRIBUTING.md
+See https://github.com/flexxui/flexx/blob/main/CONTRIBUTING.md

pscript/__init__.py

@@ -246,16 +246,6 @@
 import sys
 import logging
 
-logger = logging.getLogger(__name__)
-
-# Assert compatibility and redirect to legacy version on Python 2.7
-ok = True
-if sys.version_info[0] == 2:  # pragma: no cover
-    if sys.version_info < (2, 7):
-        raise RuntimeError('PScript needs at least Python 2.7')
-    if type(b'') == type(''):  # noqa - will be str and unicode after conversion
-        sys.modules[__name__] = __import__(__name__ + '_legacy')
-        ok = False
 
 # NOTE: The code for the parser is quite long, especially if you want
 # to document it well. Therefore it is split in multiple modules, which
@@ -267,20 +257,19 @@
 # demonstrating the features defined in that module. In the docs these
 # docstrings are combined into one complete guide.
 
-# flake8: noqa
 
-if ok:
+from .parser0 import Parser0, JSError
+from .parser1 import Parser1
+from .parser2 import Parser2
+from .parser3 import Parser3
+from .base import *
 
-    from .parser0 import Parser0, JSError
-    from .parser1 import Parser1
-    from .parser2 import Parser2
-    from .parser3 import Parser3
-    from .base import *
+from .functions import py2js, evaljs, evalpy, JSString
+from .functions import script2js, js_rename, create_js_module
+from .stdlib import get_full_std_lib, get_all_std_names
+from .stubs import RawJS, JSConstant, window, undefined
 
-    from .functions import py2js, evaljs, evalpy, JSString
-    from .functions import script2js, js_rename, create_js_module
-    from .stdlib import get_full_std_lib, get_all_std_names
-    from .stubs import RawJS, JSConstant, window, undefined
 
+logger = logging.getLogger(__name__)
 
-del logging, sys, ok
+del logging, sys

pscript/functions.py

@@ -279,8 +279,6 @@ def evaljs(jscode, whitespace=True, print_result=True, extra_nodejs_args=None):
         filename = None
         p_or_e = ['-p', '-e'] if print_result else ['-e']
         cmd += ['--use_strict'] + p_or_e + [jscode]
-        if sys.version_info[0] < 3:
-            cmd = [c.encode('raw_unicode_escape') for c in cmd]
 
     # Call node
     try:

pscript/parser0.py

@@ -152,7 +152,6 @@ class Parser0:
         'True'  : 'true',
         'False' : 'false',
         'None'  : 'null',
-        'unicode': 'str',  # legacy Py compat
         'unichr': 'chr',
         'xrange': 'range',
         'self': 'this',
@@ -208,12 +207,7 @@ def __init__(self, code, pysource=None, indent=0, docstrings=True,
             self._pysource = str(pysource[0]), int(pysource[1])
         elif pysource is not None:
             logger.warning('Parser ignores pysource; it must be str or (str, int).')
-        if sys.version_info[0] == 2:
-            fut = 'from __future__ import unicode_literals, print_function\n'
-            code = fut + code
         self._root = ast.parse(code)
-        if sys.version_info[0] == 2:
-            self._root.body_nodes.pop(0)  # remove that import node we added
         self._stack = []
         self._indent = indent
         self._dummy_counter = 0

pscript/stubs.py

@@ -58,9 +58,6 @@ def __init__(self, code, _resolve_defining_module=True):
             raise Exception()
         except Exception as err:
             tb = getattr(err, '__traceback__', None)
-            if tb is None:  # Legacy Python 2.x
-                import sys
-                _, _, tb = sys.exc_info()
             self._globals = tb.tb_frame.f_back.f_globals
             del tb
         self.__module__ = self._globals['__name__']

pscript/tests/test_commonast.py

@@ -23,10 +23,7 @@
 
 def _export_python_sample_ast():
     # Get what to export
-    if sys.version_info > (3, ):
-        filenames = filename1, filename3
-    else:
-        filenames = filename2,
+    filenames = filename1, filename3
     # Write
     for filename in filenames:
         filename_bz2 = filename[:-2] + 'bz2'

pscript/tests/test_parser2.py

@@ -512,16 +512,14 @@ def test_when_funcs_do_parse_kwargs(self):
         assert 'kw_values' not in code
 
         # We do for keyword only args
-        if sys.version_info > (3, ):
-            code = py2js('def foo(a, *, b=1, c="foo"): pass')
-            assert 'parse_kwargs' in code
-            assert 'kw_values' in code
+        code = py2js('def foo(a, *, b=1, c="foo"): pass')
+        assert 'parse_kwargs' in code
+        assert 'kw_values' in code
 
         # We do for keyword only args and **kwargs
-        if sys.version_info > (3, ):
-            code = py2js('def foo(a, *, b=1, c="foo", **d): pass')
-            assert 'parse_kwargs' in code
-            assert 'kw_values' in code
+        code = py2js('def foo(a, *, b=1, c="foo", **d): pass')
+        assert 'parse_kwargs' in code
+        assert 'kw_values' in code
 
     def test_func1(self):
         code = py2js(func1)
@@ -560,7 +558,6 @@ def test_function_call_default_args(self):
         assert evalpy(code + 'foo()') == '9'
         assert evalpy(code + 'd.foo()') == '9'
 
-    @skipif(sys.version_info < (3,), reason='no keyword only args in legacy py')
     def test_function_call_keyword_only_args(self):
         code = "def foo(*, a=2, b=3, c=4): return a+b+c;\nd = {'foo':foo}\n"
         assert evalpy(code + 'foo(a=1, b=2, c=3)') == '6'
@@ -615,7 +612,6 @@ def test_function_call_args_and_kwargs(self):
         assert evalpy(code + 'foo(1, 2, 3, **{"b":4})') == '{ b: 4 }'
         assert evalpy(code + 'foo(a=3, **{"b":4})') == '{ a: 3, b: 4 }'
 
-    @skipif(sys.version_info < (3,), reason='no keyword only args in legacy py')
     def test_function_call_keyword_only_args_and_kwargs(self):
         code = "def foo(*, a=3, b=4, **x): return repr([a, b]) + repr(x);\nd = {'foo':foo}\n"
         assert evalpy(code + 'foo(1)') == '[3,4]{}'
@@ -790,7 +786,6 @@ def inner():
         assert evaljs(py2js(func1)+'func1()') == '2'
         assert evaljs(py2js(func2)+'func2()') == '3'
 
-    @skipif(sys.version_info < (3,), reason='no nonlocal on legacy Python')
     def test_nonlocal(self):
         assert py2js('nonlocal foo;foo = 3').strip() == 'foo = 3;'
 
@@ -804,7 +799,6 @@ def inner():
         """
         assert evaljs(py2js(func3_code)+'func3()') == '3'
 
-    @skipif(sys.version_info < (3,), reason='no nonlocal on legacy Python')
     def test_global_vs_nonlocal(self):
         js1 = py2js('global foo;foo = 3')
         js2 = py2js('nonlocal foo;foo = 3')
@@ -955,7 +949,7 @@ def addTwo(self):
                 super().addTwo()
                 self.bar += 1  # haha, we add four!
             def addFour(self):
-                super(MyClass3, self).add(4)  # Use legacy Python syntax
+                super(MyClass3, self).add(4)  # Use older syntax
 
         code = py2js(MyClass1) + py2js(MyClass2) + py2js(MyClass3)
         code += 'var m1=new MyClass1(), m2=new MyClass2(), m3=new MyClass3();'

pscript/tests/test_parser3.py

@@ -446,8 +446,6 @@ def test_no_dict(self):
         assert evalpy(code + 'foo = Foo(); foo.clear(); foo.bar') == '42'
 
     def test_that_all_dict_methods_are_tested(self):
-        if sys.version_info[0] == 2:
-            skip('On legacy py, the dict methods are different')
         tested = set([x.split('_')[1] for x in dir(self) if x.startswith('test_')])
         needed = set([x for x in dir(dict) if not x.startswith('_')])
         ignore = 'fromkeys'
@@ -777,7 +775,7 @@ def test_splitlines(self):
         assert evalpy(r'"abc\r\ndef".splitlines(True)') == "[ 'abc\\r\\n', 'def' ]"
 
         res = repr("X\n\nX\r\rX\r\n\rX\n\r\nX".splitlines(True)).replace(' ', '')
-        res = res.replace('u"', '"').replace("u'", "'")  # arg legacy py
+        # res = res.replace('u"', '"').replace("u'", "'")  # arg legacy py
         assert nowhitespace(evalpy(r'"X\n\nX\r\rX\r\n\rX\n\r\nX".splitlines(true)')) == res
 
     def test_replace(self):

pscript/tests/test_stdlib.py

@@ -34,21 +34,15 @@ def test_stdlib_has_all_list_methods():
 
 def test_stdlib_has_all_dict_methods():
     method_names = [m for m in dir(dict) if not m.startswith('_')]
-    if sys.version_info[0] == 2:
-        ignore = 'fromkeys has_key viewitems viewkeys viewvalues iteritems iterkeys itervalues'
-    else:
-        ignore = 'fromkeys'
+    ignore = 'fromkeys'
     for name in ignore.split(' '):
         method_names.remove(name)
     for method_name in method_names:
         assert method_name in stdlib.METHODS
 
 def test_stdlib_has_all_str_methods():
     method_names = [m for m in dir(str) if not m.startswith('_')]
-    if sys.version_info[0] == 2:
-        ignore = 'encode decode'
-    else:
-        ignore = 'encode format_map isprintable maketrans isascii removeprefix removesuffix'
+    ignore = 'encode format_map isprintable maketrans isascii removeprefix removesuffix'
     for name in ignore.split(' '):
         if name in method_names:
             method_names.remove(name)