summaryrefslogtreecommitdiff
path: root/tests/test_utils.py
diff options
context:
space:
mode:
authorKenneth Reitz <me@kennethreitz.org>2018-03-12 11:45:29 -0400
committerKenneth Reitz <me@kennethreitz.org>2018-03-12 11:45:29 -0400
commit4e76e142d11229a4511086e09cefb33adab28325 (patch)
treeb42196d1f091bf50eb366c24cc7bae93fc531aec /tests/test_utils.py
parentd207c345968857d488ed573b56b8ea20cc0d41de (diff)
downloadpython-requests-threedotoh.tar.gz
working on itthreedotoh
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
Diffstat (limited to 'tests/test_utils.py')
-rw-r--r--tests/test_utils.py23
1 files changed, 6 insertions, 17 deletions
diff --git a/tests/test_utils.py b/tests/test_utils.py
index e7d32384..44f9b2c0 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -16,21 +16,20 @@ from requests.utils import (
is_valid_cidr, iter_slices, parse_dict_header,
parse_header_links, prepend_scheme_if_needed,
requote_uri, select_proxy, should_bypass_proxies, super_len,
- to_key_val_list, to_native_string,
+ to_key_val_list,
unquote_header_value, unquote_unreserved,
urldefragauth, add_dict_to_cookiejar, set_environ)
from requests._internal_utils import unicode_is_ascii
-from .compat import StringIO, cStringIO
+from io import StringIO
class TestSuperLen:
@pytest.mark.parametrize(
'stream, value', (
- (StringIO.StringIO, 'Test'),
- (BytesIO, b'Test'),
- pytest.mark.skipif('cStringIO is None')((cStringIO, 'Test')),
+ (StringIO, 'Test'),
+ (BytesIO, b'Test')
))
def test_io_streams(self, stream, value):
"""Ensures that we properly deal with different kinds of IO streams."""
@@ -39,7 +38,7 @@ class TestSuperLen:
def test_super_len_correctly_calculates_len_of_partially_read_file(self):
"""Ensure that we handle partially consumed file like objects."""
- s = StringIO.StringIO()
+ s = StringIO()
s.write('foobarbogus')
assert super_len(s) == 0
@@ -95,7 +94,7 @@ class TestSuperLen:
assert super_len(LenFile()) == 5
def test_super_len_with_tell(self):
- foo = StringIO.StringIO('12345')
+ foo = StringIO('12345')
assert super_len(foo) == 5
foo.read(2)
assert super_len(foo) == 3
@@ -517,16 +516,6 @@ def test_prepend_scheme_if_needed(value, expected):
@pytest.mark.parametrize(
- 'value, expected', (
- ('T', 'T'),
- (b'T', 'T'),
- (u'T', 'T'),
- ))
-def test_to_native_string(value, expected):
- assert to_native_string(value) == expected
-
-
-@pytest.mark.parametrize(
'url, expected', (
('http://u:p@example.com/path?a=1#test', 'http://example.com/path?a=1'),
('http://example.com/path', 'http://example.com/path'),