Merge pull request #866 from cgohlke/patch-2

mdboom · mdboom · commit decc3172afb2 · 2012-05-14T11:08:17.000-07:00
Fix addinfourl call on Py3
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -37,7 +37,7 @@ def addinfourl(data, headers, url, code=None):
     def urllib_quote():
         return urllib2.quote
     def addinfourl(data, headers, url, code=None):
-        return urllib2.addinfourl(io.StringIO(data),
+        return urllib2.addinfourl(io.BytesIO(data),
                                   headers, url, code)
     urllib_HTTPSHandler = urllib2.HTTPSHandler
     urllib_build_opener = urllib2.build_opener
@@ -639,7 +639,7 @@ def https_response(self, req, response):
             else:
                 data = response.read()
                 self.cache_file(req.get_full_url(), data, response.headers)
-                result = addinfourl(StringIO.StringIO(data),
+                result = addinfourl(data,
                                     response.headers,
                                     req.get_full_url())
                 result.code = response.code
