Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
django-rest-framework
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
django-rest-framework
Commits
921e4ed2
Commit
921e4ed2
authored
Jul 28, 2014
by
Paul Oswald
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Evaluate content before passing to regex.sub
Issue #1708
parent
c7a988eb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
3 deletions
+23
-3
rest_framework/tests/test_description.py
+22
-0
rest_framework/utils/formatting.py
+1
-3
No files found.
rest_framework/tests/test_description.py
View file @
921e4ed2
...
...
@@ -2,6 +2,7 @@
from
__future__
import
unicode_literals
from
django.test
import
TestCase
from
django.utils.encoding
import
python_2_unicode_compatible
from
rest_framework.compat
import
apply_markdown
,
smart_text
from
rest_framework.views
import
APIView
from
rest_framework.tests.description
import
ViewWithNonASCIICharactersInDocstring
...
...
@@ -98,6 +99,27 @@ class TestViewNamesAndDescriptions(TestCase):
pass
self
.
assertEqual
(
MockView
()
.
get_view_description
(),
''
)
def
test_view_description_can_be_promise
(
self
):
"""
Ensure a view may have a docstring that is actually a lazily evaluated
class that can be converted to a string.
See: https://github.com/tomchristie/django-rest-framework/issues/1708
"""
# use a mock object instead of gettext_lazy to ensure that we can't end
# up with a test case string in our l10n catalog
@python_2_unicode_compatible
class
MockLazyStr
(
object
):
def
__init__
(
self
,
string
):
self
.
s
=
string
def
__str__
(
self
):
return
self
.
s
class
MockView
(
APIView
):
__doc__
=
MockLazyStr
(
"a gettext string"
)
self
.
assertEqual
(
MockView
()
.
get_view_description
(),
'a gettext string'
)
def
test_markdown
(
self
):
"""
Ensure markdown to HTML works as expected.
...
...
rest_framework/utils/formatting.py
View file @
921e4ed2
...
...
@@ -6,8 +6,6 @@ from __future__ import unicode_literals
from
django.utils.html
import
escape
from
django.utils.safestring
import
mark_safe
from
rest_framework.compat
import
apply_markdown
from
rest_framework.settings
import
api_settings
from
textwrap
import
dedent
import
re
...
...
@@ -36,7 +34,7 @@ def dedent(content):
# unindent the content if needed
if
whitespace_counts
:
whitespace_pattern
=
'^'
+
(
' '
*
min
(
whitespace_counts
))
content
=
re
.
sub
(
re
.
compile
(
whitespace_pattern
,
re
.
MULTILINE
),
''
,
content
)
content
=
re
.
sub
(
re
.
compile
(
whitespace_pattern
,
re
.
MULTILINE
),
''
,
unicode
(
content
)
)
return
content
.
strip
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment