Merged
authorlaurent
Mon, 21 May 2012 09:31:15 +0200
changeset 2052 bf9d93a06a18
parent 2051 13dee9322beb (diff)
parent 2049 438a4a1ff188 (current diff)
child 2053 5998beb54a6c
Merged
ethercat_tests/wago_higen/MCL@motion/baseplugin.xml
ethercat_tests/wago_higen/ethercat@etherlab/baseplugin.xml
ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/baseplugin.xml
ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/coupler@EthercatSlave/baseplugin.xml
ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/higen@EthercatCIA402Slave/baseplugin.xml
ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/higen@EthercatCIA402Slave/plugin.xml
ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/inputs@EthercatSlave/baseplugin.xml
ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/outputs@EthercatSlave/baseplugin.xml
ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/plugin.xml
ethercat_tests/wago_higen/ethercat@etherlab/plugin.xml
ethercat_tests/wago_sanyo/MCL@motion/baseplugin.xml
ethercat_tests/wago_sanyo/ethercat@etherlab/baseplugin.xml
ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/baseplugin.xml
ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/coupler@EthercatSlave/baseplugin.xml
ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/inputs@EthercatSlave/baseplugin.xml
ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/outputs@EthercatSlave/baseplugin.xml
ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/plugin.xml
ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/sanyo@EthercatCIA402Slave/baseplugin.xml
ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/sanyo@EthercatCIA402Slave/plugin.xml
ethercat_tests/wago_sanyo/ethercat@etherlab/plugin.xml
etherlab/etherlab.py
--- a/etherlab/etherlab.py	Sun May 20 23:05:36 2012 +0200
+++ b/etherlab/etherlab.py	Mon May 21 09:31:15 2012 +0200
@@ -338,7 +338,7 @@
             
             for child in tree.childNodes:
                 if child.nodeType == tree.ELEMENT_NODE and child.nodeName == "EtherCATConfig":
-                    self.Config.loadXMLTree(child, ["xmlns:xsi", "xsi:noNamespaceSchemaLocation"])
+                    self.Config.loadXMLTree(child)
                     self.CreateConfigBuffer(True)
         else:
             self.CreateConfigBuffer(False)
@@ -1366,7 +1366,7 @@
                 for child in xml_tree.childNodes:
                     if child.nodeType == xml_tree.ELEMENT_NODE and child.nodeName == "EtherCATInfo":
                         modules_infos = EtherCATInfoClasses["EtherCATInfo.xsd"]["EtherCATInfo"]()
-                        modules_infos.loadXMLTree(child, ["xmlns:xsi", "xsi:noNamespaceSchemaLocation"])
+                        modules_infos.loadXMLTree(child)
                 
                 if modules_infos is not None:
                     vendor = modules_infos.getVendor()