X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/561106bf1068ed021a9a45f124ec1a65464a1f1a..fc5e9eff8617503e21ea4181ba5b312d7d177cff:/skin.py

diff --git a/skin.py b/skin.py
index 608e8a91..4f2260d6 100644
--- a/skin.py
+++ b/skin.py
@@ -229,8 +229,8 @@ def loadSingleSkinData(desktop, skin, path_prefix):
 
 	#print "***SKIN: ", path_prefix
 
-	for c in skin.getiterator("output"):
-		id = c.get('id')
+	for c in skin.findall("output"):
+		id = c.attrib.get('id')
 		if id:
 			id = int(id)
 		else:
@@ -255,25 +255,23 @@ def loadSingleSkinData(desktop, skin, path_prefix):
 					bpp = 32
 				#print "Resolution:", xres,yres,bpp
 				from enigma import gFBDC
-				i = gFBDC.getInstance()
-				i.setResolution(xres, yres)
+				gFBDC.getInstance().setResolution(xres, yres)
 				if bpp != 32:
 					# load palette (not yet implemented)
 					pass
 
-	for c in skin.getiterator("colors"):
+	for c in skin.findall("colors"):
 		for color in c.findall("color"):
 			get_attr = color.attrib.get
 			name = get_attr("name")
 			color = get_attr("value")
-
 			if name and color:
 				colorNames[name] = parseColor(color)
 				#print "Color:", name, color
 			else:
 				raise ("need color and name, got %s %s" % (name, color))
 
-	for c in skin.getiterator("fonts"):
+	for c in skin.findall("fonts"):
 		for font in c.findall("font"):
 			get_attr = font.attrib.get
 			filename = get_attr("filename", "<NONAME>")
@@ -292,7 +290,7 @@ def loadSingleSkinData(desktop, skin, path_prefix):
 			addFont(resolved_font, name, scale, is_replacement)
 			#print "Font: ", resolved_font, name, scale, is_replacement
 
-	for windowstyle in skin.getiterator("windowstyle"):
+	for windowstyle in skin.findall("windowstyle"):
 		style = eWindowStyleSkinned()
 		id = windowstyle.attrib.get("id")
 		if id:
@@ -314,8 +312,8 @@ def loadSingleSkinData(desktop, skin, path_prefix):
 		style.setTitleOffset(offset)
 		#print "  ", font, offset
 
-		for borderset in windowstyle.getiterator("borderset"):
-			bsName = str(borderset.get("name"))
+		for borderset in windowstyle.findall("borderset"):
+			bsName = str(borderset.attrib.get("name"))
 			for pixmap in borderset.findall("pixmap"):
 				get_attr = pixmap.attrib.get
 				bpName = get_attr("pos")
@@ -354,6 +352,9 @@ def lookupScreen(name):
 				return x, path
 	return None, None
 
+class additionalWidget:
+	pass
+
 def readSkin(screen, skin, names, desktop):
 	if not isinstance(names, list):
 		names = [names]
@@ -382,7 +383,6 @@ def readSkin(screen, skin, names, desktop):
 		emptySkin = "<screen></screen>"
 		myscreen = screen.parsedSkin = xml.etree.cElementTree.fromstring(emptySkin)
 
-
 	screen.skinAttributes = [ ]
 
 	skin_path_prefix = getattr(screen, "skin_path", path)
@@ -395,20 +395,19 @@ def readSkin(screen, skin, names, desktop):
 	visited_components = set()
 
 	# now walk all widgets
-	for widget in myscreen.getiterator("widget"):
+	for widget in myscreen.findall("widget"):
+		get_attr = widget.attrib.get
 		# ok, we either have 1:1-mapped widgets ('old style'), or 1:n-mapped
 		# widgets (source->renderer).
 
-		wname = widget.get('name')
-		wsource = widget.get('source')
-
+		wname = get_attr('name')
+		wsource = get_attr('source')
 
 		if wname is None and wsource is None:
 			print "widget has no name and no source!"
 			continue
 
 		if wname:
-
 			#print "Widget name=", wname
 			visited_components.add(wname)
 
@@ -460,12 +459,12 @@ def readSkin(screen, skin, names, desktop):
 			if source is None:
 				raise SkinError("source '" + wsource + "' was not found in screen '" + name + "'!")
 
-			wrender = widget.get('render')
+			wrender = get_attr('render')
 
 			if not wrender:
 				raise SkinError("you must define a renderer with render= for source '%s'" % (wsource))
 
-			for converter in widget.getiterator("convert"):
+			for converter in widget.findall("convert"):
 				ctype = converter.get('type')
 				assert ctype, "'convert'-tag needs a 'type'-attribute"
 				#print "Converter:", ctype
@@ -504,16 +503,16 @@ def readSkin(screen, skin, names, desktop):
 
 	from Components.GUIComponent import GUIComponent
 	nonvisited_components = [x for x in set(screen.keys()) - visited_components if isinstance(x, GUIComponent)]
-
 	assert not nonvisited_components, "the following components in %s don't have a skin entry: %s" % (name, ', '.join(nonvisited_components))
 
 	# now walk additional objects
 	for widget in myscreen.getchildren():
+		w_tag = widget.tag
 
-		if widget.tag == "widget":
+		if w_tag == "widget":
 			continue
 
-		if widget.tag == "applet":
+		if w_tag == "applet":
 			try:
 				codeText = widget.text.strip()
 			except:
@@ -521,7 +520,7 @@ def readSkin(screen, skin, names, desktop):
 
 			#print "Found code:"
 			#print codeText
-			type = widget.get('type')
+			type = widget.attrib.get('type')
 
 			code = compile(codeText, "skin applet", "exec")
 
@@ -534,17 +533,14 @@ def readSkin(screen, skin, names, desktop):
 
 			continue
 
-		class additionalWidget:
-			pass
-
 		w = additionalWidget()
 
-		if widget.tag == "eLabel":
+		if w_tag == "eLabel":
 			w.widget = eLabel
-		elif widget.tag == "ePixmap":
+		elif w_tag == "ePixmap":
 			w.widget = ePixmap
 		else:
-			raise SkinError("unsupported stuff : %s" % widget.tag)
+			raise SkinError("unsupported stuff : %s" % w_tag)
 			#print "unsupported stuff : %s" % widget.tag
 
 		w.skinAttributes = [ ]