Merge "Metaclass Python 3.x Compatibility"

This commit is contained in:
Jenkins 2015-07-24 03:15:55 +00:00 committed by Gerrit Code Review
commit 9c94be81cb
1 changed files with 3 additions and 3 deletions

View File

@ -19,6 +19,8 @@ from optparse import OptionParser
from urlparse import urlparse from urlparse import urlparse
import random import random
import six
from swift.common.manager import Manager from swift.common.manager import Manager
from swift.common import utils, ring from swift.common import utils, ring
from swift.common.storage_policy import POLICIES from swift.common.storage_policy import POLICIES
@ -62,10 +64,8 @@ def command(f):
return f return f
@six.add_metaclass(meta_command)
class BrainSplitter(object): class BrainSplitter(object):
__metaclass__ = meta_command
def __init__(self, url, token, container_name='test', object_name='test', def __init__(self, url, token, container_name='test', object_name='test',
server_type='container', policy=None): server_type='container', policy=None):
self.url = url self.url = url