diff --git a/image_creator/kamaki_wrapper.py b/image_creator/kamaki_wrapper.py index e1f3a02efdf14d726ff605c2aea6ae9ad2d2f9fa..b8e3e6b4ebe03a3a34763897cab31faecbd8ac7f 100644 --- a/image_creator/kamaki_wrapper.py +++ b/image_creator/kamaki_wrapper.py @@ -75,8 +75,10 @@ class Kamaki(object): raise FatalError("Pithos client: %d %s" % \ (e.status, e.message)) try: - hash_cb = self.out.progress_gen(hp) if hp is not None else None - upload_cb = self.out.progress_gen(up) if up is not None else None + hash_cb = self.out.progress_generator(hp) \ + if hp is not None else None + upload_cb = self.out.progress_generator(up) \ + if up is not None else None self.pithos_client.create_object(remote_path, file_obj, size, hash_cb, upload_cb) return "pithos://%s/%s/%s" % \ diff --git a/image_creator/output.py b/image_creator/output.py index 0f33f6d6e47ef6e96852e2295a3705d62c804a85..fc3c42202c6c196d295debb68fd41bb224393faf 100644 --- a/image_creator/output.py +++ b/image_creator/output.py @@ -86,12 +86,10 @@ class Output(object): def success(self, result): sucess(result) - def progress_gen(self, message): - - progress = getattr(self, 'Progress') - + def progress_generator(self, message): def generator(n): - progressbar = progress(message, 'default') + progressbar = self.Progress(message, 'default') + progressbar.max = n for _ in range(n): yield