Lukasz Balcerzak  committed 0decb91 Merge

Merge branch 'master' of

  • Participants
  • Parent commits c774d3e, 8d4edb6

Comments (0)

Files changed (1)

File vcs/utils/

 import re
 import difflib
 import logging
+import itertools
 from difflib import unified_diff
-from itertools import imap
 from vcs.exceptions import VCSError
 from vcs.nodes import FileNode, NodeError
 from vcs.utils import safe_unicode
         elif self.__format == 'gitdiff':
             udiff_copy = self.copy_iterator()
-            self.lines = imap(self.escaper, self._parse_gitdiff(udiff_copy))
+            self.lines = itertools.imap(self.escaper,
+                                        self._parse_gitdiff(udiff_copy))
             udiff_copy = self.copy_iterator()
-            self.lines = imap(self.escaper, udiff_copy)
+            self.lines = itertools.imap(self.escaper, udiff_copy)
         # Select a differ.
         if differ == 'difflib':
         an original as it's needed for repeating operations on
         this instance of DiffProcessor
-        self.__udiff, iterator_copy = tee(self.__udiff)
+        self.__udiff, iterator_copy = itertools.tee(self.__udiff)
         return iterator_copy
     def _extract_rev(self, line1, line2):