From c0cb698191061630ae8df56ddda660c470bf70e0 Mon Sep 17 00:00:00 2001 From: Ian Cordasco Date: Tue, 23 Jul 2013 10:48:45 -0500 Subject: [PATCH] Derp. Use compat --- test_requests.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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): -- 2.7.4