openstack/swift
Code Issues Proposed changes

Merge "Remove blank space after print"

Browse Source
This commit is contained in:
Jenkins
2014-02-28 09:07:36 +00:00
committed by Gerrit Code Review
parent 076634e23c dc5c5fb401
commit 98ddc1e2f1
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
swift/cli/ringbuilder.py
View File

@@ -620,11 +620,11 @@ swift-ring-builder <builder_file> rebalance <seed>
parts, balance = builder.rebalance(seed=get_seed(3)) parts, balance = builder.rebalance(seed=get_seed(3))
except exceptions.RingBuilderError as e: except exceptions.RingBuilderError as e:
print '-' * 79 print '-' * 79
print ("An error has occurred during ring validation. Common\n" print("An error has occurred during ring validation. Common\n"
"causes of failure are rings that are empty or do not\n" "causes of failure are rings that are empty or do not\n"
"have enough devices to accommodate the replica count.\n" "have enough devices to accommodate the replica count.\n"
"Original exception message:\n %s" % e.message "Original exception message:\n %s" % e.message
) )
print '-' * 79 print '-' * 79
exit(EXIT_ERROR) exit(EXIT_ERROR)
if not parts: if not parts:
@@ -645,11 +645,11 @@ swift-ring-builder <builder_file> rebalance <seed>
builder.validate() builder.validate()
except exceptions.RingValidationError as e: except exceptions.RingValidationError as e:
print '-' * 79 print '-' * 79
print ("An error has occurred during ring validation. Common\n" print("An error has occurred during ring validation. Common\n"
"causes of failure are rings that are empty or do not\n" "causes of failure are rings that are empty or do not\n"
"have enough devices to accommodate the replica count.\n" "have enough devices to accommodate the replica count.\n"
"Original exception message:\n %s" % e.message "Original exception message:\n %s" % e.message
) )
print '-' * 79 print '-' * 79
exit(EXIT_ERROR) exit(EXIT_ERROR)
print 'Reassigned %d (%.02f%%) partitions. Balance is now %.02f.' % \ print 'Reassigned %d (%.02f%%) partitions. Balance is now %.02f.' % \
@@ -823,9 +823,9 @@ def main(arguments=None):
for line in wrap(' '.join(cmds), 79, initial_indent='Quick list: ', for line in wrap(' '.join(cmds), 79, initial_indent='Quick list: ',
subsequent_indent=' '): subsequent_indent=' '):
print line print line
print ('Exit codes: 0 = operation successful\n' print('Exit codes: 0 = operation successful\n'
' 1 = operation completed with warnings\n' ' 1 = operation completed with warnings\n'
' 2 = error') ' 2 = error')
exit(EXIT_SUCCESS) exit(EXIT_SUCCESS)
builder_file, ring_file = parse_builder_ring_filename_args(argv) builder_file, ring_file = parse_builder_ring_filename_args(argv)