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
807f7a6b
Commit
807f7a6b
authored
May 22, 2014
by
Piper Merriam
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix _resolve_model to work with unicode strings
parent
01e2a342
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletions
+6
-1
rest_framework/serializers.py
+1
-1
rest_framework/tests/test_serializers.py
+5
-0
No files found.
rest_framework/serializers.py
View file @
807f7a6b
...
@@ -49,7 +49,7 @@ def _resolve_model(obj):
...
@@ -49,7 +49,7 @@ def _resolve_model(obj):
String representations should have the format:
String representations should have the format:
'appname.ModelName'
'appname.ModelName'
"""
"""
if
type
(
obj
)
==
str
and
len
(
obj
.
split
(
'.'
))
==
2
:
if
isinstance
(
obj
,
six
.
string_types
)
and
len
(
obj
.
split
(
'.'
))
==
2
:
app_name
,
model_name
=
obj
.
split
(
'.'
)
app_name
,
model_name
=
obj
.
split
(
'.'
)
return
models
.
get_model
(
app_name
,
model_name
)
return
models
.
get_model
(
app_name
,
model_name
)
elif
inspect
.
isclass
(
obj
)
and
issubclass
(
obj
,
models
.
Model
):
elif
inspect
.
isclass
(
obj
)
and
issubclass
(
obj
,
models
.
Model
):
...
...
rest_framework/tests/test_serializers.py
View file @
807f7a6b
...
@@ -3,6 +3,7 @@ from django.test import TestCase
...
@@ -3,6 +3,7 @@ from django.test import TestCase
from
rest_framework.serializers
import
_resolve_model
from
rest_framework.serializers
import
_resolve_model
from
rest_framework.tests.models
import
BasicModel
from
rest_framework.tests.models
import
BasicModel
from
rest_framework.compat
import
six
class
ResolveModelTests
(
TestCase
):
class
ResolveModelTests
(
TestCase
):
...
@@ -19,6 +20,10 @@ class ResolveModelTests(TestCase):
...
@@ -19,6 +20,10 @@ class ResolveModelTests(TestCase):
resolved_model
=
_resolve_model
(
'tests.BasicModel'
)
resolved_model
=
_resolve_model
(
'tests.BasicModel'
)
self
.
assertEqual
(
resolved_model
,
BasicModel
)
self
.
assertEqual
(
resolved_model
,
BasicModel
)
def
test_resolve_unicode_representation
(
self
):
resolved_model
=
_resolve_model
(
six
.
text_type
(
'tests.BasicModel'
))
self
.
assertEqual
(
resolved_model
,
BasicModel
)
def
test_resolve_non_django_model
(
self
):
def
test_resolve_non_django_model
(
self
):
with
self
.
assertRaises
(
ValueError
):
with
self
.
assertRaises
(
ValueError
):
_resolve_model
(
TestCase
)
_resolve_model
(
TestCase
)
...
...
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