cubicweb/web/views/tableview.py
changeset 12567 26744ad37953
parent 12542 85194bd49119
--- a/cubicweb/web/views/tableview.py	Fri Apr 05 17:21:14 2019 +0200
+++ b/cubicweb/web/views/tableview.py	Fri Apr 05 17:58:19 2019 +0200
@@ -66,9 +66,6 @@
 from copy import copy
 from types import MethodType
 
-from six import string_types, add_metaclass, create_bound_method
-from six.moves import range
-
 from logilab.mtconverter import xml_escape
 from logilab.common.decorators import cachedproperty
 from logilab.common.deprecation import class_deprecated
@@ -286,7 +283,7 @@
         attrs = renderer.attributes.copy()
         if renderer.sortable:
             sortvalue = renderer.sortvalue(rownum)
-            if isinstance(sortvalue, string_types):
+            if isinstance(sortvalue, str):
                 sortvalue = sortvalue[:self.sortvalue_limit]
             if sortvalue is not None:
                 attrs[u'cubicweb:sortvalue'] = js_dumps(sortvalue)
@@ -717,7 +714,7 @@
             for aname, member in[('renderfunc', renderfunc),
                                  ('sortfunc', sortfunc)]:
                 if isinstance(member, MethodType):
-                    member = create_bound_method(member.__func__, acopy)
+                    member = MethodType(member.__func__, acopy)
                 setattr(acopy, aname, member)
             return acopy
         finally:
@@ -912,8 +909,7 @@
 ################################################################################
 
 
-@add_metaclass(class_deprecated)
-class TableView(AnyRsetView):
+class TableView(AnyRsetView, metaclass=class_deprecated):
     """The table view accepts any non-empty rset. It uses introspection on the
     result set to compute column names and the proper way to display the cells.
 
@@ -1178,8 +1174,7 @@
     title = _('editable-table')
 
 
-@add_metaclass(class_deprecated)
-class CellView(EntityView):
+class CellView(EntityView, metaclass=class_deprecated):
     __deprecation_warning__ = '[3.14] %(cls)s is deprecated'
     __regid__ = 'cell'
     __select__ = nonempty_rset()