Merge pull request #1503 from skastel/master

Fixing error return to be consistent with tuple return at the end of the method

diff --cc requests/models.py
Simple merge

diff --cc test_requests.py
index e62d923,40daaf9..714c32b
--- 1/test_requests.py
--- 2/test_requests.py
+++ b/test_requests.py
@@@ -10,9 -10,10 +10,10 @@@ import unittes
  import pickle
  
  import requests
+ import pytest
  from requests.auth import HTTPDigestAuth
  from requests.adapters import HTTPAdapter
 -from requests.compat import str, cookielib, getproxies, urljoin
 +from requests.compat import str, cookielib, getproxies, urljoin, urlparse
  from requests.cookies import cookiejar_from_dict
  from requests.exceptions import InvalidURL, MissingSchema
  from requests.structures import CaseInsensitiveDict