diff options
| author | Takayuki Shimizukawa <shimizukawa@gmail.com> | 2014-04-29 11:46:47 +0900 |
|---|---|---|
| committer | Takayuki Shimizukawa <shimizukawa@gmail.com> | 2014-04-29 11:46:47 +0900 |
| commit | 68290a266cea33cf0b60bed425b5e89d1032e7d1 (patch) | |
| tree | 629a54150044a6d588bcf8e740e13d65c50178ee /sphinx/versioning.py | |
| parent | 1e4b390b226c856d8c80d1d9857696b7fbcd2580 (diff) | |
| download | sphinx-git-68290a266cea33cf0b60bed425b5e89d1032e7d1.tar.gz | |
introduce the six module and reduce sphinx.util.pycompat implementation. refs #1350.
Diffstat (limited to 'sphinx/versioning.py')
| -rw-r--r-- | sphinx/versioning.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sphinx/versioning.py b/sphinx/versioning.py index a41de0f09..8cc618e8d 100644 --- a/sphinx/versioning.py +++ b/sphinx/versioning.py @@ -13,7 +13,7 @@ from uuid import uuid4 from operator import itemgetter from itertools import product -from sphinx.util.pycompat import zip_longest +import six # anything below that ratio is considered equal/changed @@ -52,7 +52,7 @@ def merge_doctrees(old, new, condition): ratios = {} seen = set() # compare the nodes each doctree in order - for old_node, new_node in zip_longest(old_iter, new_iter): + for old_node, new_node in six.moves.zip_longest(old_iter, new_iter): if old_node is None: new_nodes.append(new_node) continue |