diff --git a/README.md b/README.md
index 814da6e92..350174555 100644
--- a/README.md
+++ b/README.md
@@ -52,8 +52,8 @@ There is a live example API for testing purposes, [available here][sandbox].
# Requirements
-* Python (2.7, 3.2, 3.3, 3.4, 3.5, 3.6)
-* Django (1.8, 1.9, 1.10, 1.11)
+* Python (2.7, 3.4, 3.5, 3.6)
+* Django (1.10, 1.11, 2.0 alpha)
# Installation
diff --git a/docs/api-guide/schemas.md b/docs/api-guide/schemas.md
index 51a6c00c6..29b779d50 100644
--- a/docs/api-guide/schemas.md
+++ b/docs/api-guide/schemas.md
@@ -155,7 +155,7 @@ Basic usage is just to provide the title for your schema and call
generator = schemas.SchemaGenerator(title='Flight Search API')
schema = generator.get_schema()
-### Per-View Schema Customisation
+## Per-View Schema Customisation
By default, view introspection is performed by an `AutoSchema` instance
accessible via the `schema` attribute on `APIView`. This provides the
@@ -191,7 +191,7 @@ To customise the `Link` generation you may:
class CustomSchema(AutoSchema):
def get_link(...):
- # Implemet custom introspection here (or in other sub-methods)
+ # Implement custom introspection here (or in other sub-methods)
class CustomView(APIView):
...
@@ -784,3 +784,4 @@ in [OpenAPI][open-api] format.
[api-blueprint]: https://apiblueprint.org/
[static-files]: https://docs.djangoproject.com/en/stable/howto/static-files/
[named-arguments]: https://docs.djangoproject.com/en/stable/topics/http/urls/#named-groups
+
\ No newline at end of file
diff --git a/docs/img/bayer.png b/docs/img/bayer.png
new file mode 100644
index 000000000..e8ef56f5f
Binary files /dev/null and b/docs/img/bayer.png differ
diff --git a/docs/index.md b/docs/index.md
index fbb5bc1bb..d44e5ec8f 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -87,7 +87,7 @@ continued development by **[signing up for a paid plan][funding]**.
REST framework requires the following:
* Python (2.7, 3.2, 3.3, 3.4, 3.5, 3.6)
-* Django (1.8, 1.9, 1.10, 1.11)
+* Django (1.10, 1.11, 2.0 alpha)
The following packages are optional:
@@ -247,6 +247,7 @@ General guides to using REST framework.
* [3.4 Announcement][3.4-announcement]
* [3.5 Announcement][3.5-announcement]
* [3.6 Announcement][3.6-announcement]
+* [3.7 Announcement][3.7-announcement]
* [Kickstarter Announcement][kickstarter-announcement]
* [Mozilla Grant][mozilla-grant]
* [Funding][funding]
@@ -377,6 +378,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
[3.4-announcement]: topics/3.4-announcement.md
[3.5-announcement]: topics/3.5-announcement.md
[3.6-announcement]: topics/3.6-announcement.md
+[3.7-announcement]: topics/3.7-announcement.md
[kickstarter-announcement]: topics/kickstarter-announcement.md
[mozilla-grant]: topics/mozilla-grant.md
[funding]: topics/funding.md
diff --git a/docs/topics/3.7-announcement.md b/docs/topics/3.7-announcement.md
new file mode 100644
index 000000000..deba645c3
--- /dev/null
+++ b/docs/topics/3.7-announcement.md
@@ -0,0 +1,131 @@
+
+
+
+# Django REST framework 3.7
+
+The 3.7 release focuses on improvements to schema generation and the interactive API documentation.
+
+This release has been made possible by [Bayer](https://www.bayer.com/) who have sponsored the release.
+
+
+
+---
+
+## Funding
+
+If you use REST framework commercially and would like to see this work continue, we strongly encourage you to invest in its continued development by
+**[signing up for a paid plan][funding]**.
+
+
+
+
+*As well as our release sponsor, we'd like to say thanks in particular our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), [Machinalis](https://hello.machinalis.co.uk/), and [Rollbar](https://rollbar.com).*
+
+---
+
+## Customizing API docs & schema generation.
+
+The schema generation introduced in 3.5 and the related API docs generation in 3.6 are both hugely powerful features, however they've been somewhat limited in cases where the view introspection isn't able to correctly identify the schema for a particular view.
+
+In order to try to address this we're now adding the ability for per-view customization of the API schema. The interface that we're adding for this allows either basic manual overrides over which fields should be included on a view, or for more complex programmatic overriding of the schema generation. We believe this release comprehensively addresses some of the existing shortcomings of the schema features.
+
+Let's take a quick look at using the new functionality...
+
+The `APIView` class has a `schema` attribute, that is used to control how the Schema for that particular view is generated. The default behaviour is to use the `AutoSchema` class.
+
+ from rest_framework.views import APIView
+ from rest_framework.schemas import AutoSchema
+
+ class CustomView(APIView):
+ schema = AutoSchema() # Included for demonstration only. This is the default behavior.
+
+We can remove a view from the API schema and docs, like so:
+
+ class CustomView(APIView):
+ schema = None
+
+If we want to mostly use the default behavior, but additionally include some additional fields on a particular view, we can now do so easily...
+
+ class CustomView(APIView):
+ schema = AutoSchema(manual_fields=[
+ coreapi.Field('search', location='query')
+ ])
+
+To ignore the automatic generation for a particular view, and instead specify the schema explicitly, we use the `ManualSchema` class instead...
+
+ class CustomView(APIView):
+ schema = ManualSchema(fields=[...])
+
+For more advanced behaviors you can subclass `AutoSchema` to provide for customized schema generation, and apply that to particular views.
+
+ class CustomView(APIView):
+ schema = CustomizedSchemaGeneration()
+
+For full details on the new functionality, please see the [Schema Documentation][schema-docs].
+
+---
+
+## Django 2.0 support
+
+REST framework 3.7 supports Django versions 1.10, 1.11, and 2.0 alpha.
+
+---
+
+## Minor fixes and improvements
+
+There are a large number of minor fixes and improvements in this release. See the [release notes](release-notes.md) page for a complete listing.
+
+The number of [open tickets against the project](https://github.com/encode/django-rest-framework/issues) currently at its lowest number in quite some time, and we're continuing to focus on reducing these to a manageable amount.
+
+---
+
+## Deprecations
+
+### `exclude_from_schema`
+
+Both `APIView.exclude_from_schema` and the `exclude_from_schema` argument to the `@api_view` decorator and now `PendingDeprecation`. They will be moved to deprecated in the 3.8 release, and removed entirely in 3.9.
+
+For `APIView` you should instead set a `schema = None` attribute on the view class.
+
+For function based views the `@schema` decorator can be used to exclude the view from the schema, by using `@schema(None)`.
+
+### `DjangoFilterBackend`
+
+The `DjangoFilterBackend` was moved to pending deprecation in 3.5, and deprecated in 3.6. It has now been removed from the core framework.
+
+The functionality remains fully available, but is instead provided in the `django-filter` package.
+
+---
+
+## What's next
+
+We're still planning to work on improving real-time support for REST framework by providing documentation on integrating with Django channels, as well adding support for more easily adding WebSocket support to existing HTTP endpoints.
+
+This will likely be timed so that any REST framework development here ties in with similar work on [API Star][api-star].
+
+[funding]: funding.md
+[schema-docs]: ../api-guide/schemas.md
+[api-star]: https://github.com/encode/apistar
\ No newline at end of file
diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index ef43df670..09ff6a9a2 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -38,18 +38,69 @@ You can determine your currently installed version using `pip freeze`:
---
-## 3.6.x series
+## 3.7.x series
-### 3.6.5
+### 3.7.0
+
+**Date**: [6th October 2017][3.7.0-milestone]
* Fix `DjangoModelPermissions` to ensure user authentication before calling the view's `get_queryset()` method. As a side effect, this changes the order of the HTTP method permissions and authentication checks, and 405 responses will only be returned when authenticated. If you want to replicate the old behavior, see the PR for details. [#5376][gh5376]
* Deprecated `exclude_from_schema` on `APIView` and `api_view` decorator. Set `schema = None` or `@schema(None)` as appropriate. [#5422][gh5422]
-* Timezone-aware `DateTimeField`s now respect active or default `timezone` during serialization, instead of always using UTC.
+* Timezone-aware `DateTimeField`s now respect active or default `timezone` during serialization, instead of always using UTC. [#5435][gh5435]
Resolves inconsistency whereby instances were serialised with supplied datetime for `create` but UTC for `retrieve`. [#3732][gh3732]
**Possible backwards compatibility break** if you were relying on datetime strings being UTC. Have client interpret datetimes or [set default or active timezone (docs)][djangodocs-set-timezone] to UTC if needed.
+* Removed DjangoFilterBackend inline with deprecation policy. Use `django_filters.rest_framework.FilterSet` and/or `django_filters.rest_framework.DjangoFilterBackend` instead. [#5273][gh5273]
+* Don't strip microseconds from `time` when encoding. Makes consistent with `datetime`.
+ **BC Change**: Previously only milliseconds were encoded. [#5440][gh5440]
+* Added `STRICT_JSON` setting (default `True`) to raise exception for the extended float values (`nan`, `inf`, `-inf`) accepted by Python's `json` module.
+ **BC Change**: Previously these values would converted to corresponding strings. Set `STRICT_JSON` to `False` to restore the previous behaviour. [#5265][gh5265]
+* Add support for `page_size` parameter in CursorPaginator class [#5250][gh5250]
+* Make `DEFAULT_PAGINATION_CLASS` `None` by default.
+ **BC Change**: If your were **just** setting `PAGE_SIZE` to enable pagination you will need to add `DEFAULT_PAGINATION_CLASS`.
+ The previous default was `rest_framework.pagination.PageNumberPagination`. There is a system check warning to catch this case. You may silence that if you are setting pagination class on a per-view basis. [#5170][gh5170]
+* Catch `APIException` from `get_serializer_fields` in schema generation. [#5443][gh5443]
+* Allow custom authentication and permission classes when using `include_docs_urls` [#5448][gh5448]
+* Defer translated string evaluation on validators. [#5452][gh5452]
+* Added default value for 'detail' param into 'ValidationError' exception [#5342][gh5342]
+* Adjust schema get_filter_fields rules to match framework [#5454][gh5454]
+* Updated test matrix to add Django 2.0 and drop Django 1.8 & 1.9
+ **BC Change**: This removes Django 1.8 and Django 1.9 from Django REST Framework supported versions. [#5457][gh5457]
+* Fixed a deprecation warning in serializers.ModelField [#5058][gh5058]
+* Added a more explicit error message when `get_queryset` returned `None` [#5348][gh5348]
+* Fix docs for Response `data` description [#5361][gh5361]
+* Fix __pychache__/.pyc excludes when packaging [#5373][gh5373]
+* Fix default value handling for dotted sources [#5375][gh5375]
+* Ensure content_type is set when passing empty body to RequestFactory [#5351][gh5351]
+* Fix ErrorDetail Documentation [#5380][gh5380]
+* Allow optional content in the generic content form [#5372][gh5372]
+* Updated supported values for the NullBooleanField [#5387][gh5387]
+* Fix ModelSerializer custom named fields with source on model [#5388][gh5388]
+* Fixed the MultipleFieldLookupMixin documentation example to properly check for object level permission [#5398][gh5398]
+* Update get_object() example in permissions.md [#5401][gh5401]
+* Fix authtoken managment command [#5415][gh5415]
+* Fix schema generation markdown [#5421][gh5421]
+* Allow `ChoiceField.choices` to be set dynamically [#5426][gh5426]
+* Add the project layout to the quickstart [#5434][gh5434]
+* Reuse 'apply_markdown' function in 'render_markdown' templatetag [#5469][gh5469]
+* Added links to `drf-openapi` package in docs [#5470][gh5470]
+* Added docstrings code highlighting with pygments [#5462][gh5462]
+* Fixed documentation rendering for views named `data` [#5472][gh5472]
+* Docs: Clarified 'to_internal_value()' validation behavior [#5466][gh5466]
+* Fix missing six.text_type() call on APIException.__str__ [#5476][gh5476]
+* Document documentation.py [#5478][gh5478]
+* Fix naming collisions in Schema Generation [#5464][gh5464]
+* Call Django's authenticate function with the request object [#5295][gh5295]
+* Update coreapi JS to 0.1.1 [#5479][gh5479]
+* Have `is_list_view` recognise RetrieveModel… views [#5480][gh5480]
+* Remove Django 1.8 & 1.9 compatibility code [#5481][gh5481]
+* Remove deprecated schema code from DefaultRouter [#5482][gh5482]
+
+
+## 3.6.x series
+
### 3.6.4
**Date**: [21st August 2017][3.6.4-milestone]
@@ -756,6 +807,7 @@ For older release notes, [please see the version 2.x documentation][old-release-
[3.6.2-milestone]: https://github.com/encode/django-rest-framework/issues?q=milestone%3A%223.6.2+Release%22
[3.6.3-milestone]: https://github.com/encode/django-rest-framework/issues?q=milestone%3A%223.6.3+Release%22
[3.6.4-milestone]: https://github.com/encode/django-rest-framework/issues?q=milestone%3A%223.6.4+Release%22
+[3.7.0-milestone]: https://github.com/encode/django-rest-framework/issues?q=milestone%3A%223.7.0+Release%22
[gh2013]: https://github.com/encode/django-rest-framework/issues/2013
@@ -1427,9 +1479,50 @@ For older release notes, [please see the version 2.x documentation][old-release-
[gh5147]: https://github.com/encode/django-rest-framework/issues/5147
[gh5131]: https://github.com/encode/django-rest-framework/issues/5131
-
+
+[gh5481]: https://github.com/encode/django-rest-framework/issues/5481
+[gh5480]: https://github.com/encode/django-rest-framework/issues/5480
+[gh5479]: https://github.com/encode/django-rest-framework/issues/5479
+[gh5295]: https://github.com/encode/django-rest-framework/issues/5295
+[gh5464]: https://github.com/encode/django-rest-framework/issues/5464
+[gh5478]: https://github.com/encode/django-rest-framework/issues/5478
+[gh5476]: https://github.com/encode/django-rest-framework/issues/5476
+[gh5466]: https://github.com/encode/django-rest-framework/issues/5466
+[gh5472]: https://github.com/encode/django-rest-framework/issues/5472
+[gh5462]: https://github.com/encode/django-rest-framework/issues/5462
+[gh5470]: https://github.com/encode/django-rest-framework/issues/5470
+[gh5469]: https://github.com/encode/django-rest-framework/issues/5469
+[gh5435]: https://github.com/encode/django-rest-framework/issues/5435
+[gh5434]: https://github.com/encode/django-rest-framework/issues/5434
+[gh5426]: https://github.com/encode/django-rest-framework/issues/5426
+[gh5421]: https://github.com/encode/django-rest-framework/issues/5421
+[gh5415]: https://github.com/encode/django-rest-framework/issues/5415
+[gh5401]: https://github.com/encode/django-rest-framework/issues/5401
+[gh5398]: https://github.com/encode/django-rest-framework/issues/5398
+[gh5388]: https://github.com/encode/django-rest-framework/issues/5388
+[gh5387]: https://github.com/encode/django-rest-framework/issues/5387
+[gh5372]: https://github.com/encode/django-rest-framework/issues/5372
+[gh5380]: https://github.com/encode/django-rest-framework/issues/5380
+[gh5351]: https://github.com/encode/django-rest-framework/issues/5351
+[gh5375]: https://github.com/encode/django-rest-framework/issues/5375
+[gh5373]: https://github.com/encode/django-rest-framework/issues/5373
+[gh5361]: https://github.com/encode/django-rest-framework/issues/5361
+[gh5348]: https://github.com/encode/django-rest-framework/issues/5348
+[gh5058]: https://github.com/encode/django-rest-framework/issues/5058
+[gh5457]: https://github.com/encode/django-rest-framework/issues/5457
[gh5376]: https://github.com/encode/django-rest-framework/issues/5376
[gh5422]: https://github.com/encode/django-rest-framework/issues/5422
[gh5408]: https://github.com/encode/django-rest-framework/issues/5408
[gh3732]: https://github.com/encode/django-rest-framework/issues/3732
[djangodocs-set-timezone]: https://docs.djangoproject.com/en/1.11/topics/i18n/timezones/#default-time-zone-and-current-time-zone
+[gh5273]: https://github.com/encode/django-rest-framework/issues/5273
+[gh5440]: https://github.com/encode/django-rest-framework/issues/5440
+[gh5265]: https://github.com/encode/django-rest-framework/issues/5265
+[gh5250]: https://github.com/encode/django-rest-framework/issues/5250
+[gh5170]: https://github.com/encode/django-rest-framework/issues/5170
+[gh5443]: https://github.com/encode/django-rest-framework/issues/5443
+[gh5448]: https://github.com/encode/django-rest-framework/issues/5448
+[gh5452]: https://github.com/encode/django-rest-framework/issues/5452
+[gh5342]: https://github.com/encode/django-rest-framework/issues/5342
+[gh5454]: https://github.com/encode/django-rest-framework/issues/5454
+[gh5482]: https://github.com/encode/django-rest-framework/issues/5482
\ No newline at end of file
diff --git a/mkdocs.yml b/mkdocs.yml
index d9e96961a..8fbe150a1 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -70,6 +70,7 @@ pages:
- '3.4 Announcement': 'topics/3.4-announcement.md'
- '3.5 Announcement': 'topics/3.5-announcement.md'
- '3.6 Announcement': 'topics/3.6-announcement.md'
+ - '3.7 Announcement': 'topics/3.7-announcement.md'
- 'Kickstarter Announcement': 'topics/kickstarter-announcement.md'
- 'Mozilla Grant': 'topics/mozilla-grant.md'
- 'Funding': 'topics/funding.md'
diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py
index ae130a4d4..bc4ddff06 100644
--- a/rest_framework/__init__.py
+++ b/rest_framework/__init__.py
@@ -8,7 +8,7 @@ ______ _____ _____ _____ __
"""
__title__ = 'Django REST framework'
-__version__ = '3.6.4'
+__version__ = '3.7.0'
__author__ = 'Tom Christie'
__license__ = 'BSD 2-Clause'
__copyright__ = 'Copyright 2011-2017 Tom Christie'
diff --git a/rest_framework/locale/en/LC_MESSAGES/django.mo b/rest_framework/locale/en/LC_MESSAGES/django.mo
index 13760f707..79ab58522 100644
Binary files a/rest_framework/locale/en/LC_MESSAGES/django.mo and b/rest_framework/locale/en/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/en/LC_MESSAGES/django.po b/rest_framework/locale/en/LC_MESSAGES/django.po
index ac7f4fa71..fa420670a 100644
--- a/rest_framework/locale/en/LC_MESSAGES/django.po
+++ b/rest_framework/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-07-12 16:13+0100\n"
-"PO-Revision-Date: 2016-07-12 15:14+0000\n"
+"PO-Revision-Date: 2017-09-21 21:11+0000\n"
"Last-Translator: Thomas Christie \n"
"Language-Team: English (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/en/)\n"
"MIME-Version: 1.0\n"
diff --git a/rest_framework/locale/ko_KR/LC_MESSAGES/django.mo b/rest_framework/locale/ko_KR/LC_MESSAGES/django.mo
index f83b7ed71..9fb8ae279 100644
Binary files a/rest_framework/locale/ko_KR/LC_MESSAGES/django.mo and b/rest_framework/locale/ko_KR/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/ko_KR/LC_MESSAGES/django.po b/rest_framework/locale/ko_KR/LC_MESSAGES/django.po
index 152bc7b00..43dbe0cdd 100644
--- a/rest_framework/locale/ko_KR/LC_MESSAGES/django.po
+++ b/rest_framework/locale/ko_KR/LC_MESSAGES/django.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# GarakdongBigBoy , 2017
# Joon Hwan 김준환 , 2017
# SUN CHOI , 2015
msgid ""
@@ -10,8 +11,8 @@ msgstr ""
"Project-Id-Version: Django REST framework\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-07-12 16:13+0100\n"
-"PO-Revision-Date: 2017-08-03 14:58+0000\n"
-"Last-Translator: Joon Hwan 김준환 \n"
+"PO-Revision-Date: 2017-09-28 09:41+0000\n"
+"Last-Translator: GarakdongBigBoy \n"
"Language-Team: Korean (Korea) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ko_KR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -45,7 +46,7 @@ msgstr "토큰 헤더가 유효하지 않습니다. 인증데이터(credentials)
#: authentication.py:179
msgid "Invalid token header. Token string should not contain spaces."
-msgstr "토큰 헤더가 유효하지 않습니다. 토큰 문자열은 빈칸(spaces)를 포함하지 않아야 합니다."
+msgstr "토큰 헤더가 유효하지 않습니다. 토큰 문자열은 빈칸(spaces)을 포함하지 않아야 합니다."
#: authentication.py:185
msgid ""
@@ -118,7 +119,7 @@ msgstr "자격 인증데이터(authentication credentials)가 제공되지 않
#: exceptions.py:99
msgid "You do not have permission to perform this action."
-msgstr "이 작업을 "
+msgstr "이 작업을 수행할 권한(permission)이 없습니다."
#: exceptions.py:104 views.py:81
msgid "Not found."
@@ -143,11 +144,11 @@ msgstr "요청이 지연(throttled)되었습니다."
#: fields.py:269 relations.py:206 relations.py:239 validators.py:98
#: validators.py:181
msgid "This field is required."
-msgstr "이 항목을 채워주십시오."
+msgstr "이 필드는 필수 항목입니다."
#: fields.py:270
msgid "This field may not be null."
-msgstr "이 칸은 null일 수 없습니다."
+msgstr "이 필드는 null일 수 없습니다."
#: fields.py:608 fields.py:639
msgid "\"{input}\" is not a valid boolean."
@@ -155,15 +156,15 @@ msgstr "\"{input}\"이 유효하지 않은 부울(boolean)입니다."
#: fields.py:674
msgid "This field may not be blank."
-msgstr "이 칸은 blank일 수 없습니다."
+msgstr "이 필드는 blank일 수 없습니다."
#: fields.py:675 fields.py:1675
msgid "Ensure this field has no more than {max_length} characters."
-msgstr "이 칸이 글자 수가 {max_length} 이하인지 확인하십시오."
+msgstr "이 필드의 글자 수가 {max_length} 이하인지 확인하십시오."
#: fields.py:676
msgid "Ensure this field has at least {min_length} characters."
-msgstr "이 칸이 글자 수가 적어도 {min_length} 이상인지 확인하십시오."
+msgstr "이 필드의 글자 수가 적어도 {min_length} 이상인지 확인하십시오."
#: fields.py:713
msgid "Enter a valid email address."
@@ -285,7 +286,7 @@ msgstr "파일명을 알 수 없습니다."
#: fields.py:1361
msgid "The submitted file is empty."
-msgstr "제출된 파일이 비어있습니다."
+msgstr "제출한 파일이 비어있습니다."
#: fields.py:1362
msgid ""
@@ -398,31 +399,31 @@ msgstr "선택할 아이템이 없습니다."
#: validators.py:43
msgid "This field must be unique."
-msgstr "이 칸은 반드시 고유해야 합니다."
+msgstr "이 필드는 반드시 고유(unique)해야 합니다."
#: validators.py:97
msgid "The fields {field_names} must make a unique set."
-msgstr "{field_names} 필드는 반드시 고유하게 설정해야 합니다."
+msgstr "필드 {field_names} 는 반드시 고유(unique)해야 합니다."
#: validators.py:245
msgid "This field must be unique for the \"{date_field}\" date."
-msgstr "이 칸은 \"{date_field}\"날짜에 대해 고유해야합니다."
+msgstr "이 필드는 고유(unique)한 \"{date_field}\" 날짜를 갖습니다."
#: validators.py:260
msgid "This field must be unique for the \"{date_field}\" month."
-msgstr "이 칸은 \"{date_field}\" 월에 대해 고유해야합니다."
+msgstr "이 필드는 고유(unique)한 \"{date_field}\" 월을 갖습니다. "
#: validators.py:273
msgid "This field must be unique for the \"{date_field}\" year."
-msgstr "이 칸은 \"{date_field}\" 년에 대해 고유해야합니다."
+msgstr "이 필드는 고유(unique)한 \"{date_field}\" 년을 갖습니다. "
#: versioning.py:42
msgid "Invalid version in \"Accept\" header."
-msgstr "\"Accept\" header내 버전이 유효하지 않습니다."
+msgstr "\"Accept\" 헤더(header)의 버전이 유효하지 않습니다."
#: versioning.py:73
msgid "Invalid version in URL path."
-msgstr "URL path내 버전이 유효하지 않습니다."
+msgstr "URL path의 버전이 유효하지 않습니다."
#: versioning.py:115
msgid "Invalid version in URL path. Does not match any version namespace."
diff --git a/setup.py b/setup.py
index 36227938b..f9f8a7bb4 100755
--- a/setup.py
+++ b/setup.py
@@ -92,8 +92,6 @@ setup(
'Development Status :: 5 - Production/Stable',
'Environment :: Web Environment',
'Framework :: Django',
- 'Framework :: Django :: 1.8',
- 'Framework :: Django :: 1.9',
'Framework :: Django :: 1.10',
'Framework :: Django :: 1.11',
'Intended Audience :: Developers',
@@ -103,7 +101,6 @@ setup(
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
- 'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Topic :: Internet :: WWW/HTTP',