Revision 67083ca0
b/kamaki/cli/argument/__init__.py | ||
---|---|---|
41 | 41 |
from logging import getLogger |
42 | 42 |
from argparse import ArgumentParser, ArgumentError |
43 | 43 |
from argparse import RawDescriptionHelpFormatter |
44 |
|
|
45 |
try: |
|
46 |
from progress.bar import ShadyBar as KamakiProgressBar |
|
47 |
except ImportError: |
|
48 |
try: |
|
49 |
from progress.bar import Bar as KamakiProgressBar |
|
50 |
except ImportError: |
|
51 |
pass |
|
52 |
# progress not installed - pls, pip install progress |
|
53 |
pass |
|
44 |
from progress.bar import ShadyBar as KamakiProgressBar |
|
54 | 45 |
|
55 | 46 |
log = getLogger(__name__) |
56 | 47 |
|
... | ... | |
320 | 311 |
def __init__(self, help='', parsed_name='', default=True): |
321 | 312 |
self.suffix = '%(percent)d%%' |
322 | 313 |
super(ProgressBarArgument, self).__init__(help, parsed_name, default) |
323 |
try: |
|
324 |
KamakiProgressBar |
|
325 |
except NameError: |
|
326 |
log.warning('WARNING: no progress bar functionality') |
|
327 | 314 |
|
328 | 315 |
def clone(self): |
329 | 316 |
"""Get a modifiable copy of this bar""" |
b/kamaki/cli/commands/errors.py | ||
---|---|---|
367 | 367 |
about_image_id = [ |
368 | 368 |
'How to pick a suitable image:', |
369 | 369 |
'* get a list of image ids: /image list', |
370 |
'* details of image: /flavor info <image id>']
|
|
370 |
'* details of image: /image meta <image id>']
|
|
371 | 371 |
|
372 | 372 |
@classmethod |
373 | 373 |
def connection(this, foo): |
b/kamaki/cli/utils.py | ||
---|---|---|
51 | 51 |
try: |
52 | 52 |
from colors import magenta, red, yellow, bold |
53 | 53 |
except ImportError: |
54 |
# No colours? No worries, use dummy foo instead |
|
55 | 54 |
def dummy(val): |
56 | 55 |
return val |
57 | 56 |
red = yellow = magenta = bold = dummy |
58 |
#from kamaki.cli import _colors |
|
59 |
#if _colors.lower() == 'on': |
|
60 | 57 |
suggest['ansicolors']['active'] = True |
61 | 58 |
|
62 |
try: |
|
63 |
from progress.bar import ShadyBar |
|
64 |
except ImportError: |
|
65 |
suggest['progress']['active'] = True |
|
66 |
|
|
67 | 59 |
|
68 | 60 |
def suggest_missing(miss=None, exclude=[]): |
69 | 61 |
global suggest |
Also available in: Unified diff