From bb7bbdf10c8e3caf8f9a2aa1b363ede278406976 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sun, 16 Jun 2013 21:42:50 +0200 Subject: [PATCH] use isinstance instead of type --- openlp/plugins/images/lib/mediaitem.py | 2 +- scripts/check_dependencies.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index deed14594..3475570fc 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -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 """ for filename in images_list: - if type(filename) is not str and type(filename) is not unicode: + if not isinstance(filename, basestring): continue log.debug(u'Adding new image: %s', filename) imageFile = ImageFilenames() diff --git a/scripts/check_dependencies.py b/scripts/check_dependencies.py index 16a2c10e7..6c1d528ac 100755 --- a/scripts/check_dependencies.py +++ b/scripts/check_dependencies.py @@ -98,9 +98,9 @@ OPTIONAL_MODULES = [ w = sys.stdout.write def check_vers(version, required, text): - if type(version) is not str: + if not isinstance(version, str): version = '.'.join(map(str, version)) - if type(required) is not str: + if not isinstance(required, str): required = '.'.join(map(str, required)) w(' %s >= %s ... ' % (text, required)) if LooseVersion(version) >= LooseVersion(required):