Merge commit 'eec4a96c5a1e64938a9af8' into temoto

openid · Jul 4, 2012 · e660b4b · e660b4b
2 parents 4cca5db + eec4a96
commit e660b4b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/openid/__init__.py b/openid/__init__.py
@@ -23,7 +23,7 @@
     and limitations under the License.
 """
 
-__version__ = '[library version:2.2.1]'[17:-1]
+__version__ = '[library version:2.2.5]'[17:-1]
 
 __all__ = [
     'association',

diff --git a/openid/fetchers.py b/openid/fetchers.py
@@ -93,7 +93,10 @@ def setDefaultFetcher(fetcher, wrap_exceptions=True):
 
 def usingCurl():
     """Whether the currently set HTTP fetcher is a Curl HTTP fetcher."""
-    return isinstance(getDefaultFetcher(), CurlHTTPFetcher)
+    fetcher = getDefaultFetcher()
+    if isinstance(fetcher, ExceptionWrappingFetcher):
+        fetcher = fetcher.fetcher
+    return isinstance(fetcher, CurlHTTPFetcher)
 
 class HTTPResponse(object):
     """XXX document attributes"""
@@ -319,7 +322,7 @@ def write_data(chunk):
                         return 0
                     else:
                         return data.write(chunk)
-                    
+
                 response_header_data = cStringIO.StringIO()
                 c.setopt(pycurl.WRITEFUNCTION, write_data)
                 c.setopt(pycurl.HEADERFUNCTION, response_header_data.write)