Derp. Use compat
authorIan Cordasco <graffatcolmingov@gmail.com>
Tue, 23 Jul 2013 15:48:45 +0000 (10:48 -0500)
committerIan Cordasco <graffatcolmingov@gmail.com>
Tue, 23 Jul 2013 15:48:45 +0000 (10:48 -0500)
test_requests.py

index 6b676f0cd711bfede9a5d34c9d29e79293ab22a2..27d5e676e098b8776c846acf649864dd60267c17 100755 (executable)
@@ -8,12 +8,11 @@ import json
 import os
 import unittest
 import pickle
-import urlparse
 
 import requests
 from requests.auth import HTTPDigestAuth
 from requests.adapters import HTTPAdapter
-from requests.compat import str, cookielib, getproxies
+from requests.compat import str, cookielib, getproxies, urljoin
 from requests.cookies import cookiejar_from_dict
 from requests.exceptions import InvalidURL, MissingSchema
 from requests.structures import CaseInsensitiveDict
@@ -30,7 +29,7 @@ HTTPBIN = HTTPBIN.rstrip('/') + '/'
 
 def httpbin(*suffix):
     """Returns url for HTTPBIN resource."""
-    return urlparse.urljoin(HTTPBIN, '/'.join(suffix))
+    return urljoin(HTTPBIN, '/'.join(suffix))
 
 
 class RequestsTestCase(unittest.TestCase):