raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed type() usage 

bzr-revno: 2255
This commit is contained in:
Andreas Preikschat 2013-06-19 16:17:33 +02:00
parent 2fddcf61b8 bb7bbdf10c
commit de43bfcf2d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/plugins/images/lib/mediaitem.py
View File

@ -473,7 +473,7 @@ class ImageMediaItem(MediaManagerItem):
This boolean is set to True when the list in the interface should be reloaded after saving the new images This boolean is set to True when the list in the interface should be reloaded after saving the new images
""" """
for filename in images_list: for filename in images_list:
if type(filename) is not str and type(filename) is not unicode: if not isinstance(filename, basestring):
continue continue
log.debug(u'Adding new image: %s', filename) log.debug(u'Adding new image: %s', filename)
imageFile = ImageFilenames() imageFile = ImageFilenames()

4
scripts/check_dependencies.py
View File

@ -98,9 +98,9 @@ OPTIONAL_MODULES = [
w = sys.stdout.write w = sys.stdout.write
def check_vers(version, required, text): def check_vers(version, required, text):
if type(version) is not str: if not isinstance(version, str):
version = '.'.join(map(str, version)) version = '.'.join(map(str, version))
if type(required) is not str: if not isinstance(required, str):
required = '.'.join(map(str, required)) required = '.'.join(map(str, required))
w(' %s >= %s ... ' % (text, required)) w(' %s >= %s ... ' % (text, required))
if LooseVersion(version) >= LooseVersion(required): if LooseVersion(version) >= LooseVersion(required):