From c0810c29f5a70c82d30f5ce6521391a506d1121e Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 8 Nov 2010 10:59:33 +0100 Subject: Avoid file_iter, use iter_files instead. file_iter should ideally be made private. --- fastimport/processor.py | 2 +- fastimport/processors/info_processor.py | 2 +- fastimport/processors/query_processor.py | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/fastimport/processor.py b/fastimport/processor.py index 4ddca7b..2455b4d 100644 --- a/fastimport/processor.py +++ b/fastimport/processor.py @@ -149,7 +149,7 @@ class CommitHandler(object): def process(self): self.pre_process_files() - for fc in self.command.file_iter(): + for fc in self.command.iter_files(): try: handler = self.__class__.__dict__[fc.name[4:] + "_handler"] except KeyError: diff --git a/fastimport/processors/info_processor.py b/fastimport/processors/info_processor.py index 0f96992..d35aaff 100644 --- a/fastimport/processors/info_processor.py +++ b/fastimport/processors/info_processor.py @@ -192,7 +192,7 @@ class InfoProcessor(processor.ImportProcessor): self.committers.add(cmd.committer) if cmd.author is not None: self.separate_authors_found = True - for fc in cmd.file_iter(): + for fc in cmd.iter_files(): self.file_cmd_counts[fc.name] += 1 if isinstance(fc, commands.FileModifyCommand): if fc.mode & 0111: diff --git a/fastimport/processors/query_processor.py b/fastimport/processors/query_processor.py index 76250e5..fd9695c 100644 --- a/fastimport/processors/query_processor.py +++ b/fastimport/processors/query_processor.py @@ -77,8 +77,7 @@ class QueryProcessor(processor.ImportProcessor): def commit_handler(self, cmd): """Process a CommitCommand.""" - for fc in cmd.file_iter(): - pass + pass def reset_handler(self, cmd): """Process a ResetCommand.""" -- cgit v1.2.1