summaryrefslogtreecommitdiff
path: root/sphinx/versioning.py
diff options
context:
space:
mode:
authorDasIch <dasdasich@gmail.com>2010-08-12 03:09:03 +0200
committerDasIch <dasdasich@gmail.com>2010-08-12 03:09:03 +0200
commit4fa32b0140331f06549ef9f8b50e4641fb2ef235 (patch)
tree779ba34901c2c2909b858dd2a9dda3090680b1b9 /sphinx/versioning.py
parent9b0e61e9b6f13d10417ee376e18f6d290da01c53 (diff)
downloadsphinx-4fa32b0140331f06549ef9f8b50e4641fb2ef235.tar.gz
Fixed NameError introduced by last changeset
Diffstat (limited to 'sphinx/versioning.py')
-rw-r--r--sphinx/versioning.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sphinx/versioning.py b/sphinx/versioning.py
index ef8effab..d0ea18a7 100644
--- a/sphinx/versioning.py
+++ b/sphinx/versioning.py
@@ -12,7 +12,7 @@
from uuid import uuid4
from itertools import product
try:
- from itertools import izip_longest
+ from itertools import izip_longest as zip_longest
except ImportError:
from itertools import zip_longest
from difflib import SequenceMatcher
@@ -62,7 +62,7 @@ def merge_doctrees(old, new, condition):
new_iter = PeekableIterator(new.traverse(condition))
old_nodes = []
new_nodes = []
- for old_node, new_node in izip_longest(old_iter, new_iter):
+ for old_node, new_node in zip_longest(old_iter, new_iter):
if old_node is None:
new_nodes.append(new_node)
continue