From 635c8eb417ed7f4d75cd6892b741d6b7e7bd07d2 Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Tue, 8 Mar 2016 15:44:23 +0900
Subject: [PATCH] Fix unpack warning if combinated with 3rd party domain
 extensions

---
 CHANGES               |  1 +
 sphinx/environment.py | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index a709f859d..040f8b682 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,7 @@ Bugs fixed
 
 Documentation
 -------------
+* Fix unpack warning if combinated with 3rd party domain extensions.
 
 Release 1.4 beta1 (released Mar 6, 2016)
 ========================================
diff --git a/sphinx/environment.py b/sphinx/environment.py
index 20e878414..ea6cde117 100644
--- a/sphinx/environment.py
+++ b/sphinx/environment.py
@@ -1063,13 +1063,18 @@ class BuildEnvironment:
         entries = self.indexentries[docname] = []
         for node in document.traverse(addnodes.index):
             try:
-                for type, value, tid, main, index_key in node['entries']:
-                    split_index_msg(type, value)
+                for entry in node['entries']:
+                    split_index_msg(entry[0], entry[1])
             except ValueError as exc:
                 self.warn_node(exc, node)
                 node.parent.remove(node)
             else:
-                entries.extend(node['entries'])
+                for entry in node['entries']:
+                    if len(entry) == 5:
+                        # Since 1.4: new index structure including index_key (5th column)
+                        entries.append(entry)
+                    else:
+                        entries.append(entry + (None,))
 
     def note_citations_from(self, docname, document):
         for node in document.traverse(nodes.citation):