Merge pull request #1092 from naicode/six_wraps

Fixes #1086: use six.wraps insted of functools

blocks/bricks/base.py

@@ -1,7 +1,7 @@
 import inspect
 from abc import ABCMeta
 from collections import OrderedDict
-from functools import wraps
+from six import wraps
 from operator import attrgetter
 from types import MethodType
 

blocks/bricks/recurrent.py

@@ -2,7 +2,7 @@
 import copy
 import inspect
 import logging
-from functools import wraps
+from six import wraps
 
 from picklable_itertools.extras import equizip
 import numpy

blocks/utils/testing.py

@@ -1,7 +1,7 @@
 import logging
 import os
 import sys
-from functools import wraps
+from six import wraps
 from importlib import import_module
 from unittest.case import SkipTest