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
5c0f9f14
Commit
5c0f9f14
authored
Jan 23, 2017
by
Mariusz Felisiak
Committed by
Tom Christie
Jan 23, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed unnecessary utc wrapper. (#4839)
parent
247954d4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
11 deletions
+3
-11
rest_framework/compat.py
+0
-9
rest_framework/fields.py
+2
-1
tests/test_fields.py
+1
-1
No files found.
rest_framework/compat.py
View file @
5c0f9f14
...
@@ -312,12 +312,3 @@ def set_many(instance, field, value):
...
@@ -312,12 +312,3 @@ def set_many(instance, field, value):
else
:
else
:
field
=
getattr
(
instance
,
field
)
field
=
getattr
(
instance
,
field
)
field
.
set
(
value
)
field
.
set
(
value
)
try
:
# A `utc` instance is available in Django 1.11+
from
django.utils.timezone
import
utc
except
ImportError
:
# A `UTC` class is available in older versions
from
django.utils.timezone
import
UTC
utc
=
UTC
()
rest_framework/fields.py
View file @
5c0f9f14
...
@@ -28,11 +28,12 @@ from django.utils.encoding import is_protected_type, smart_text
...
@@ -28,11 +28,12 @@ from django.utils.encoding import is_protected_type, smart_text
from
django.utils.formats
import
localize_input
,
sanitize_separators
from
django.utils.formats
import
localize_input
,
sanitize_separators
from
django.utils.functional
import
cached_property
from
django.utils.functional
import
cached_property
from
django.utils.ipv6
import
clean_ipv6_address
from
django.utils.ipv6
import
clean_ipv6_address
from
django.utils.timezone
import
utc
from
django.utils.translation
import
ugettext_lazy
as
_
from
django.utils.translation
import
ugettext_lazy
as
_
from
rest_framework
import
ISO_8601
from
rest_framework
import
ISO_8601
from
rest_framework.compat
import
(
from
rest_framework.compat
import
(
get_remote_field
,
unicode_repr
,
unicode_to_repr
,
utc
,
value_from_object
get_remote_field
,
unicode_repr
,
unicode_to_repr
,
value_from_object
)
)
from
rest_framework.exceptions
import
ErrorDetail
,
ValidationError
from
rest_framework.exceptions
import
ErrorDetail
,
ValidationError
from
rest_framework.settings
import
api_settings
from
rest_framework.settings
import
api_settings
...
...
tests/test_fields.py
View file @
5c0f9f14
...
@@ -9,10 +9,10 @@ import pytest
...
@@ -9,10 +9,10 @@ import pytest
from
django.http
import
QueryDict
from
django.http
import
QueryDict
from
django.test
import
TestCase
,
override_settings
from
django.test
import
TestCase
,
override_settings
from
django.utils
import
six
from
django.utils
import
six
from
django.utils.timezone
import
utc
import
rest_framework
import
rest_framework
from
rest_framework
import
serializers
from
rest_framework
import
serializers
from
rest_framework.compat
import
utc
from
rest_framework.fields
import
is_simple_callable
from
rest_framework.fields
import
is_simple_callable
try
:
try
:
...
...
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