Update packaging, drop use of "six"

Author: purcell

.github/workflows/ci.yml

@@ -1,25 +1,27 @@
 name: ci
+
 on: [push, pull_request]
 
 jobs:
-  build:
-    runs-on: ubuntu-22.04
+  test:
+    name: Install and test
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
+
     steps:
-    - name: checkout
-      uses: actions/checkout@v6
+      - uses: actions/checkout@v6
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
 
-    - uses: actions/setup-python@v6
-      with:
-        python-version: '${{ matrix.python-version }}'
+      - name: Set up Python
+        run: uv python install ${{ matrix.python-version }}
 
-    - name: Install dependencies
-      run: |
-        pip install six cachetools
+      - name: Install the project
+        run: uv sync --locked --all-extras --dev
 
-    - name: Run tests
-      run: |
-        PYTHONPATH=$(pwd) python tests/__init__.py
+      - name: Run unit tests
+        run: uv run python -m unittest

airspeed/__init__.py

@@ -5,8 +5,7 @@
 import os
 import string
 import sys
-
-import six
+from io import StringIO
 
 __all__ = [
     'Template',
@@ -43,34 +42,6 @@
     }
 }
 
-try:
-    dict
-except NameError:
-    from UserDict import UserDict
-
-    class dict(UserDict):
-
-        def __init__(self):
-            self.data = {}
-try:
-    operator.__gt__
-except AttributeError:
-    operator.__gt__ = lambda a, b: a > b
-    operator.__lt__ = lambda a, b: a < b
-    operator.__ge__ = lambda a, b: a >= b
-    operator.__le__ = lambda a, b: a <= b
-    operator.__eq__ = lambda a, b: a == b
-    operator.__ne__ = lambda a, b: a != b
-    operator.mod = lambda a, b: a % b
-try:
-    basestring
-
-    def is_string(s):
-        return isinstance(s, basestring)
-except NameError:
-    def is_string(s):
-        return isinstance(s, type(''))
-
 ###############################################################################
 # Public interface
 ###############################################################################
@@ -113,19 +84,19 @@ class TemplateError(Exception):
 
 
 class TemplateExecutionError(TemplateError):
-    def __init__(self, element, exc_info):
-        cause, value, traceback = exc_info
-        self.__cause__ = value
+    "This exception will always have a __cause__ attached."
+    def __init__(self, element):
         self.element = element
         self.start, self.end, self.filename = (element.start, element.end,
                                                element.filename)
-        self.msg = "Error in template '%s' at position " \
-                   "%d-%d in expression: %s\n%s: %s" % \
-                   (self.filename, self.start, self.end,
-                    element.my_text(), cause.__name__, value)
 
     def __str__(self):
-        return self.msg
+        return "Error in template '%s' at position " \
+            "%d-%d in expression: %s\n%s: %s" % \
+                   (self.filename, self.start, self.end,
+                    self.element.my_text(),
+                    self.__cause__.__class__.__name__,
+                    self.__cause__)
 
 
 class TemplateSyntaxError(TemplateError):
@@ -207,14 +178,14 @@ def load_template(self, name):
         return template
 
 
-class StoppableStream(six.StringIO):
+class StoppableStream(StringIO):
     def __init__(self, buf=''):
         self.stop = False
-        six.StringIO.__init__(self, buf)
+        StringIO.__init__(self, buf)
 
     def write(self, s):
         if not self.stop:
-            six.StringIO.write(self, s)
+            StringIO.write(self, s)
 
 
 ###############################################################################
@@ -356,11 +327,9 @@ def evaluate(self, *args):
             return self.evaluate_raw(*args)
         except TemplateExecutionError:
             raise
-        except:
-            exc_info = sys.exc_info()
-            six.reraise(TemplateExecutionError,
-                        TemplateExecutionError(self, exc_info), exc_info[2])
-
+        except Exception as e:
+            _type, value, _tb = sys.exc_info()
+            raise TemplateExecutionError(self) from e
 
 class Text(_Element):
     PLAIN = re.compile(
@@ -621,7 +590,7 @@ def calculate(self, current_object, loader, top_namespace):
             # If list make sure index is an integer
             if isinstance(
                     result, list) and not isinstance(
-                    array_index, six.integer_types):
+                        array_index, int):
                 raise ValueError(
                     "expected integer for array index, got '%s'" %
                     (array_index))
@@ -714,8 +683,7 @@ def parse(self):
         self.require_match(self.END, ']')
 
     def calculate(self, namespace, loader):
-        result = self.index.calculate(namespace, loader)
-        return result
+        return self.index.calculate(namespace, loader)
 
 class AlternateValue(_Element):
     START = re.compile(r'\|(.*)$', re.S)
@@ -757,10 +725,10 @@ def evaluate_raw(self, stream, namespace, loader):
                 value = ''
             else:
                 value = self.my_text()
-        if is_string(value):
+        if isinstance(value, str):
             stream.write(value)
         else:
-            stream.write(six.text_type(value))
+            stream.write(str(value))
 
 
 class Null:

flake.lock

@@ -3,23 +3,35 @@
 
   inputs = {
     nixpkgs.url = "nixpkgs/nixpkgs-unstable";
-    flake-utils.url = "github:numtide/flake-utils";
   };
 
-  outputs = { self, nixpkgs, flake-utils }@inputs:
-    flake-utils.lib.eachDefaultSystem (system:
+  outputs =
+    { self, nixpkgs }:
+    (
       let
-        pkgs = import nixpkgs { inherit system; };
+        forAllSystems = nixpkgs.lib.genAttrs nixpkgs.lib.platforms.all;
       in
       {
-        devShell = pkgs.mkShell {
-          buildInputs = with pkgs; [
-            (python3.withPackages (p: [ p.setuptools p.six p.build ]))
-            twine pyright
-            python3Packages.flake8
-            python3Packages.pylint
-          ];
-        };
+        devShell = forAllSystems (
+          system:
+          let
+            pkgs = import nixpkgs { inherit system; };
+          in
+          pkgs.mkShell {
+            buildInputs = with pkgs; [
+              (python3.withPackages (
+                p: with p; [
+                  setuptools
+                  cachetools
+                  build
+                  coverage
+                ]
+              ))
+              ty
+              uv
+            ];
+          }
+        );
       }
     );
 }

flake.nix

@@ -1,3 +1,62 @@
 [build-system]
 requires = ["setuptools"]
 build-backend = "setuptools.build_meta"
+
+[project]
+name = "airspeed"
+authors = [
+    { name = "Steve Purcell", email = "steve@pythonconsulting.com" },
+    { name = "Chris Tarttelin" }
+]
+version = "0.6.1"
+description = "A Python framework for building HTTP-based server applications"
+dependencies = [
+    "cachetools"
+]
+requires-python = ">=3.7"
+license = {file = "LICENCE"}
+classifiers = [
+  "Development Status :: 5 - Production/Stable",
+    "Environment :: Web Environment",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: BSD License",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python",
+    "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+    "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13"
+]
+dynamic = ["readme"]
+
+
+[project.optional-dependencies]
+dev = [
+]
+
+[tool.setuptools]
+include-package-data = false
+
+[tool.setuptools.dynamic]
+readme = {file = ["README.md"], content-type = "text/markdown"}
+
+[tool.setuptools.packages.find]
+include = ["airspeed*"]
+exclude = ["tests*", "examples"]
+
+[tool.setuptools.package-data]
+"*" = ["*.md"]
+
+[tool.coverage.report]
+exclude_lines = [
+    "if __name__ == .__main__.:",
+    "raise NotImplemented.",
+    "return NotImplemented",
+    "def __repr__",
+    "__all__",
+]