Switched to Py3 compatible meta classes

Author: qstokkink

ipv8/attestation/trustchain/listener.py

@@ -1,15 +1,14 @@
 import abc
+import six
 
 from .block import TrustChainBlock
 
 
-class BlockListener(object):
+class BlockListener(six.with_metaclass(abc.ABCMeta, object)):
     """
     This class defines a listener for TrustChain blocks with a specific type.
     """
 
-    __metaclass__ = abc.ABCMeta
-
     BLOCK_CLASS = TrustChainBlock
 
     @abc.abstractmethod

ipv8/database.py

@@ -8,6 +8,7 @@
 from collections import defaultdict
 import logging
 import os
+import six
 import sys
 from threading import RLock
 from abc import ABCMeta, abstractmethod
@@ -68,9 +69,7 @@ class DatabaseException(RuntimeError):
     pass
 
 
-class Database(object):
-
-    __metaclass__ = ABCMeta
+class Database(six.with_metaclass(ABCMeta, object)):
 
     def __init__(self, file_path):
         """

ipv8/keyvault/keys.py

@@ -1,14 +1,13 @@
 import abc
 from hashlib import sha1
+import six
 
 
-class Key(object):
+class Key(six.with_metaclass(abc.ABCMeta, object)):
     """
     Interface for a public or private key.
     """
 
-    __metaclass__ = abc.ABCMeta
-
     @abc.abstractmethod
     def pub(self):
         pass
@@ -27,13 +26,11 @@ def key_to_hash(self):
         return sha1(self.key_to_bin()).digest()
 
 
-class PrivateKey(Key):
+class PrivateKey(six.with_metaclass(abc.ABCMeta, Key)):
     """
     Interface for a private key.
     """
 
-    __metaclass__ = abc.ABCMeta
-
     def has_secret_key(self):
         return True
 
@@ -42,13 +39,11 @@ def signature(self, msg):
         pass
 
 
-class PublicKey(Key):
+class PublicKey(six.with_metaclass(abc.ABCMeta, Key)):
     """
     Interface for a public key.
     """
 
-    __metaclass__ = abc.ABCMeta
-
     def pub(self):
         return self
 

ipv8/messaging/interfaces/endpoint.py

@@ -1,6 +1,7 @@
 import abc
 import logging
 import netifaces
+import six
 import socket
 import struct
 
@@ -9,13 +10,11 @@
 from ...util import blockingCallFromThread
 
 
-class Endpoint(object):
+class Endpoint(six.with_metaclass(abc.ABCMeta, object)):
     """
     Interface for sending messages over the Internet.
     """
 
-    __metaclass__ = abc.ABCMeta
-
     def __init__(self):
         self._logger = logging.getLogger(self.__class__.__name__)
         self._listeners = []
@@ -81,13 +80,11 @@ def close(self):
         pass
 
 
-class EndpointListener(object):
+class EndpointListener(six.with_metaclass(abc.ABCMeta, object)):
     """
     Handler for messages coming in through an Endpoint.
     """
 
-    __metaclass__ = abc.ABCMeta
-
     def __init__(self, endpoint, main_thread=True):
         """
         Create a new listener.

ipv8/messaging/serialization.py

@@ -1,5 +1,6 @@
 import abc
 from struct import pack, unpack, unpack_from, Struct
+import six
 import sys
 
 
@@ -304,13 +305,11 @@ def unpack_to_serializables(self, serializables, data):
         return out
 
 
-class Serializable(object):
+class Serializable(six.with_metaclass(abc.ABCMeta, object)):
     """
     Interface for serializable objects.
     """
 
-    __metaclass__ = abc.ABCMeta
-
     format_list = []
     optional_format_list = []
     is_list_descriptor = False

ipv8/overlay.py

@@ -1,21 +1,18 @@
 import abc
 import logging
-from time import time
+import six
 
 from .keyvault.crypto import ECCrypto
 from .messaging.interfaces.endpoint import EndpointListener
 from .messaging.serialization import Serializer
-from .peer import Peer
 from .taskmanager import TaskManager
 
 
-class Overlay(EndpointListener, TaskManager):
+class Overlay(six.with_metaclass(abc.ABCMeta, EndpointListener, TaskManager)):
     """
     Interface for an Internet overlay.
     """
 
-    __metaclass__ = abc.ABCMeta
-
     def __init__(self, master_peer, my_peer, endpoint, network):
         """
         Create a new overlay for the Internet.

ipv8/peerdiscovery/discovery.py

@@ -1,17 +1,15 @@
 import abc
-
 from random import choice
+import six
 from time import time
 from threading import Lock
 
 
-class DiscoveryStrategy(object):
+class DiscoveryStrategy(six.with_metaclass(abc.ABCMeta, object)):
     """
     Strategy for discovering peers in a network.
     """
 
-    __metaclass__ = abc.ABCMeta
-
     def __init__(self, overlay):
         self.overlay = overlay
         self.walk_lock = Lock()

requirements.txt

@@ -3,3 +3,4 @@ libnacl>=1.6.1
 netifaces
 Twisted>=17.9.0
 pyOpenSSL
+six