git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
222caf2
)
use elementsWithTag where getElementsByTagName was used
author
Felix Domke
<tmbinc@elitedvb.net>
Thu, 16 Nov 2006 19:59:54 +0000
(19:59 +0000)
committer
Felix Domke
<tmbinc@elitedvb.net>
Thu, 16 Nov 2006 19:59:54 +0000
(19:59 +0000)
keymapparser.py
patch
|
blob
|
history
diff --git
a/keymapparser.py
b/keymapparser.py
index 23cd5a86a536907c79e46325fbd9d2983e351225..1a6a378136500d7d6852be9bca8cccf3a78c6fde 100644
(file)
--- a/
keymapparser.py
+++ b/
keymapparser.py
@@
-1,5
+1,6
@@
import xml.dom.minidom
import enigma
import xml.dom.minidom
import enigma
+from Tools.XMLTools import elementsWithTag
from keyids import KEYIDS;
from keyids import KEYIDS;
@@
-28,19
+29,16
@@
def readKeymap():
except:
raise "keymap not well-formed."
except:
raise "keymap not well-formed."
- try:
- keymap = dom.getElementsByTagName("keymap")[0]
- except:
- raise "no keymap defined."
+ keymap = dom.childNodes[0]
- maps =
keymap.getElementsByTagName(
"map")
+ maps =
elementsWithTag(keymap.childNodes,
"map")
for cmap in maps:
context = str(cmap.getAttribute("context"))
assert context != "", "map must have context"
def parseKeys(device, keys):
for cmap in maps:
context = str(cmap.getAttribute("context"))
assert context != "", "map must have context"
def parseKeys(device, keys):
- for x in
keys.getElementsByTagName(
"key"):
+ for x in
elementsWithTag(keys.childNodes,
"key"):
mapto = str(x.getAttribute("mapto"))
id = x.getAttribute("id")
flags = x.getAttribute("flags")
mapto = str(x.getAttribute("mapto"))
id = x.getAttribute("id")
flags = x.getAttribute("flags")
@@
-78,6
+76,6
@@
def readKeymap():
parseKeys("generic", cmap)
parseKeys("generic", cmap)
- for device in
cmap.getElementsByTagName(
"device"):
+ for device in
elementsWithTag(cmap.childNodes,
"device"):
parseKeys(str(device.getAttribute("name")), device)
parseKeys(str(device.getAttribute("name")), device)