diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2009-02-13 01:05:42 +0100 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2009-02-13 01:05:42 +0100 |
| commit | c46312d7f5ce4113ece4c33595b7192eccadcb1d (patch) | |
| tree | e3319cfa0f7cf929f2c2d181f60bf80dc34a7361 /lib/python/Plugins | |
| parent | aed27e79c07f8f2463ccefed5ba5c3e1b4352052 (diff) | |
| parent | c7cadfc8b46d1f6db38fac73624393873cae2ac7 (diff) | |
| download | enigma2-c46312d7f5ce4113ece4c33595b7192eccadcb1d.tar.gz enigma2-c46312d7f5ce4113ece4c33595b7192eccadcb1d.zip | |
Merge branch 'master' of git.opendreambox.org:/git/enigma2
Diffstat (limited to 'lib/python/Plugins')
| -rw-r--r-- | lib/python/Plugins/Extensions/DVDBurn/DVDProject.py | 3 | ||||
| -rw-r--r-- | lib/python/Plugins/Plugin.py | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py b/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py index b0b8197a..7ea32dfe 100644 --- a/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py +++ b/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py @@ -41,8 +41,7 @@ class DVDProject: return title def saveProject(self, path): - import xml.dom.minidom - from Tools.XMLTools import elementsWithTag, mergeText, stringToXML + from Tools.XMLTools import stringToXML list = [] list.append('<?xml version="1.0" encoding="utf-8" ?>\n') list.append('<DreamDVDBurnerProject>\n') diff --git a/lib/python/Plugins/Plugin.py b/lib/python/Plugins/Plugin.py index 6df4fce7..53e7b0b8 100644 --- a/lib/python/Plugins/Plugin.py +++ b/lib/python/Plugins/Plugin.py @@ -52,13 +52,13 @@ class PluginDescriptor: def __init__(self, name = "Plugin", where = [ ], description = "", icon = None, fnc = None, wakeupfnc = None, internal = False): self.name = name self.internal = internal - if type(where) is list: + if isinstance(where, list): self.where = where else: self.where = [ where ] self.description = description - if type(icon) is str or icon is None: + if icon is None or isinstance(icon, str): self.iconstr = icon self.icon = None else: @@ -69,8 +69,8 @@ class PluginDescriptor: self.__call__ = fnc def updateIcon(self, path): - if type(self.iconstr) is str: - self.icon = LoadPixmap(path + "/" + self.iconstr) + if isinstance(self.iconstr, str): + self.icon = LoadPixmap('/'.join((path, self.iconstr))) else: self.icon = None |