summaryrefslogtreecommitdiff
path: root/tests/test_utils.py
diff options
context:
space:
mode:
authorKenneth Reitz <me@kennethreitz.org>2019-08-20 00:26:51 -0400
committerGitHub <noreply@github.com>2019-08-20 00:26:51 -0400
commit4bce5a0bc5d5fe33518daaed05c2f39add1bd9f4 (patch)
tree2875290a12c38b3583ba4533b2c528fa58cbc0ad /tests/test_utils.py
parent19cff44ec1b8eeec99459b504a681aa440f6344c (diff)
parent3e7d0a873f838e0001f7ac69b1987147128a7b5f (diff)
downloadpython-requests-4bce5a0bc5d5fe33518daaed05c2f39add1bd9f4.tar.gz
Merge branch 'master' into feature/strip-utf8-bom
Diffstat (limited to 'tests/test_utils.py')
-rw-r--r--tests/test_utils.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 027b26fb..ae517705 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -33,7 +33,8 @@ class TestSuperLen:
'stream, value', (
(StringIO.StringIO, 'Test'),
(BytesIO, b'Test'),
- pytest.mark.skipif('cStringIO is None')((cStringIO, 'Test')),
+ pytest.param(cStringIO, 'Test',
+ marks=pytest.mark.skipif('cStringIO is None')),
))
def test_io_streams(self, stream, value):
"""Ensures that we properly deal with different kinds of IO streams."""
@@ -398,7 +399,7 @@ def test_get_auth_from_url(url, auth):
),
))
def test_requote_uri_with_unquoted_percents(uri, expected):
- """See: https://github.com/requests/requests/issues/2356"""
+ """See: https://github.com/psf/requests/issues/2356"""
assert requote_uri(uri) == expected