From: Kenneth Reitz <me@kennethreitz.com>
Date: Tue, 24 Sep 2013 17:48:07 +0000 (-0700)
Subject: Merge pull request #1503 from skastel/master
X-Git-Tag: v2.0~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=23ced527f7c66747b92ed11405baec2cef47c27b;p=services%2Fpython-requests.git

Merge pull request #1503 from skastel/master

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

23ced527f7c66747b92ed11405baec2cef47c27b
diff --cc test_requests.py
index e62d923,40daaf9..714c32b
--- a/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