Fix cgi import in wptserve.

Differential Revision: https://phabricator.services.mozilla.com/D240615

bugzilla-url: https://bugzilla.mozilla.org/show_bug.cgi?id=1952230
gecko-commit: 211369cf947812cdc1b1f76260bf2106af0dca7f

Author: moz-wptsync-bot

Diff for: tools/wptserve/setup.py

@@ -19,7 +19,7 @@
       author_email='[email protected]',
       url='http://wptserve.readthedocs.org/',
       license='BSD',
-      packages=['wptserve', 'wptserve.sslutils'],
+      packages=['wptserve', 'wptserve.sslutils', 'wptserve.cgi'],
       include_package_data=True,
       zip_safe=False,
       install_requires=deps

Diff for: tools/wptserve/wptserve/request.py

@@ -9,7 +9,7 @@
 from urllib.parse import parse_qsl, urlsplit
 
 from . import stash
-from . import cgi
+from .cgi import FieldStorage
 from .utils import HTTPException, isomorphic_encode, isomorphic_decode
 
 KT = TypeVar('KT')
@@ -348,7 +348,7 @@ def POST(self):
                 "keep_blank_values": True,
                 "encoding": "iso-8859-1",
             }
-            fs = cgi.FieldStorage(**kwargs)
+            fs = FieldStorage(**kwargs)
             self._POST = MultiDict.from_field_storage(fs)
             self.raw_input.seek(pos)
         return self._POST
@@ -612,7 +612,7 @@ def get_list(self, key):
 
     @classmethod
     def from_field_storage(cls, fs):
-        """Construct a MultiDict from a cgi.FieldStorage
+        """Construct a MultiDict from a FieldStorage
 
         Note that all keys and values are binary strings.
         """
@@ -628,7 +628,7 @@ def from_field_storage(cls, fs):
                 if not value.filename:
                     value = isomorphic_encode(value.value)
                 else:
-                    assert isinstance(value, cgi.FieldStorage)
+                    assert isinstance(value, FieldStorage)
                 self.add(isomorphic_encode(key), value)
         return self