Use functions rather than special methods, e.g. type(f) instead of f.__class__

bradleyayers · bradleyayers · commit 44689e58816a · 2012-03-14T11:59:59.000+10:00
diff --git a/README.rst b/README.rst
@@ -76,17 +76,13 @@ v0.10.0
 
       {% querystring table.prefixed_order_by_field=column.order_by_alias.next %}
 
+- Added `next` shortcut to `OrderBy` returned from `BoundColumn.order_by_alias`
 - Added `OrderByTuple.get()`
 - Deprecated `BoundColumn.sortable`, `Column.sortable`, `Table.sortable`,
   `sortable` CSS class, `BoundColumns.itersortable`, `BoundColumns.sortable`; use `orderable` instead of
   `sortable`.
 - Added `BoundColumn.is_ordered`
-- Added `next` shortcut to `OrderBy` returned from `BoundColumn.order_by_alias`
 - Introduced concept of an `order by alias`, see glossary in the docs for details.
--
-
-
-note use type() unicode() str() etc, rather than special methods __foo__
 
 v0.9.6
 ------
diff --git a/django_tables2/columns.py b/django_tables2/columns.py
@@ -72,7 +72,7 @@ def __init__(self, verbose_name=None, accessor=None, default=None,
         if not (accessor is None or isinstance(accessor, basestring) or
                 callable(accessor)):
             raise TypeError('accessor must be a string or callable, not %s' %
-                            accessor.__class__.__name__)
+                            type(accessor).__name__)
         if callable(accessor) and default is not None:
             raise TypeError('accessor must be string when default is used, not callable')
         self.accessor = A(accessor) if accessor else None
@@ -89,7 +89,7 @@ def __init__(self, verbose_name=None, accessor=None, default=None,
         attrs = attrs or {}
         if not isinstance(attrs, Attrs):
             warnings.warn('attrs must be Attrs object, not %s'
-                          % attrs.__class__.__name__, DeprecationWarning)
+                          % type(attrs).__name__, DeprecationWarning)
             attrs = Attrs(attrs)
         self.attrs = attrs
         # massage order_by into an OrderByTuple or None
@@ -193,7 +193,7 @@ def __init__(self, attrs=None, **extra):
         attrs = attrs or Attrs()
         if not isinstance(attrs, Attrs):
             warnings.warn('attrs must be Attrs object, not %s'
-                          % attrs.__class__.__name__, DeprecationWarning)
+                          % type(attrs).__name__, DeprecationWarning)
             attrs = Attrs(td__input=attrs)
         # This is done for backwards compatible too, there used to be a
         # ``header_attrs`` argument, but this has been deprecated. We'll
@@ -281,7 +281,7 @@ def __init__(self, viewname, urlconf=None, args=None, kwargs=None,
         attrs = attrs or Attrs()
         if not isinstance(attrs, Attrs):
             warnings.warn('attrs must be Attrs object, not %s'
-                          % attrs.__class__.__name__, DeprecationWarning)
+                          % type(attrs).__name__, DeprecationWarning)
             attrs = Attrs(a=attrs)
         extra['attrs'] = attrs
         super(LinkColumn, self).__init__(**extra)
@@ -791,4 +791,4 @@ def __getitem__(self, index):
                            "choices are: %s" % (index, self.names()))
         else:
             raise TypeError(u'row indices must be integers or str, not %s'
-                            % index.__class__.__name__)
+                            % type(index).__name__)
diff --git a/django_tables2/tables.py b/django_tables2/tables.py
@@ -40,7 +40,7 @@ def __init__(self, data, table):
             except:
                 raise ValueError('data must be QuerySet-like (have count and '
                                  'order_by) or support list(data) -- %s is '
-                                 'neither' % data.__class__.__name__)
+                                 'neither' % type(data).__name__)
 
     def __len__(self):
         # Use the queryset count() method to get the length, instead of
@@ -79,8 +79,7 @@ def __iter__(self):
         with indexing into querysets, so this side-steps that problem (as well
         as just being a better way to iterate).
         """
-        return (self.list.__iter__() if hasattr(self, 'list')
-                                     else self.queryset.__iter__())
+        return iter(self.list) if hasattr(self, 'list') else iter(self.queryset)
 
     def __getitem__(self, index):
         """Forwards indexing accesses to underlying data"""
@@ -245,7 +244,7 @@ def __init__(self, data, order_by=None, orderable=None, empty_text=None,
         # Make a copy so that modifying this will not touch the class
         # definition. Note that this is different from forms, where the
         # copy is made available in a ``fields`` attribute.
-        self.base_columns = copy.deepcopy(self.__class__.base_columns)
+        self.base_columns = copy.deepcopy(type(self).base_columns)
         self.exclude = exclude or ()
         self.sequence = sequence
         # `None` value for order_by means no order is specified. This means we
diff --git a/django_tables2/utils.py b/django_tables2/utils.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, unicode_literals
 from django.template import Context
 from django.utils.datastructures import SortedDict
 from django.utils.html import escape
@@ -32,14 +33,14 @@ def expand(self, columns):
             # Check for columns in the sequence that don't exist in *columns*
             extra = (set(self) - set(("...", ))).difference(columns)
             if extra:
-                raise ValueError(u"sequence contains columns that do not exist"
-                                 u" in the table. Remove '%s'."
+                raise ValueError("sequence contains columns that do not exist"
+                                 " in the table. Remove '%s'."
                                  % "', '".join(extra))
         else:
             diff = set(self) ^ set(columns)
             if diff:
-                raise ValueError(u"sequence does not match columns. Fix '%s' "
-                                 u"or possibly add '...'." % "', '".join(diff))
+                raise ValueError("sequence does not match columns. Fix '%s' "
+                                 "or possibly add '...'." % "', '".join(diff))
         # everything looks good, let's expand the "..." item
         columns = columns[:]  # don't modify
         head = []
@@ -206,8 +207,8 @@ def _cmp(a, b):
                 try:
                     res = cmp(x, y)
                 except TypeError:
-                    res = cmp((repr(x.__class__), id(x.__class__), x),
-                              (repr(y.__class__), id(y.__class__), y))
+                    res = cmp((repr(type(x)), id(type(x)), x),
+                              (repr(type(y)), id(type(y)), y))
                 if res != 0:
                     return -res if reverse else res
             return 0
@@ -343,7 +344,7 @@ def as_html(self):
         :rtype: :class:`~django.utils.safestring.SafeUnicode` object
 
         """
-        return mark_safe(' '.join([u'%s="%s"' % (k, escape(v))
+        return mark_safe(' '.join(['%s="%s"' % (k, escape(v))
                                    for k, v in self.iteritems()]))
 
 
diff --git a/django_tables2/views.py b/django_tables2/views.py
@@ -45,7 +45,7 @@ def get_table_class(self):
             return self.table_class
         raise ImproperlyConfigured(u"A table class was not specified. Define "
                                    u"%(cls)s.table_class"
-                                   % {"cls": self.__class__.__name__})
+                                   % {"cls": type(self).__name__})
 
     def get_context_table_name(self, table):
         """
@@ -63,7 +63,7 @@ def get_table_data(self):
             return self.get_queryset()
         raise ImproperlyConfigured(u"Table data was not specified. Define "
                                    u"%(cls)s.table_data"
-                                   % {"cls": self.__class__.__name__})
+                                   % {"cls": type(self).__name__})
 
     def get_context_data(self, **kwargs):
         """
