mirror of
https://github.com/encode/django-rest-framework.git
synced 2025-07-28 17:09:59 +03:00
pull form master
This commit is contained in:
parent
395596da31
commit
0c6e1feb71
|
@ -3,19 +3,14 @@ from django.utils import translation
|
|||
from django.utils.translation import gettext_lazy as _
|
||||
|
||||
from rest_framework.exceptions import (
|
||||
<<<<<<< HEAD
|
||||
ErrorDetail, Throttled, _get_error_details, ValidationError
|
||||
=======
|
||||
APIException, ErrorDetail, Throttled, _get_error_details, bad_request,
|
||||
server_error
|
||||
>>>>>>> 0d6589cf45940bb67ace74a06b2c5b053f1c31ef
|
||||
server_error, ValidationError
|
||||
)
|
||||
|
||||
|
||||
class ExceptionTestCase(TestCase):
|
||||
|
||||
def test_get_error_details(self):
|
||||
|
||||
example = "string"
|
||||
lazy_example = _(example)
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user