IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Refactor env.dependencies using defaultdict

Browse Source
This commit is contained in:
Takeshi KOMIYA 2016-12-17 23:49:35 +09:00
parent d8a420bd16
commit ffa6f5a8e9
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sphinx/environment/__init__.py
View File

@ -18,6 +18,7 @@ import codecs
import fnmatch import fnmatch
from os import path from os import path
from glob import glob from glob import glob
from collections import defaultdict
from six import iteritems, itervalues, class_types, next from six import iteritems, itervalues, class_types, next
from six.moves import cPickle as pickle from six.moves import cPickle as pickle
@ -176,7 +177,7 @@ class BuildEnvironment(object):
self.all_docs = {} # type: Dict[unicode, float] self.all_docs = {} # type: Dict[unicode, float]
# docname -> mtime at the time of reading # docname -> mtime at the time of reading
# contains all read docnames # contains all read docnames
self.dependencies = {} # type: Dict[unicode, Set[unicode]] self.dependencies = defaultdict(set) # type: Dict[unicode, Set[unicode]]
# docname -> set of dependent file # docname -> set of dependent file
# names, relative to documentation root # names, relative to documentation root
self.included = set() # type: Set[unicode] self.included = set() # type: Set[unicode]
@ -462,7 +463,7 @@ class BuildEnvironment(object):
self.config.language, self.config.language,
self.config.gettext_compact) self.config.gettext_compact)
for filename in catalog_files: for filename in catalog_files:
self.dependencies.setdefault(docname, set()).add(filename) self.dependencies[docname].add(filename)
def get_outdated_files(self, config_changed): def get_outdated_files(self, config_changed):
# type: (bool) -> Tuple[Set[unicode], Set[unicode], Set[unicode]] # type: (bool) -> Tuple[Set[unicode], Set[unicode], Set[unicode]]
@ -497,7 +498,7 @@ class BuildEnvironment(object):
changed.add(docname) changed.add(docname)
continue continue
# finally, check the mtime of dependencies # finally, check the mtime of dependencies
for dep in self.dependencies.get(docname, ()): for dep in self.dependencies[docname]:
try: try:
# this will do the right thing when dep is absolute too # this will do the right thing when dep is absolute too
deppath = path.join(self.srcdir, dep) deppath = path.join(self.srcdir, dep)
@ -844,7 +845,7 @@ class BuildEnvironment(object):
*filename* should be absolute or relative to the source directory. *filename* should be absolute or relative to the source directory.
""" """
self.dependencies.setdefault(self.docname, set()).add(filename) self.dependencies[self.docname].add(filename)
def note_included(self, filename): def note_included(self, filename):
# type: (unicode) -> None # type: (unicode) -> None
@ -887,7 +888,7 @@ class BuildEnvironment(object):
dep = dep.decode(fs_encoding) dep = dep.decode(fs_encoding)
relpath = relative_path(frompath, relpath = relative_path(frompath,
path.normpath(path.join(cwd, dep))) path.normpath(path.join(cwd, dep)))
self.dependencies.setdefault(docname, set()).add(relpath) self.dependencies[docname].add(relpath)
def process_downloads(self, docname, doctree): def process_downloads(self, docname, doctree):
# type: (unicode, nodes.Node) -> None # type: (unicode, nodes.Node) -> None
@ -895,7 +896,7 @@ class BuildEnvironment(object):
for node in doctree.traverse(addnodes.download_reference): for node in doctree.traverse(addnodes.download_reference):
targetname = node['reftarget'] targetname = node['reftarget']
rel_filename, filename = self.relfn2path(targetname, docname) rel_filename, filename = self.relfn2path(targetname, docname)
self.dependencies.setdefault(docname, set()).add(rel_filename) self.dependencies[docname].add(rel_filename)
if not os.access(filename, os.R_OK): if not os.access(filename, os.R_OK):
self.warn_node('download file not readable: %s' % filename, self.warn_node('download file not readable: %s' % filename,
node) node)
@ -962,7 +963,7 @@ class BuildEnvironment(object):
# map image paths to unique image names (so that they can be put # map image paths to unique image names (so that they can be put
# into a single directory) # into a single directory)
for imgpath in itervalues(candidates): for imgpath in itervalues(candidates):
self.dependencies.setdefault(docname, set()).add(imgpath) self.dependencies[docname].add(imgpath)
if not os.access(path.join(self.srcdir, imgpath), os.R_OK): if not os.access(path.join(self.srcdir, imgpath), os.R_OK):
self.warn_node('image file not readable: %s' % imgpath, self.warn_node('image file not readable: %s' % imgpath,
node) node)