Revert "Revert "pylint: upgrade to 1.3.1""

third_party/logilab/common/ureports/nodes.py

 # copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 # contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
 #
 # This file is part of logilab-common.
 #
 # logilab-common is free software: you can redistribute it and/or modify it under
 # the terms of the GNU Lesser General Public License as published by the Free
 # Software Foundation, either version 2.1 of the License, or (at your option) any
 # later version.
 #
 # logilab-common is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 # FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
 # details.
 #
 # You should have received a copy of the GNU Lesser General Public License along
 # with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
 """Micro reports objects.
 
 A micro report is a tree of layout and content objects.
 """
 __docformat__ = "restructuredtext en"
 
 from logilab.common.tree import VNode
 
+from six import string_types
+
 class BaseComponent(VNode):
     """base report component
 
     attributes
     * id : the component's optional id
     * klass : the component's optional klass
     """
     def __init__(self, id=None, klass=None):
         VNode.__init__(self, id)
         self.klass = klass
@@ skipping 36 matching lines @@
     """a text portion
 
     attributes :
     * BaseComponent attributes
     * data : the text value as an encoded or unicode string
     """
     def __init__(self, data, escaped=True, **kwargs):
         super(Text, self).__init__(**kwargs)
         #if isinstance(data, unicode):
         #    data = data.encode('ascii')
-        assert isinstance(data, (str, unicode)), data.__class__
+        assert isinstance(data, string_types), data.__class__
         self.escaped = escaped
         self.data = data
 
 class VerbatimText(Text):
     """a verbatim text, display the raw data
 
     attributes :
     * BaseComponent attributes
     * data : the text value as an encoded or unicode string
     """
@@ skipping 99 matching lines @@
         self.cheaders = cheaders
         self.rrheaders = rrheaders
         self.rcheaders = rcheaders
 
 class List(BaseLayout):
     """some list data
 
     attributes :
     * BaseLayout attributes
     """