More ABC fixes

mila-iqia · Jan 17, 2015 · 2e15141 · 2e15141
1 parent 19e306a
commit 2e15141
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/blocks/bricks/__init__.py b/blocks/bricks/__init__.py
@@ -2,12 +2,10 @@
 import inspect
 import functools
 import logging
-from abc import ABCMeta
 from collections import OrderedDict
 from itertools import chain
 
 import numpy
-from six import add_metaclass
 from theano import tensor
 
 from blocks.utils import (pack, repr_attrs, reraise_as, shared_floatx_zeros,
@@ -18,7 +16,6 @@
 logger = logging.getLogger(__name__)
 
 
-@add_metaclass(ABCMeta)
 class Brick(object):
     """A brick encapsulates Theano operations with parameters.
 

diff --git a/blocks/bricks/sequence_generators.py b/blocks/bricks/sequence_generators.py
@@ -266,7 +266,6 @@ def feedback(self, outputs):
         pass
 
 
-@add_metaclass(ABCMeta)
 class AbstractReadout(AbstractEmitter, AbstractFeedback):
     """The interface for the readout component of a sequence generator.
 

diff --git a/blocks/extensions.py b/blocks/extensions.py
@@ -3,7 +3,6 @@
 from six import add_metaclass
 
 
-@add_metaclass(ABCMeta)
 class TrainingExtension(object):
     """The base class for training extensions.
 
@@ -73,6 +72,7 @@ def on_interrupt(self):
         pass
 
 
+@add_metaclass(ABCMeta)
 class SimpleExtension(TrainingExtension):
     """A base class for simple extensions.
 

diff --git a/blocks/log.py b/blocks/log.py
@@ -45,7 +45,6 @@ def __iter__(self):
         pass
 
 
-@add_metaclass(ABCMeta)
 class TrainingLogRow(object):
     """A convenience interface for a row of the training log.
 
@@ -73,6 +72,7 @@ def __iter__(self):
         return self.log.get_row_iterator(self.time)
 
 
+@add_metaclass(ABCMeta)
 class AbstractTrainingLog(object):
     """Base class for training logs.