openstack/glance
Code Issues Proposed changes

Remove six.add_metaclass usage

Browse Source 
Change-Id: If0d2ad8357ea759638c6b83c04ec7a2f3cf9f6bd
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
This commit is contained in:
Stephen Finucane 2021-12-21 11:37:31 +00:00
parent 4ee7799aa7
commit 0562e3335b
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glance/common/wsgi.py
View File

@ -429,8 +429,7 @@ def get_asynchronous_eventlet_pool(size=1000):
return pool
@six.add_metaclass(abc.ABCMeta)
class BaseServer(object):
class BaseServer(metaclass=abc.ABCMeta):
"""Server class to manage multiple WSGI sockets and applications.
This class requires initialize_glance_store set to True if

9
glance/notifier.py
View File

@ -330,8 +330,7 @@ class NotificationBase(object):
_send_notification(self.notifier.info, notification_id, payload)
@six.add_metaclass(abc.ABCMeta)
class NotificationProxy(NotificationBase):
class NotificationProxy(NotificationBase, metaclass=abc.ABCMeta):
def __init__(self, repo, context, notifier):
self.repo = repo
self.context = context
@ -345,8 +344,7 @@ class NotificationProxy(NotificationBase):
pass
@six.add_metaclass(abc.ABCMeta)
class NotificationRepoProxy(NotificationBase):
class NotificationRepoProxy(NotificationBase, metaclass=abc.ABCMeta):
def __init__(self, repo, context, notifier):
self.repo = repo
self.context = context
@ -366,8 +364,7 @@ class NotificationRepoProxy(NotificationBase):
pass
@six.add_metaclass(abc.ABCMeta)
class NotificationFactoryProxy(object):
class NotificationFactoryProxy(metaclass=abc.ABCMeta):
def __init__(self, factory, context, notifier):
kwargs = {'context': context, 'notifier': notifier}

4
glance/tests/functional/__init__.py
View File

@ -29,7 +29,6 @@ import os
import platform
import shutil
import signal
import six
import socket
import subprocess
import sys
@ -78,8 +77,7 @@ except RuntimeError:
pass
@six.add_metaclass(abc.ABCMeta)
class BaseServer(object):
class BaseServer(metaclass=abc.ABCMeta):
"""
Class used to easily manage starting and stopping
a server during functional test runs.