From: Ian Cordasco Date: Tue, 23 Jul 2013 15:48:45 +0000 (-0500) Subject: Derp. Use compat X-Git-Tag: 2.0~10^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c0cb698191061630ae8df56ddda660c470bf70e0;p=services%2Fpython-requests.git Derp. Use compat --- diff --git a/test_requests.py b/test_requests.py index 6b676f0..27d5e67 100755 --- a/test_requests.py +++ b/test_requests.py @@ -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):