Skip to content

Update __init__.py #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update __init__.py #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
800d6ce
Update __init__.py
Stefan-chs Jan 17, 2023
896a78a
Update __init__.py
Stefan-chs Jan 17, 2023
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
18 changes: 12 additions & 6 deletions flasgger_marshmallow/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
from marshmallow import __version__
from marshmallow import fields
from marshmallow.utils import _Missing
from marshmallow_enum import EnumField

logger = logging.getLogger(__name__)

Expand All @@ -36,7 +37,7 @@
fields.Number: 'number',
fields.Integer: 'number',
fields.Decimal: 'number',
fields.Boolean: 'bool',
fields.Boolean: 'boolean',
fields.Float: 'number',
fields.DateTime: 'string',
fields.Time: 'string',
Expand All @@ -46,7 +47,7 @@
fields.URL: 'string',
fields.Email: 'string',
fields.Str: 'string',
fields.Bool: 'bool',
fields.Bool: 'boolean',
fields.Int: 'number',
}

Expand All @@ -56,7 +57,12 @@
fields.AwareDateTime: 'string',
fields.Tuple: 'array',
})


include_enums = True
if include_enums:
FIELDS_JSON_TYPE_MAP.update({
EnumField: 'enum'
})

def is_marsh_v3():
return int(marshmallow.__version__.split('.')[0]) == 3
Expand Down Expand Up @@ -352,7 +358,7 @@ def parse_simple_schema(c_schema, location):
values_real_types = list(set(FIELDS_JSON_TYPE_MAP) & set(value.__class__.__mro__))
values_real_types.sort(key=value.__class__.__mro__.index)
if not values_real_types:
raise '不支持的%s类型' % str(type(value))
raise TypeError('Unsupported %s type' % str(type(value)))
if is_marsh_v3():
name = getattr(value, 'data_key', None) or key
else:
Expand Down Expand Up @@ -406,7 +412,7 @@ def parse_json_schema(r_s):
values_real_types = list(set(FIELDS_JSON_TYPE_MAP) & set(value.__class__.__mro__))
values_real_types.sort(key=value.__class__.__mro__.index)
if not values_real_types:
raise '不支持的%s类型' % str(type(value))
raise TypeError('Unsupported %s type' % str(type(value)))
tmp[key] = {
'type': FIELDS_JSON_TYPE_MAP.get(values_real_types[0]),
'description': value.metadata.get('doc', ''),
Expand All @@ -421,7 +427,7 @@ def parse_request_body_json_schema(c_schema):
'in': 'body',
'name': 'body',
'required': True,
'description': 'json 类型的body',
'description': 'json type of body',
'schema': {
'properties': parse_json_schema(c_schema),
'type': 'object',
Expand Down