Skip to content

Commit

Permalink
tests unicode -> str
Browse files Browse the repository at this point in the history
  • Loading branch information
@ifduyue
ifduyue committed Aug 11, 2023
1 parent a74052d commit e68531c
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 20 deletions.
14 changes: 7 additions & 7 deletions tests/test_post.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def test_fetch(self):

self.assertEqual(r.status, 200)
self.assertTrue(isinstance(r.json, dict))
self.assertTrue(isinstance(r.text, urlfetch.unicode))
self.assertTrue(isinstance(r.text, str))
self.assertEqual(o['method'], 'POST')
self.assertEqual(o['post'], d)

Expand All @@ -34,7 +34,7 @@ def test_post(self):

self.assertEqual(r.status, 200)
self.assertTrue(isinstance(r.json, dict))
self.assertTrue(isinstance(r.text, urlfetch.unicode))
self.assertTrue(isinstance(r.text, str))
self.assertEqual(o['method'], 'POST')
self.assertEqual(o['post'], d)

Expand All @@ -50,7 +50,7 @@ def test_post_query_string(self):

self.assertEqual(r.status, 200)
self.assertTrue(isinstance(r.json, dict))
self.assertTrue(isinstance(r.text, urlfetch.unicode))
self.assertTrue(isinstance(r.text, str))
self.assertEqual(o['method'], 'POST')
self.assertEqual(o['post'], d)
self.assertEqual(o['get'], qs)
Expand All @@ -77,7 +77,7 @@ def test_file_upload(self):

self.assertEqual(r.status, 200)
self.assertTrue(isinstance(r.json, dict))
self.assertTrue(isinstance(r.text, urlfetch.unicode))
self.assertTrue(isinstance(r.text, str))
self.assertEqual(o['method'], 'POST')
self.assertEqual(sorted(o['files'].keys()), sorted(files.keys()))

Expand Down Expand Up @@ -111,7 +111,7 @@ def test_file_upload_multipart(self):

self.assertEqual(r.status, 200)
self.assertTrue(isinstance(r.json, dict))
self.assertTrue(isinstance(r.text, urlfetch.unicode))
self.assertTrue(isinstance(r.text, str))
self.assertEqual(o['method'], 'POST')
self.assertEqual(o['post'], data)
self.assertEqual(sorted(o['files'].keys()), sorted(files.keys()))
Expand All @@ -138,7 +138,7 @@ def test_one_file_upload(self):

self.assertEqual(r.status, 200)
self.assertTrue(isinstance(r.json, dict))
self.assertTrue(isinstance(r.text, urlfetch.unicode))
self.assertTrue(isinstance(r.text, str))
self.assertEqual(o['method'], 'POST')
self.assertEqual(sorted(o['files'].keys()), sorted(files.keys()))
for i in files:
Expand All @@ -160,7 +160,7 @@ def test_one_file_upload_gbk(self):

self.assertEqual(r.status, 200)
self.assertTrue(isinstance(r.json, dict))
self.assertTrue(isinstance(r.text, urlfetch.unicode))
self.assertTrue(isinstance(r.text, str))
self.assertEqual(o['method'], 'POST')
self.assertEqual(sorted(o['files'].keys()), sorted(files.keys()))
for i in files:
Expand Down
4 changes: 2 additions & 2 deletions tests/test_proxy.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ def test_get_via_proxy(self):
resp = urlfetch.get('http://www.example.com', proxies={'http':proxy})
self.assertEqual(resp.status, 200)
self.assertTrue(isinstance(resp.json, dict))
self.assertTrue(isinstance(resp.text, urlfetch.unicode))
self.assertTrue(isinstance(resp.text, str))

proxy = proxy.split('://', 1)[1]
resp = urlfetch.get('http://www.example.com', proxies={'http':proxy})
self.assertEqual(resp.status, 200)
self.assertTrue(isinstance(resp.json, dict))
self.assertTrue(isinstance(resp.text, urlfetch.unicode))
self.assertTrue(isinstance(resp.text, str))


if __name__ == '__main__':
Expand Down
22 changes: 11 additions & 11 deletions tests/test_session.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def test_session_fetch(self):

self.assertEqual(r.status, 200)
self.assertTrue(isinstance(r.json, dict))
self.assertTrue(isinstance(r.text, urlfetch.unicode))
self.assertTrue(isinstance(r.text, str))
self.assertEqual(o['method'], 'GET')
self.assertEqual(r.reqheaders[headerpair[0]], headerpair[1])
self.assertEqual(r.reqheaders['Cookie'], '='.join(cookiepair))
Expand All @@ -71,7 +71,7 @@ def test_session_get(self):

self.assertEqual(r.status, 200)
self.assertTrue(isinstance(r.json, dict))
self.assertTrue(isinstance(r.text, urlfetch.unicode))
self.assertTrue(isinstance(r.text, str))
self.assertEqual(o['method'], 'GET')
self.assertEqual(r.reqheaders[headerpair[0]], headerpair[1])
self.assertEqual(r.reqheaders['Cookie'], '='.join(cookiepair))
Expand All @@ -85,7 +85,7 @@ def test_session_fragment(self):

self.assertEqual(r.status, 200)
self.assertTrue(isinstance(r.json, dict))
self.assertTrue(isinstance(r.text, urlfetch.unicode))
self.assertTrue(isinstance(r.text, str))
self.assertEqual(o['method'], 'GET')
self.assertEqual(r.reqheaders[headerpair[0]], headerpair[1])
self.assertEqual(r.reqheaders['Cookie'], '='.join(cookiepair))
Expand All @@ -102,7 +102,7 @@ def test_session_query_string(self):

self.assertEqual(r.status, 200)
self.assertTrue(isinstance(r.json, dict))
self.assertTrue(isinstance(r.text, urlfetch.unicode))
self.assertTrue(isinstance(r.text, str))
self.assertEqual(o['method'], 'GET')
self.assertEqual(r.reqheaders[headerpair[0]], headerpair[1])
self.assertEqual(r.reqheaders['Cookie'], '='.join(cookiepair))
Expand All @@ -112,7 +112,7 @@ def test_session_query_string(self):

self.assertEqual(r.status, 200)
self.assertTrue(isinstance(r.json, dict))
self.assertTrue(isinstance(r.text, urlfetch.unicode))
self.assertTrue(isinstance(r.text, str))
self.assertEqual(o['method'], 'GET')
self.assertEqual(r.reqheaders[headerpair[0]], headerpair[1])
self.assertEqual(r.reqheaders['Cookie'], '='.join(cookiepair))
Expand All @@ -131,7 +131,7 @@ def test_session_fragment_query_string(self):

self.assertEqual(r.status, 200)
self.assertTrue(isinstance(r.json, dict))
self.assertTrue(isinstance(r.text, urlfetch.unicode))
self.assertTrue(isinstance(r.text, str))
self.assertEqual(o['method'], 'GET')
self.assertEqual(r.reqheaders[headerpair[0]], headerpair[1])
self.assertEqual(r.reqheaders['Cookie'], '='.join(cookiepair))
Expand All @@ -141,7 +141,7 @@ def test_session_fragment_query_string(self):

self.assertEqual(r.status, 200)
self.assertTrue(isinstance(r.json, dict))
self.assertTrue(isinstance(r.text, urlfetch.unicode))
self.assertTrue(isinstance(r.text, str))
self.assertEqual(o['method'], 'GET')
self.assertEqual(r.reqheaders[headerpair[0]], headerpair[1])
self.assertEqual(r.reqheaders['Cookie'], '='.join(cookiepair))
Expand All @@ -157,7 +157,7 @@ def test_session_basic_auth(self):

self.assertEqual(r.status, 200)
self.assertTrue(isinstance(r.json, dict))
self.assertTrue(isinstance(r.text, urlfetch.unicode))
self.assertTrue(isinstance(r.text, str))
self.assertEqual(o['method'], 'GET')
self.assertEqual(r.reqheaders[headerpair[0]], headerpair[1])
self.assertEqual(r.reqheaders['Cookie'], '='.join(cookiepair))
Expand All @@ -171,7 +171,7 @@ def test_session_fragment_basic_auth(self):

self.assertEqual(r.status, 200)
self.assertTrue(isinstance(r.json, dict))
self.assertTrue(isinstance(r.text, urlfetch.unicode))
self.assertTrue(isinstance(r.text, str))
self.assertEqual(o['method'], 'GET')
self.assertEqual(r.reqheaders[headerpair[0]], headerpair[1])
self.assertEqual(r.reqheaders['Cookie'], '='.join(cookiepair))
Expand All @@ -188,7 +188,7 @@ def test_session_basic_auth_query_string(self):

self.assertEqual(r.status, 200)
self.assertTrue(isinstance(r.json, dict))
self.assertTrue(isinstance(r.text, urlfetch.unicode))
self.assertTrue(isinstance(r.text, str))
self.assertEqual(o['method'], 'GET')
self.assertEqual(r.reqheaders[headerpair[0]], headerpair[1])
self.assertEqual(r.reqheaders['Cookie'], '='.join(cookiepair))
Expand All @@ -207,7 +207,7 @@ def test_session_fragment_basic_auth_query_string(self):

self.assertEqual(r.status, 200)
self.assertTrue(isinstance(r.json, dict))
self.assertTrue(isinstance(r.text, urlfetch.unicode))
self.assertTrue(isinstance(r.text, str))
self.assertEqual(o['method'], 'GET')
self.assertEqual(r.reqheaders[headerpair[0]], headerpair[1])
self.assertEqual(r.reqheaders['Cookie'], '='.join(cookiepair))
Expand Down

0 comments on commit e68531c

Please sign in to comment.