Feat(Template): Protect import cgi in preparation to Python 3.13

CheetahTemplate3 · Oct 18, 2023 · 1b8515d · 1b8515d
1 parent c7ade90
commit 1b8515d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/Cheetah/Template.py b/Cheetah/Template.py
@@ -21,7 +21,10 @@
     from io import StringIO
 import traceback
 import pprint
-import cgi  # Used by .webInput() if the template is a CGI script.
+try:
+    import cgi  # Used by .webInput() if the template is a CGI script.
+except ImportError:  # Python 3.13+
+    cgi = None
 import types
 
 from . import ErrorCatchers              # for placeholder tags
@@ -1917,7 +1920,7 @@ def webInput(self, names, namesMulti=(), default='', src='f',
         """
         src = src.lower()
         isCgi = not self._CHEETAH__isControlledByWebKit
-        if isCgi and src in ('f', 'v'):
+        if isCgi and (cgi is not None) and src in ('f', 'v'):
             global _formUsedByWebInput
             if _formUsedByWebInput is None:
                 _formUsedByWebInput = cgi.FieldStorage()

diff --git a/docs/news.rst b/docs/news.rst
@@ -4,6 +4,10 @@ News
 Development (master)
 --------------------
 
+Minor features:
+
+  - Protect ``import cgi`` in preparation to Python 3.13.
+
 Tests:
 
   - Run tests with Python 3.12.