From cea72ddbc46f28730c10843bcd67a20ce0b339e2 Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Mon, 16 Jan 2017 00:51:40 +0900
Subject: [PATCH] Fix #3234: intersphinx failed for encoded inventories

---
 CHANGES                   | 1 +
 sphinx/ext/intersphinx.py | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/CHANGES b/CHANGES
index 222b7ade6..e883dc859 100644
--- a/CHANGES
+++ b/CHANGES
@@ -40,6 +40,7 @@ Bugs fixed
   :dudir:`parsed-literal` LaTeX output (ref #3342)
 * LaTeX writer: leave ``"`` character inside :dudir:`parsed-literal` as is
   (ref #3341)
+* #3234: intersphinx failed for encoded inventories
 
 
 Release 1.5.1 (released Dec 13, 2016)
diff --git a/sphinx/ext/intersphinx.py b/sphinx/ext/intersphinx.py
index ed37c083e..94b3e658a 100644
--- a/sphinx/ext/intersphinx.py
+++ b/sphinx/ext/intersphinx.py
@@ -29,6 +29,7 @@ from __future__ import print_function
 import time
 import zlib
 import codecs
+import functools
 import posixpath
 from os import path
 import re
@@ -164,6 +165,9 @@ def _read_from_url(url, config=None):
     r = requests.get(url, stream=True, config=config, timeout=config.intersphinx_timeout)
     r.raise_for_status()
     r.raw.url = r.url
+    # decode content-body based on the header.
+    # ref: https://github.com/kennethreitz/requests/issues/2155
+    r.raw.read = functools.partial(r.raw.read, decode_content=True)
     return r.raw