openstack/swift
Code Issues Proposed changes

Static methods should be @staticmethods

Browse Source 
Change-Id: Ifee5d68e00bbb3571aaac885cdd7490c79732985
This commit is contained in:
Tim Burke 2016-02-16 10:25:39 -08:00
parent 7f230f82d3
commit 8eb30afd7c
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
swift/cli/ringbuilder.py
View File

@ -389,11 +389,12 @@ def _parse_remove_values(argvish):
class Commands(object): class Commands(object):
@staticmethod
def unknown(): def unknown():
print('Unknown command: %s' % argv[2]) print('Unknown command: %s' % argv[2])
exit(EXIT_ERROR) exit(EXIT_ERROR)
@staticmethod
def create(): def create():
""" """
swift-ring-builder <builder_file> create <part_power> <replicas> swift-ring-builder <builder_file> create <part_power> <replicas>
@ -417,6 +418,7 @@ swift-ring-builder <builder_file> create <part_power> <replicas>
builder.save(builder_file) builder.save(builder_file)
exit(EXIT_SUCCESS) exit(EXIT_SUCCESS)
@staticmethod
def default(): def default():
""" """
swift-ring-builder <builder_file> swift-ring-builder <builder_file>
@ -482,6 +484,7 @@ swift-ring-builder <builder_file>
dev['meta'])) dev['meta']))
exit(EXIT_SUCCESS) exit(EXIT_SUCCESS)
@staticmethod
def search(): def search():
""" """
swift-ring-builder <builder_file> search <search-value> swift-ring-builder <builder_file> search <search-value>
@ -532,6 +535,7 @@ swift-ring-builder <builder_file> search
dev['meta'])) dev['meta']))
exit(EXIT_SUCCESS) exit(EXIT_SUCCESS)
@staticmethod
def list_parts(): def list_parts():
""" """
swift-ring-builder <builder_file> list_parts <search-value> [<search-value>] .. swift-ring-builder <builder_file> list_parts <search-value> [<search-value>] ..
@ -581,6 +585,7 @@ swift-ring-builder <builder_file> list_parts
print('%9d %7d' % (partition, count)) print('%9d %7d' % (partition, count))
exit(EXIT_SUCCESS) exit(EXIT_SUCCESS)
@staticmethod
def add(): def add():
""" """
swift-ring-builder <builder_file> add swift-ring-builder <builder_file> add
@ -631,6 +636,7 @@ swift-ring-builder <builder_file> add
builder.save(builder_file) builder.save(builder_file)
exit(EXIT_SUCCESS) exit(EXIT_SUCCESS)
@staticmethod
def set_weight(): def set_weight():
""" """
swift-ring-builder <builder_file> set_weight <search-value> <weight> swift-ring-builder <builder_file> set_weight <search-value> <weight>
@ -663,6 +669,7 @@ swift-ring-builder <builder_file> set_weight
builder.save(builder_file) builder.save(builder_file)
exit(EXIT_SUCCESS) exit(EXIT_SUCCESS)
@staticmethod
def set_info(): def set_info():
""" """
swift-ring-builder <builder_file> set_info swift-ring-builder <builder_file> set_info
@ -708,6 +715,7 @@ swift-ring-builder <builder_file> set_info
builder.save(builder_file) builder.save(builder_file)
exit(EXIT_SUCCESS) exit(EXIT_SUCCESS)
@staticmethod
def remove(): def remove():
""" """
swift-ring-builder <builder_file> remove <search-value> [search-value ...] swift-ring-builder <builder_file> remove <search-value> [search-value ...]
@ -773,6 +781,7 @@ swift-ring-builder <builder_file> search
builder.save(builder_file) builder.save(builder_file)
exit(EXIT_SUCCESS) exit(EXIT_SUCCESS)
@staticmethod
def rebalance(): def rebalance():
""" """
swift-ring-builder <builder_file> rebalance [options] swift-ring-builder <builder_file> rebalance [options]
@ -885,6 +894,7 @@ swift-ring-builder <builder_file> rebalance [options]
builder.save(builder_file) builder.save(builder_file)
exit(status) exit(status)
@staticmethod
def dispersion(): def dispersion():
""" """
swift-ring-builder <builder_file> dispersion <search_filter> [options] swift-ring-builder <builder_file> dispersion <search_filter> [options]
@ -979,6 +989,7 @@ swift-ring-builder <builder_file> dispersion <search_filter> [options]
print(template % args) print(template % args)
exit(status) exit(status)
@staticmethod
def validate(): def validate():
""" """
swift-ring-builder <builder_file> validate swift-ring-builder <builder_file> validate
@ -987,6 +998,7 @@ swift-ring-builder <builder_file> validate
builder.validate() builder.validate()
exit(EXIT_SUCCESS) exit(EXIT_SUCCESS)
@staticmethod
def write_ring(): def write_ring():
""" """
swift-ring-builder <builder_file> write_ring swift-ring-builder <builder_file> write_ring
@ -1008,6 +1020,7 @@ swift-ring-builder <builder_file> write_ring
ring_data.save(ring_file) ring_data.save(ring_file)
exit(EXIT_SUCCESS) exit(EXIT_SUCCESS)
@staticmethod
def write_builder(): def write_builder():
""" """
swift-ring-builder <ring_file> write_builder [min_part_hours] swift-ring-builder <ring_file> write_builder [min_part_hours]
@ -1054,6 +1067,7 @@ swift-ring-builder <ring_file> write_builder [min_part_hours]
builder.devs[dev_id]['parts'] += 1 builder.devs[dev_id]['parts'] += 1
builder.save(builder_file) builder.save(builder_file)
@staticmethod
def pretend_min_part_hours_passed(): def pretend_min_part_hours_passed():
""" """
swift-ring-builder <builder_file> pretend_min_part_hours_passed swift-ring-builder <builder_file> pretend_min_part_hours_passed
@ -1072,6 +1086,7 @@ swift-ring-builder <builder_file> pretend_min_part_hours_passed
builder.save(builder_file) builder.save(builder_file)
exit(EXIT_SUCCESS) exit(EXIT_SUCCESS)
@staticmethod
def set_min_part_hours(): def set_min_part_hours():
""" """
swift-ring-builder <builder_file> set_min_part_hours <hours> swift-ring-builder <builder_file> set_min_part_hours <hours>
@ -1088,6 +1103,7 @@ swift-ring-builder <builder_file> set_min_part_hours <hours>
builder.save(builder_file) builder.save(builder_file)
exit(EXIT_SUCCESS) exit(EXIT_SUCCESS)
@staticmethod
def set_replicas(): def set_replicas():
""" """
swift-ring-builder <builder_file> set_replicas <replicas> swift-ring-builder <builder_file> set_replicas <replicas>
@ -1120,6 +1136,7 @@ swift-ring-builder <builder_file> set_replicas <replicas>
builder.save(builder_file) builder.save(builder_file)
exit(EXIT_SUCCESS) exit(EXIT_SUCCESS)
@staticmethod
def set_overload(): def set_overload():
""" """
swift-ring-builder <builder_file> set_overload <overload>[%] swift-ring-builder <builder_file> set_overload <overload>[%]
@ -1176,11 +1193,12 @@ def main(arguments=None):
globals()) globals())
print(Commands.default.__doc__.strip()) print(Commands.default.__doc__.strip())
print() print()
cmds = [c for c, f in Commands.__dict__.items() cmds = [c for c in dir(Commands)
if f.__doc__ and not c.startswith('_') and c != 'default'] if getattr(Commands, c).__doc__ and not c.startswith('_') and
c != 'default']
cmds.sort() cmds.sort()
for cmd in cmds: for cmd in cmds:
print(Commands.__dict__[cmd].__doc__.strip()) print(getattr(Commands, cmd).__doc__.strip())
print() print()
print(parse_search_value.__doc__.strip()) print(parse_search_value.__doc__.strip())
print() print()
@ -1225,9 +1243,9 @@ def main(arguments=None):
if argv[0].endswith('-safe'): if argv[0].endswith('-safe'):
try: try:
with lock_parent_directory(abspath(builder_file), 15): with lock_parent_directory(abspath(builder_file), 15):
Commands.__dict__.get(command, Commands.unknown.__func__)() getattr(Commands, command, Commands.unknown)()
except exceptions.LockTimeout: except exceptions.LockTimeout:
print("Ring/builder dir currently locked.") print("Ring/builder dir currently locked.")
exit(2) exit(2)
else: else:
Commands.__dict__.get(command, Commands.unknown.__func__)() getattr(Commands, command, Commands.unknown)()