diff -r 6b3523f81f42 -r 26744ad37953 cubicweb/web/htmlwidgets.py --- a/cubicweb/web/htmlwidgets.py Fri Apr 05 17:21:14 2019 +0200 +++ b/cubicweb/web/htmlwidgets.py Fri Apr 05 17:58:19 2019 +0200 @@ -24,9 +24,6 @@ import random from math import floor -from six import add_metaclass -from six.moves import range - from logilab.mtconverter import xml_escape from logilab.common.deprecation import class_deprecated @@ -118,8 +115,7 @@ self.w(u'') -@add_metaclass(class_deprecated) -class SideBoxWidget(BoxWidget): +class SideBoxWidget(BoxWidget, metaclass=class_deprecated): """default CubicWeb's sidebox widget""" __deprecation_warning__ = '[3.10] class %(cls)s is deprecated' @@ -210,8 +206,7 @@ self.w(u'') -@add_metaclass(class_deprecated) -class BoxField(HTMLWidget): +class BoxField(HTMLWidget, metaclass=class_deprecated): """couples label / value meant to be displayed in a box""" __deprecation_warning__ = '[3.10] class %(cls)s is deprecated' def __init__(self, label, value): @@ -224,8 +219,7 @@ % (self.label, self.value)) -@add_metaclass(class_deprecated) -class BoxSeparator(HTMLWidget): +class BoxSeparator(HTMLWidget, metaclass=class_deprecated): """a menu separator""" __deprecation_warning__ = '[3.10] class %(cls)s is deprecated' @@ -233,8 +227,7 @@ self.w(u'