encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-01-25 00:34:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3676 from akx/tests-on-windows

Browse Source 
Make tests pass on Windows too
This commit is contained in:
Tom Christie 2015-11-26 15:08:24 +00:00
commit 0e4ea2a591
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.isort.cfg
View File

@ -2,5 +2,6 @@
skip=.tox skip=.tox
atomic=true atomic=true
multi_line_output=5 multi_line_output=5
known_standard_library=types
known_third_party=pytest,django known_third_party=pytest,django
known_first_party=rest_framework known_first_party=rest_framework

2
requirements/requirements-codestyle.txt
View File

@ -3,4 +3,4 @@ flake8==2.4.0
pep8==1.5.7 pep8==1.5.7
# Sort and lint imports # Sort and lint imports
isort==3.9.6 isort==4.2.2

2
requirements/requirements-packaging.txt
View File

@ -5,4 +5,4 @@ wheel==0.24.0
twine==1.4.0 twine==1.4.0
# Transifex client for managing translation resources. # Transifex client for managing translation resources.
transifex-client==0.11b3 transifex-client==0.11

2
rest_framework/utils/representation.py
View File

@ -40,7 +40,7 @@ def smart_repr(value):
# <django.core.validators.RegexValidator object at 0x1047af050> # <django.core.validators.RegexValidator object at 0x1047af050>
# Should be presented as # Should be presented as
# <django.core.validators.RegexValidator object> # <django.core.validators.RegexValidator object>
value = re.sub(' at 0x[0-9a-f]{4,32}>', '>', value) value = re.sub(' at 0x[0-9A-Fa-f]{4,32}>', '>', value)
return value return value