Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/formencode/validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
Validator/Converters for use with FormEncode.
"""

import cgi
try:
import cgi
except ImportError: # Python >= 3.13
cgi = None
import re
import warnings
from encodings import idna
Expand Down Expand Up @@ -1772,15 +1775,15 @@ class FieldStorageUploadConverter(FancyValidator):
no upload was given).
"""
def _convert_to_python(self, value, state=None):
if isinstance(value, cgi.FieldStorage):
if cgi and isinstance(value, cgi.FieldStorage):
if getattr(value, 'filename', None):
return value
raise Invalid('invalid', value, state)
else:
return value

def is_empty(self, value):
if isinstance(value, cgi.FieldStorage):
if cgi and isinstance(value, cgi.FieldStorage):
return not bool(getattr(value, 'filename', None))
return FancyValidator.is_empty(self, value)

Expand Down Expand Up @@ -1825,7 +1828,7 @@ def _convert_to_python(self, value, state):
upload = value.get(self.upload_key)
static = value.get(self.static_key, '').strip()
filename = content = None
if isinstance(upload, cgi.FieldStorage):
if cgi and isinstance(upload, cgi.FieldStorage):
filename = upload.filename
content = upload.value
elif isinstance(upload, str) and upload:
Expand Down