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
b42b16d0
Commit
b42b16d0
authored
Jun 22, 2015
by
Markus Korn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
compat: invert logic for checking the django version when implementing
RequestFactory.generic()
parent
aa1ad4fb
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
rest_framework/compat.py
+3
-3
No files found.
rest_framework/compat.py
View file @
b42b16d0
...
@@ -210,7 +210,9 @@ except ImportError:
...
@@ -210,7 +210,9 @@ except ImportError:
# RequestFactory only provides `generic` from 1.5 onwards
# RequestFactory only provides `generic` from 1.5 onwards
if
django
.
VERSION
<
(
1
,
5
):
if
django
.
VERSION
>=
(
1
,
5
):
from
django.test.client
import
RequestFactory
else
:
from
django.test.client
import
RequestFactory
as
DjangoRequestFactory
from
django.test.client
import
RequestFactory
as
DjangoRequestFactory
class
RequestFactory
(
DjangoRequestFactory
):
class
RequestFactory
(
DjangoRequestFactory
):
...
@@ -231,8 +233,6 @@ if django.VERSION < (1, 5):
...
@@ -231,8 +233,6 @@ if django.VERSION < (1, 5):
})
})
r
.
update
(
extra
)
r
.
update
(
extra
)
return
self
.
request
(
**
r
)
return
self
.
request
(
**
r
)
else
:
from
django.test.client
import
RequestFactory
# Markdown is optional
# Markdown is optional
...
...
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