From cd87430772601f135a7b9109c5d46b58bac9fc9e Mon Sep 17 00:00:00 2001 From: Julien Schueller Date: Sat, 10 Jun 2017 09:18:39 +0200 Subject: [PATCH] Use sphinx 1.6.2 (#65) --- setup.py | 2 +- src/doc2dash/parsers/intersphinx.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index ae80d04..0920929 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ NAME = "doc2dash" INSTALL_REQUIRES = [ - "Sphinx==1.4.6", + "Sphinx==1.6.2", "attrs==16.2.0", "beautifulsoup4==4.5.1", "click==6.6", diff --git a/src/doc2dash/parsers/intersphinx.py b/src/doc2dash/parsers/intersphinx.py index 1780bcb..c9883e5 100644 --- a/src/doc2dash/parsers/intersphinx.py +++ b/src/doc2dash/parsers/intersphinx.py @@ -6,7 +6,7 @@ import attr from six import iteritems -from sphinx.ext.intersphinx import read_inventory_v2 +from sphinx.ext.intersphinx import InventoryFile from zope.interface import implementer from . import types @@ -68,9 +68,8 @@ def parse(self): yield `ParserEntry`s. """ with open(os.path.join(self.doc_path, "objects.inv"), "rb") as inv_f: - inv_f.readline() # skip version line that is verified in detection for pe in self._inv_to_entries( - read_inventory_v2(inv_f, "", os.path.join) + InventoryFile.load(inv_f, "", os.path.join) ): # this is what Guido gave us `yield from` for :-| yield pe