encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-28 00:49:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

replace \Z by \z in regex

Browse Source
This commit is contained in:
Dhaval Mehta 2020-06-24 16:11:41 +05:30
parent e18e40d6ae
commit d443da68d8
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest_framework/schemas/openapi.py
View File

@ -554,7 +554,7 @@ class AutoSchema(ViewInspector):
if isinstance(v, URLValidator): if isinstance(v, URLValidator):
schema['format'] = 'uri' schema['format'] = 'uri'
if isinstance(v, RegexValidator): if isinstance(v, RegexValidator):
schema['pattern'] = v.regex.pattern schema['pattern'] = v.regex.pattern.replace('\\Z', '\\z')
elif isinstance(v, MaxLengthValidator): elif isinstance(v, MaxLengthValidator):
attr_name = 'maxLength' attr_name = 'maxLength'
if isinstance(field, serializers.ListField): if isinstance(field, serializers.ListField):

7
tests/schemas/test_openapi.py
View File

@ -13,7 +13,6 @@ from rest_framework.parsers import JSONParser, MultiPartParser
from rest_framework.renderers import JSONRenderer, OpenAPIRenderer from rest_framework.renderers import JSONRenderer, OpenAPIRenderer
from rest_framework.request import Request from rest_framework.request import Request
from rest_framework.schemas.openapi import AutoSchema, SchemaGenerator from rest_framework.schemas.openapi import AutoSchema, SchemaGenerator
from . import views from . import views
@ -855,6 +854,12 @@ class TestOperationIntrospection(TestCase):
assert properties['url']['type'] == 'string' assert properties['url']['type'] == 'string'
assert properties['url']['nullable'] is True assert properties['url']['nullable'] is True
assert properties['url']['default'] == 'http://www.example.com' assert properties['url']['default'] == 'http://www.example.com'
assert properties['url']['pattern'] == r"^(?:[a-z0-9\.\-\+]*)://(?:[^\s:@/]+(?::[^\s:@/]*)?@)?(?:(?:25[0-5]" \
r"|2[0-4]\d|[0-1]?\d?\d)(?:\.(?:25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3}|" \
r"\[[0-9a-f:\.]+\]|([a-z¡-￿0-9](?:[a-z¡-￿0-9-]{0,61}[a-z¡-￿0-9])?" \
r"(?:\.(?!-)[a-z¡-￿0-9-]{1,63}(?<!-))*\.(?!-)(?:[a-z¡-￿-]{2,63}|" \
r"xn--[a-z0-9]{1,59})(?<!-)\.?|localhost))(?::\d{2,5})?(?:[/?#][^\s]*)" \
r"?\z"
assert properties['uuid']['type'] == 'string' assert properties['uuid']['type'] == 'string'
assert properties['uuid']['format'] == 'uuid' assert properties['uuid']['format'] == 'uuid'