some more Python3 fixes (composer.report, tracking)
This commit is contained in:
parent
17fbeb2c2c
commit
33ab512b7f
3 changed files with 7 additions and 43 deletions
|
@ -105,8 +105,8 @@ class Field(Component):
|
|||
def getValue(self, row):
|
||||
value = self.getRawValue(row)
|
||||
if value is None:
|
||||
return u''
|
||||
if isinstance(value, basestring):
|
||||
return ''
|
||||
if isinstance(value, str):
|
||||
return value
|
||||
return getattr(value, 'title', str(value))
|
||||
|
||||
|
|
|
@ -1,25 +1,6 @@
|
|||
#
|
||||
# Copyright (c) 2008 Helmut Merz helmutm@cy55.de
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program 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 General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
#
|
||||
# cybertools.tracking.comment.interfaces
|
||||
|
||||
"""
|
||||
Interface definitions for comments - discussions - forums.
|
||||
|
||||
$Id$
|
||||
""" Interface definitions for comments - discussions - forums.
|
||||
"""
|
||||
|
||||
from zope.interface import Interface, Attribute
|
||||
|
@ -55,7 +36,7 @@ class IComment(ITrack):
|
|||
title=u'Content Type',
|
||||
description=u'Content type (format) of the text field',
|
||||
# TODO: provide a source/vocabulary
|
||||
default='text/restructured',
|
||||
default=b'text/restructured',
|
||||
required=True)
|
||||
|
||||
def getChildren(sort='default'):
|
||||
|
|
|
@ -1,23 +1,6 @@
|
|||
#
|
||||
# Copyright (c) 2014 Helmut Merz helmutm@cy55.de
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program 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 General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
#
|
||||
# cybertools.tracking.interfaces
|
||||
|
||||
"""
|
||||
Interface definitions for tracking of user interactions.
|
||||
""" Interface definitions for tracking of user interactions.
|
||||
"""
|
||||
|
||||
from zope.interface import Interface, Attribute
|
||||
|
|
Loading…
Add table
Reference in a new issue