Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make tests pass on Windows too #3676

Merged
merged 4 commits into from
Nov 26, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .isort.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
skip=.tox
atomic=true
multi_line_output=5
known_standard_library=types
known_third_party=pytest,django
known_first_party=rest_framework
2 changes: 1 addition & 1 deletion requirements/requirements-codestyle.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ flake8==2.4.0
pep8==1.5.7

# Sort and lint imports
isort==3.9.6
isort==4.2.2
2 changes: 1 addition & 1 deletion requirements/requirements-packaging.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ wheel==0.24.0
twine==1.4.0

# Transifex client for managing translation resources.
transifex-client==0.11b3
transifex-client==0.11
2 changes: 1 addition & 1 deletion rest_framework/utils/representation.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def smart_repr(value):
# <django.core.validators.RegexValidator object at 0x1047af050>
# Should be presented as
# <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

Expand Down