Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs

Conflicts:

	lib/python/Screens/InfoBarGenerics.py

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