openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

Ensure that action category names are unicode, to prevent warnings on comparison.

This commit is contained in:
Mattias Põldaru 2011-12-06 23:25:04 +02:00
parent 73d0050b95
commit 1830cfbe9e
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openlp/core/utils/actions.py
View File

@ -149,6 +149,8 @@ class CategoryList(object):
return self.__next__() return self.__next__()
def has_key(self, key): def has_key(self, key):
if key != None and not isinstance(key, unicode):
key = unicode(key)
for category in self.categories: for category in self.categories:
if category.name == key: if category.name == key:
return True return True
@ -164,6 +166,8 @@ class CategoryList(object):
self.add(name, weight) self.add(name, weight)
def add(self, name, weight=0, actions=None): def add(self, name, weight=0, actions=None):
if name != None and not isinstance(name, unicode):
name = unicode(name)
category = ActionCategory(name, weight) category = ActionCategory(name, weight)
if actions: if actions:
for action in actions: for action in actions:
@ -270,6 +274,8 @@ class ActionList(object):
``weight`` ``weight``
The category's weight (int). The category's weight (int).
""" """
if name != None and not isinstance(name, unicode):
name = unicode(name)
if name in self.categories: if name in self.categories:
# Only change the weight and resort the categories again. # Only change the weight and resort the categories again.
for category in self.categories: for category in self.categories: