encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-29 09:30:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

pull form master

Browse Source
This commit is contained in:
omid 2019-11-11 11:36:08 +03:30
parent 395596da31
commit 0c6e1feb71
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/test_exceptions.py
View File

@ -3,19 +3,14 @@ from django.utils import translation
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from rest_framework.exceptions import ( from rest_framework.exceptions import (
<<<<<<< HEAD
ErrorDetail, Throttled, _get_error_details, ValidationError
=======
APIException, ErrorDetail, Throttled, _get_error_details, bad_request, APIException, ErrorDetail, Throttled, _get_error_details, bad_request,
server_error server_error, ValidationError
>>>>>>> 0d6589cf45940bb67ace74a06b2c5b053f1c31ef
) )
class ExceptionTestCase(TestCase): class ExceptionTestCase(TestCase):
def test_get_error_details(self): def test_get_error_details(self):
example = "string" example = "string"
lazy_example = _(example) lazy_example = _(example)