Revision 5bfe1cda kamaki/cli/commands/pithos_cli.py
b/kamaki/cli/commands/pithos_cli.py | ||
---|---|---|
46 | 46 |
from time import localtime, strftime, strptime, mktime |
47 | 47 |
from datetime import datetime as dtm |
48 | 48 |
|
49 |
from progress.bar import IncrementalBar |
|
49 |
try: |
|
50 |
from progress.bar import IncrementalBar |
|
51 |
except ImportError: |
|
52 |
print('Warning: progress package not installed') |
|
50 | 53 |
|
51 | 54 |
#Argument functionality |
52 | 55 |
class DelimiterArgument(ValueArgument): |
... | ... | |
84 | 87 |
def __init__(self, help='', parsed_name='', default=True): |
85 | 88 |
self.suffix = '%(percent)d%%' |
86 | 89 |
super(ProgressBarArgument, self).__init__(help, parsed_name, default) |
87 |
self.bar = IncrementalBar() |
|
90 |
try: |
|
91 |
self.bar = IncrementalBar() |
|
92 |
except NameError: |
|
93 |
print('Waring: no progress bar functionality') |
|
88 | 94 |
|
89 | 95 |
@property |
90 | 96 |
def value(self): |
... | ... | |
467 | 473 |
super(self.__class__, self).main(container___path, path_is_optional=False) |
468 | 474 |
try: |
469 | 475 |
f = open(local_path, 'r') |
470 |
upload_cb = self.arguments['progress_bar'].get_generator('Appending blocks') |
|
476 |
try: |
|
477 |
upload_cb = self.arguments['progress_bar'].get_generator('Appending blocks') |
|
478 |
except Exception: |
|
479 |
upload_cb=None |
|
471 | 480 |
self.client.append_object(object=self.path, source_file = f, upload_cb = upload_cb) |
472 | 481 |
except ClientError as err: |
473 | 482 |
raiseCLIError(err) |
... | ... | |
496 | 505 |
super(self.__class__, self).main(container___path, path_is_optional=False) |
497 | 506 |
try: |
498 | 507 |
f = open(local_path, 'r') |
499 |
upload_cb = self.arguments['progress_bar'].get_generator('Overwritting blocks') |
|
508 |
try: |
|
509 |
upload_cb = self.arguments['progress_bar'].get_generator('Overwritting blocks') |
|
510 |
except Exception: |
|
511 |
upload_cb = None |
|
500 | 512 |
self.client.overwrite_object(object=self.path, start=start, end=end, |
501 | 513 |
source_file=f, upload_cb = upload_cb) |
502 | 514 |
except ClientError as err: |
Also available in: Unified diff