openstack/deb-python-requestbuilder
Code Issues Proposed changes

Merge branch 'maint-0.3'

Browse Source 
Conflicts:
	requestbuilder/__init__.py
This commit is contained in:
Garrett Holmstrom
2015-07-28 16:38:33 -07:00
parent addd4ea645 d5db69cc84
commit 88a298b0d2
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
requestbuilder/mixins/progress.py
View File

@@ -36,17 +36,19 @@ if 'progressbar' in sys.modules:
default=sys.stdout.isatty(), route_to=None, help='''do not
show progress (the default when run non-interactively)'''),
Arg('--porcelain', dest='show_porcelain', action='store_true',
route_to=None, help='show machine-readable progress'))]
route_to=None, help=argparse.SUPPRESS))]
else:
# Keep them around so scripts don't break, but make them non-functional
#
# This isn't in a MutuallyExclusiveArgList because of an argparse bug:
# http://bugs.python.org/issue17890
_PROGRESS_BAR_COMMAND_ARGS = [
MutuallyExclusiveArgList(
Arg('--progress', dest='show_progress', action='store_false',
default=False, route_to=None, help=argparse.SUPPRESS),
Arg('--no-progress', dest='show_progress', action='store_false',
default=False, route_to=None, help=argparse.SUPPRESS),
Arg('--porcelain', dest='show_porcelain', action='store_true',
route_to=None, help='show machine-readable progress'))]
Arg('--progress', dest='show_progress', action='store_false',
default=False, route_to=None, help=argparse.SUPPRESS),
Arg('--no-progress', dest='show_progress', action='store_false',
default=False, route_to=None, help=argparse.SUPPRESS),
Arg('--porcelain', dest='show_porcelain', action='store_true',
route_to=None, help=argparse.SUPPRESS)]
class FileTransferProgressBarMixin(object):