# HG changeset patch
# User lbessard
# Date 1200996346 -3600
# Node ID f0a9d74e3b26f9462d199134a01944a1f3e96753
# Parent af97c60e759c79071d29c8ffc1f4c18e32fd26e5
Adding support for the new version of xmlclass
diff -r af97c60e759c -r f0a9d74e3b26 plugger.py
--- a/plugger.py Tue Jan 15 11:07:08 2008 +0100
+++ b/plugger.py Tue Jan 22 11:05:46 2008 +0100
@@ -19,12 +19,12 @@
-
+
-
+
- """)[0]["BaseParams"]
+ """)["BaseParams"]
NameTypeSeparator = '@'
@@ -80,7 +80,7 @@
def _AddParamsMembers(self):
self.PlugParams = None
if self.XSD:
- Classes = GenerateClassesFromXSDstring(self.XSD)[0]
+ Classes = GenerateClassesFromXSDstring(self.XSD)
Classes = [(name, XSDclass) for name, XSDclass in Classes.items() if XSDclass.IsBaseClass]
if len(Classes) == 1:
name, XSDclass = Classes[0]
@@ -500,10 +500,10 @@
if os.path.isdir(os.path.join(self.PlugPath(), PlugDir)) and \
PlugDir.count(NameTypeSeparator) == 1:
pname, ptype = PlugDir.split(NameTypeSeparator)
- try:
- self.PlugAddChild(pname, ptype, logger)
- except Exception, e:
- logger.write_error("Could not add child \"%s\", type %s :\n%s\n"%(pname, ptype, str(e)))
+ #try:
+ self.PlugAddChild(pname, ptype, logger)
+ #except Exception, e:
+ # logger.write_error("Could not add child \"%s\", type %s :\n%s\n"%(pname, ptype, str(e)))
def _GetClassFunction(name):
def GetRootClass():
@@ -557,43 +557,45 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r af97c60e759c -r f0a9d74e3b26 plugins/c_ext/c_ext.py
--- a/plugins/c_ext/c_ext.py Tue Jan 15 11:07:08 2008 +0100
+++ b/plugins/c_ext/c_ext.py Tue Jan 22 11:05:46 2008 +0100
@@ -10,7 +10,7 @@
-
+
diff -r af97c60e759c -r f0a9d74e3b26 plugins/canfestival/canfestival.py
--- a/plugins/canfestival/canfestival.py Tue Jan 15 11:07:08 2008 +0100
+++ b/plugins/canfestival/canfestival.py Tue Jan 22 11:05:46 2008 +0100
@@ -26,10 +26,10 @@
-
-
-
-
+
+
+
+
@@ -126,7 +126,7 @@
-
+