COMP/CMSDIST/root-5.22-00a-Reflex-gendict_selclass.patch

--- cint/reflex/python/genreflex/gendict.py     (revision 27397)
+++ cint/reflex/python/genreflex/gendict.py     (revision 28335)
@@ -373,6 +373,14 @@
                 print '--->> genreflex: INFO: Using typedef %s to select class %s' % (t['fullname'], self.genTypeName(catt['id']))
               selec.append(catt)
               self.typedefs_for_usr.append(t)
+            if match[0].has_key('fields') :
+              # copy all fields selection attrs over to the underlying class, see sav #49472
+              clname = self.genTypeName(catt['id'])
+              for c in self.selector.sel_classes :
+                attrs = c['attrs']
+                if 'n_name' in attrs and attrs['n_name'] == clname \
+                      or 'n_pattern' in attrs and self.selector.matchpattern(clname, attrs['n_pattern']) :
+                  c['fields'] += match[0]['fields']
       if self.resolvettd :
         newselector = self.resolveSelectorTypedefs( self.selector.sel_classes )
         if newselector:

--- cint/reflex/python/genreflex/selclass.py    (revision 27005)
+++ cint/reflex/python/genreflex/selclass.py    (revision 28335)
@@ -261,10 +261,14 @@
   def selclass(self, clname, fname, sltor ) :
     for c in sltor :
       attrs = c['attrs']
-      if 'n_name' in attrs and attrs['n_name'] == clname :  c['used'] = 1; return attrs
-      if 'n_pattern' in attrs and matchpattern(clname,attrs['n_pattern']) : return attrs
-      if 'file_name' in attrs and attrs['file_name'] == fname : return attrs
-      if 'file_pattern' in attrs and matchpattern(fname,attrs['file_pattern']): return attrs
+      if 'n_name' in attrs and attrs['n_name'] == clname \
+            or 'n_pattern' in attrs and self.matchpattern(clname,attrs['n_pattern']) \
+            or 'file_name' in attrs and attrs['file_name'] == fname \
+            or 'file_pattern' in attrs and self.matchpattern(fname,attrs['file_pattern']) :
+        c['used'] = 1
+        if c.has_key('fields'):
+          attrs['fields'] = c['fields']
+        return attrs
     return None
 #----------------------------------------------------------------------------------
   def excclass(self, clname, fname ) :
@@ -272,9 +276,9 @@
       if c['methods'] or c['fields'] : continue
       attrs = c['attrs']
       if 'n_name' in attrs  and attrs['n_name'] == clname : return attrs 
-      if 'n_pattern' in attrs and matchpattern(clname, attrs['n_pattern']) : return attrs
+      if 'n_pattern' in attrs and self.matchpattern(clname, attrs['n_pattern']) : return attrs
       if 'file_name' in attrs and attrs['file_name'] == fname : return attrs
-      if 'file_pattern' in attrs and matchpattern(fname,attrs['file_pattern']): return attrs
+      if 'file_pattern' in attrs and self.matchpattern(fname,attrs['file_pattern']): return attrs
     return None
 #----------------------------------------------------------------------------------
   def matchfield(self, clname, field ) :
@@ -287,7 +291,7 @@
         if 'name' in f and f['name'] == field :
           attrs = c['attrs'] 
           if 'n_name' in attrs and attrs['n_name'] == clname : return f
-          if 'n_pattern' in attrs and matchpattern(clname, attrs['n_pattern']) : return f
+          if 'n_pattern' in attrs and self.matchpattern(clname, attrs['n_pattern']) : return f
     return None
 #----------------------------------------------------------------------------------
   def excfield(self, clname, field ) :
@@ -297,7 +301,7 @@
         if 'name' in f and f['name'] == field :
           attrs = c['attrs'] 
           if 'n_name' in attrs and attrs['n_name'] == clname : return f
-          if 'n_pattern' in attrs and matchpattern(clname, attrs['n_pattern']) : return f
+          if 'n_pattern' in attrs and self.matchpattern(clname, attrs['n_pattern']) : return f
     return None
 #----------------------------------------------------------------------------------
 # unused
@@ -310,12 +314,12 @@
     for c in self.sel_classes :
       for m in c['methods'] :
         if ('name' in m and m['name'] == method ) \
-               or ('pattern' in m and matchpattern(method, m['pattern'])) \
+               or ('pattern' in m and self.matchpattern(method, m['pattern'])) \
                or ('proto_name' in m and m['proto_name'] == method + '(' + arguments + ')' ) \
-               or ('proto_pattern' in m and matchpattern(method + '(' + arguments + ')', m['proto_pattern'])) :
+               or ('proto_pattern' in m and self.matchpattern(method + '(' + arguments + ')', m['proto_pattern'])) :
           attrs = c['attrs']
           if 'n_name' in attrs and attrs['n_name'] == clname : return m
-          if 'n_pattern' in attrs and matchpattern(clname, attrs['n_pattern']) : return m
+          if 'n_pattern' in attrs and self.matchpattern(clname, attrs['n_pattern']) : return m
     return None
 #----------------------------------------------------------------------------------
   def excmethod(self, clname, method, demangled ) :
@@ -323,21 +327,21 @@
     for c in self.exc_classes :
       for m in c['methods'] :
         if ('name' in m and m['name'] == method ) \
-           or ('pattern' in m and matchpattern(method, m['pattern'])) \
+           or ('pattern' in m and self.matchpattern(method, m['pattern'])) \
            or ('proto_name' in m and m['proto_name'] == demangled ) \
-           or('proto_pattern' in m and matchpattern(demangled, m['proto_pattern'])) :
+           or('proto_pattern' in m and self.matchpattern(demangled, m['proto_pattern'])) :
           attrs = c['attrs']
           if 'n_name' in attrs and attrs['n_name'] == clname : return m
-          if 'n_pattern' in attrs and matchpattern(clname, attrs['n_pattern']) : return m
+          if 'n_pattern' in attrs and self.matchpattern(clname, attrs['n_pattern']) : return m
     return None
 #----------------------------------------------------------------------------------
   def selfunction(self, funcname, demangled ) :
     for f in self.sel_functions :
       attrs = f['attrs']
       if ('name' in attrs and attrs['name'] == funcname ) \
-             or ('pattern' in attrs and matchpattern(funcname, attrs['pattern'])) \
+             or ('pattern' in attrs and self.matchpattern(funcname, attrs['pattern'])) \
              or ('proto_name' in attrs and attrs['proto_name'] == demangled ) \
-             or ('proto_pattern' in attrs and matchpattern(demangled, attrs['proto_pattern'])) :
+             or ('proto_pattern' in attrs and self.matchpattern(demangled, attrs['proto_pattern'])) :
         return attrs
     return None
 #----------------------------------------------------------------------------------
@@ -345,9 +349,9 @@
     for f in self.exc_functions :
       attrs = f['attrs']
       if ('name' in attrs and attrs['name'] == funcname ) \
-             or ('pattern' in attrs and matchpattern(funcname, attrs['pattern'])) \
+             or ('pattern' in attrs and self.matchpattern(funcname, attrs['pattern'])) \
              or ('proto_name' in attrs and attrs['proto_name'] == demangled ) \
-             or ('proto_pattern' in attrs and matchpattern(demangled, attrs['proto_pattern'])) :
+             or ('proto_pattern' in attrs and self.matchpattern(demangled, attrs['proto_pattern'])) :
         return attrs
     return None
 #----------------------------------------------------------------------------------
@@ -355,28 +359,28 @@
     for enum in self.sel_enums :
       attrs = enum['attrs']
       if 'name' in attrs and attrs['name'] == enumname :  return attrs
-      if 'pattern' in attrs and matchpattern(enumname,attrs['pattern']) : return attrs
+      if 'pattern' in attrs and self.matchpattern(enumname,attrs['pattern']) : return attrs
     return None
 #----------------------------------------------------------------------------------
   def excenum(self, enumname ) :
     for enum in self.exc_enums :
       attrs = enum['attrs']
       if 'name' in attrs  and attrs['name'] == enumname : return attrs 
-      if 'pattern' in attrs and matchpattern(enumname, attrs['pattern']) : return attrs
+      if 'pattern' in attrs and self.matchpattern(enumname, attrs['pattern']) : return attrs
     return None
 #----------------------------------------------------------------------------------
   def selvariable(self, varname ) :
     for var in self.sel_vars :
       attrs = var['attrs']
       if 'name' in attrs and attrs['name'] == varname :  return attrs
-      if 'pattern' in attrs and matchpattern(varname,attrs['pattern']) : return attrs
+      if 'pattern' in attrs and self.matchpattern(varname,attrs['pattern']) : return attrs
     return None
 #----------------------------------------------------------------------------------
   def excvariable(self, varname ) :
     for var in self.exc_vars :
       attrs = var['attrs']
       if 'name' in attrs  and attrs['name'] == varname : return attrs 
-      if 'pattern' in attrs and matchpattern(varname, attrs['pattern']) : return attrs
+      if 'pattern' in attrs and self.matchpattern(varname, attrs['pattern']) : return attrs
     return None
 #----------------------------------------------------------------------------------
   def reportUnusedClasses(self) :
@@ -387,5 +391,5 @@
          warnings += 1
     return warnings
 #-----------------------------------------------------------------------------------
-def matchpattern( name, pattern ) :
-  return fnmatch.fnmatch(name.replace('*','#'),pattern.replace('\*','#'))
+  def matchpattern(self, name, pattern ) :
+    return fnmatch.fnmatch(name.replace('*','#'),pattern.replace('\*','#'))
Index: cint/reflex/python/genreflex/gendict.py
===================================================================
--- cint/reflex/python/genreflex/gendict.py     (revision 28335)
+++ cint/reflex/python/genreflex/gendict.py     (revision 28374)
@@ -373,7 +373,12 @@
                 print '--->> genreflex: INFO: Using typedef %s to select class %s' % (t['fullname'], self.genTypeName(catt['id']))
               selec.append(catt)
               self.typedefs_for_usr.append(t)
-            if match[0].has_key('fields') :
+              if match[0].has_key('fields') :
+                # copy all fields selection attrs over to the underlying class, see sav #49472
+                clsname = self.genTypeName(catt['id'])
+                newselattrs = {'name': clsname, 'n_name': clsname} 
+                self.selector.sel_classes.append({'fields': match[0]['fields'], 'attrs': newselattrs,'used': 1 })
+            elif match[0].has_key('fields') :
               # copy all fields selection attrs over to the underlying class, see sav #49472
               clname = self.genTypeName(catt['id'])
               for c in self.selector.sel_classes :
--- cint/reflex/python/genreflex/selclass.py    (revision 28400)
+++ cint/reflex/python/genreflex/selclass.py    (revision 28401)
@@ -290,8 +290,9 @@
       for f in c['fields'] :
         if 'name' in f and f['name'] == field :
           attrs = c['attrs'] 
-          if 'n_name' in attrs and attrs['n_name'] == clname : return f
-          if 'n_pattern' in attrs and self.matchpattern(clname, attrs['n_pattern']) : return f
+          if 'n_name' in attrs and attrs['n_name'] == clname \
+                or 'n_pattern' in attrs and self.matchpattern(clname, attrs['n_pattern']) :
+            return f
     return None
 #----------------------------------------------------------------------------------
   def excfield(self, clname, field ) :
--- cint/reflex/python/genreflex/gendict.py     (revision 28400)
+++ cint/reflex/python/genreflex/gendict.py     (revision 28401)
@@ -375,9 +375,10 @@
               self.typedefs_for_usr.append(t)
               if match[0].has_key('fields') :
                 # copy all fields selection attrs over to the underlying class, see sav #49472
+                # this part is needed for selfields which checks the selection, not the class's attrs
                 clsname = self.genTypeName(catt['id'])
-                newselattrs = {'name': clsname, 'n_name': clsname} 
-                self.selector.sel_classes.append({'fields': match[0]['fields'], 'attrs': newselattrs,'used': 1 })
+                newselattrs = {'name': clsname, 'n_name': self.selector.genNName(clsname)}
+                self.selector.sel_classes.append({'fields': match[0]['fields'], 'attrs': newselattrs, 'used': 1, 'methods':[]})
             elif match[0].has_key('fields') :
               # copy all fields selection attrs over to the underlying class, see sav #49472
               clname = self.genTypeName(catt['id'])
@@ -1134,7 +1135,7 @@
             % (cls, typeidtype, cls, mod, typ)
     if 'extra' in attrs :
       for pname, pval in attrs['extra'].items() :
-        if pname not in ('name','pattern','n_name','file_name','file_pattern') :
+        if pname not in ('name','pattern','n_name','file_name','file_pattern','fields') :
           if pname == 'id' : pname = 'ClassID'
           sc += '\n  .AddProperty("%s", "%s")' % (pname, pval)
 
#	User	Rev	Content
1	dlange	1.1	--- cint/reflex/python/genreflex/gendict.py (revision 27397)
2			+++ cint/reflex/python/genreflex/gendict.py (revision 28335)
3			@@ -373,6 +373,14 @@
4			print '--->> genreflex: INFO: Using typedef %s to select class %s' % (t['fullname'], self.genTypeName(catt['id']))
5			selec.append(catt)
6			self.typedefs_for_usr.append(t)
7			+ if match[0].has_key('fields') :
8			+ # copy all fields selection attrs over to the underlying class, see sav #49472
9			+ clname = self.genTypeName(catt['id'])
10			+ for c in self.selector.sel_classes :
11			+ attrs = c['attrs']
12			+ if 'n_name' in attrs and attrs['n_name'] == clname \
13			+ or 'n_pattern' in attrs and self.selector.matchpattern(clname, attrs['n_pattern']) :
14			+ c['fields'] += match[0]['fields']
15			if self.resolvettd :
16			newselector = self.resolveSelectorTypedefs( self.selector.sel_classes )
17			if newselector:
18
19			--- cint/reflex/python/genreflex/selclass.py (revision 27005)
20			+++ cint/reflex/python/genreflex/selclass.py (revision 28335)
21			@@ -261,10 +261,14 @@
22			def selclass(self, clname, fname, sltor ) :
23			for c in sltor :
24			attrs = c['attrs']
25			- if 'n_name' in attrs and attrs['n_name'] == clname : c['used'] = 1; return attrs
26			- if 'n_pattern' in attrs and matchpattern(clname,attrs['n_pattern']) : return attrs
27			- if 'file_name' in attrs and attrs['file_name'] == fname : return attrs
28			- if 'file_pattern' in attrs and matchpattern(fname,attrs['file_pattern']): return attrs
29			+ if 'n_name' in attrs and attrs['n_name'] == clname \
30			+ or 'n_pattern' in attrs and self.matchpattern(clname,attrs['n_pattern']) \
31			+ or 'file_name' in attrs and attrs['file_name'] == fname \
32			+ or 'file_pattern' in attrs and self.matchpattern(fname,attrs['file_pattern']) :
33			+ c['used'] = 1
34			+ if c.has_key('fields'):
35			+ attrs['fields'] = c['fields']
36			+ return attrs
37			return None
38			#----------------------------------------------------------------------------------
39			def excclass(self, clname, fname ) :
40			@@ -272,9 +276,9 @@
41			if c['methods'] or c['fields'] : continue
42			attrs = c['attrs']
43			if 'n_name' in attrs and attrs['n_name'] == clname : return attrs
44			- if 'n_pattern' in attrs and matchpattern(clname, attrs['n_pattern']) : return attrs
45			+ if 'n_pattern' in attrs and self.matchpattern(clname, attrs['n_pattern']) : return attrs
46			if 'file_name' in attrs and attrs['file_name'] == fname : return attrs
47			- if 'file_pattern' in attrs and matchpattern(fname,attrs['file_pattern']): return attrs
48			+ if 'file_pattern' in attrs and self.matchpattern(fname,attrs['file_pattern']): return attrs
49			return None
50			#----------------------------------------------------------------------------------
51			def matchfield(self, clname, field ) :
52			@@ -287,7 +291,7 @@
53			if 'name' in f and f['name'] == field :
54			attrs = c['attrs']
55			if 'n_name' in attrs and attrs['n_name'] == clname : return f
56			- if 'n_pattern' in attrs and matchpattern(clname, attrs['n_pattern']) : return f
57			+ if 'n_pattern' in attrs and self.matchpattern(clname, attrs['n_pattern']) : return f
58			return None
59			#----------------------------------------------------------------------------------
60			def excfield(self, clname, field ) :
61			@@ -297,7 +301,7 @@
62			if 'name' in f and f['name'] == field :
63			attrs = c['attrs']
64			if 'n_name' in attrs and attrs['n_name'] == clname : return f
65			- if 'n_pattern' in attrs and matchpattern(clname, attrs['n_pattern']) : return f
66			+ if 'n_pattern' in attrs and self.matchpattern(clname, attrs['n_pattern']) : return f
67			return None
68			#----------------------------------------------------------------------------------
69			# unused
70			@@ -310,12 +314,12 @@
71			for c in self.sel_classes :
72			for m in c['methods'] :
73			if ('name' in m and m['name'] == method ) \
74			- or ('pattern' in m and matchpattern(method, m['pattern'])) \
75			+ or ('pattern' in m and self.matchpattern(method, m['pattern'])) \
76			or ('proto_name' in m and m['proto_name'] == method + '(' + arguments + ')' ) \
77			- or ('proto_pattern' in m and matchpattern(method + '(' + arguments + ')', m['proto_pattern'])) :
78			+ or ('proto_pattern' in m and self.matchpattern(method + '(' + arguments + ')', m['proto_pattern'])) :
79			attrs = c['attrs']
80			if 'n_name' in attrs and attrs['n_name'] == clname : return m
81			- if 'n_pattern' in attrs and matchpattern(clname, attrs['n_pattern']) : return m
82			+ if 'n_pattern' in attrs and self.matchpattern(clname, attrs['n_pattern']) : return m
83			return None
84			#----------------------------------------------------------------------------------
85			def excmethod(self, clname, method, demangled ) :
86			@@ -323,21 +327,21 @@
87			for c in self.exc_classes :
88			for m in c['methods'] :
89			if ('name' in m and m['name'] == method ) \
90			- or ('pattern' in m and matchpattern(method, m['pattern'])) \
91			+ or ('pattern' in m and self.matchpattern(method, m['pattern'])) \
92			or ('proto_name' in m and m['proto_name'] == demangled ) \
93			- or('proto_pattern' in m and matchpattern(demangled, m['proto_pattern'])) :
94			+ or('proto_pattern' in m and self.matchpattern(demangled, m['proto_pattern'])) :
95			attrs = c['attrs']
96			if 'n_name' in attrs and attrs['n_name'] == clname : return m
97			- if 'n_pattern' in attrs and matchpattern(clname, attrs['n_pattern']) : return m
98			+ if 'n_pattern' in attrs and self.matchpattern(clname, attrs['n_pattern']) : return m
99			return None
100			#----------------------------------------------------------------------------------
101			def selfunction(self, funcname, demangled ) :
102			for f in self.sel_functions :
103			attrs = f['attrs']
104			if ('name' in attrs and attrs['name'] == funcname ) \
105			- or ('pattern' in attrs and matchpattern(funcname, attrs['pattern'])) \
106			+ or ('pattern' in attrs and self.matchpattern(funcname, attrs['pattern'])) \
107			or ('proto_name' in attrs and attrs['proto_name'] == demangled ) \
108			- or ('proto_pattern' in attrs and matchpattern(demangled, attrs['proto_pattern'])) :
109			+ or ('proto_pattern' in attrs and self.matchpattern(demangled, attrs['proto_pattern'])) :
110			return attrs
111			return None
112			#----------------------------------------------------------------------------------
113			@@ -345,9 +349,9 @@
114			for f in self.exc_functions :
115			attrs = f['attrs']
116			if ('name' in attrs and attrs['name'] == funcname ) \
117			- or ('pattern' in attrs and matchpattern(funcname, attrs['pattern'])) \
118			+ or ('pattern' in attrs and self.matchpattern(funcname, attrs['pattern'])) \
119			or ('proto_name' in attrs and attrs['proto_name'] == demangled ) \
120			- or ('proto_pattern' in attrs and matchpattern(demangled, attrs['proto_pattern'])) :
121			+ or ('proto_pattern' in attrs and self.matchpattern(demangled, attrs['proto_pattern'])) :
122			return attrs
123			return None
124			#----------------------------------------------------------------------------------
125			@@ -355,28 +359,28 @@
126			for enum in self.sel_enums :
127			attrs = enum['attrs']
128			if 'name' in attrs and attrs['name'] == enumname : return attrs
129			- if 'pattern' in attrs and matchpattern(enumname,attrs['pattern']) : return attrs
130			+ if 'pattern' in attrs and self.matchpattern(enumname,attrs['pattern']) : return attrs
131			return None
132			#----------------------------------------------------------------------------------
133			def excenum(self, enumname ) :
134			for enum in self.exc_enums :
135			attrs = enum['attrs']
136			if 'name' in attrs and attrs['name'] == enumname : return attrs
137			- if 'pattern' in attrs and matchpattern(enumname, attrs['pattern']) : return attrs
138			+ if 'pattern' in attrs and self.matchpattern(enumname, attrs['pattern']) : return attrs
139			return None
140			#----------------------------------------------------------------------------------
141			def selvariable(self, varname ) :
142			for var in self.sel_vars :
143			attrs = var['attrs']
144			if 'name' in attrs and attrs['name'] == varname : return attrs
145			- if 'pattern' in attrs and matchpattern(varname,attrs['pattern']) : return attrs
146			+ if 'pattern' in attrs and self.matchpattern(varname,attrs['pattern']) : return attrs
147			return None
148			#----------------------------------------------------------------------------------
149			def excvariable(self, varname ) :
150			for var in self.exc_vars :
151			attrs = var['attrs']
152			if 'name' in attrs and attrs['name'] == varname : return attrs
153			- if 'pattern' in attrs and matchpattern(varname, attrs['pattern']) : return attrs
154			+ if 'pattern' in attrs and self.matchpattern(varname, attrs['pattern']) : return attrs
155			return None
156			#----------------------------------------------------------------------------------
157			def reportUnusedClasses(self) :
158			@@ -387,5 +391,5 @@
159			warnings += 1
160			return warnings
161			#-----------------------------------------------------------------------------------
162			-def matchpattern( name, pattern ) :
163			- return fnmatch.fnmatch(name.replace('','#'),pattern.replace('\','#'))
164			+ def matchpattern(self, name, pattern ) :
165			+ return fnmatch.fnmatch(name.replace('','#'),pattern.replace('\','#'))
166			Index: cint/reflex/python/genreflex/gendict.py
167			===================================================================
168			--- cint/reflex/python/genreflex/gendict.py (revision 28335)
169			+++ cint/reflex/python/genreflex/gendict.py (revision 28374)
170			@@ -373,7 +373,12 @@
171			print '--->> genreflex: INFO: Using typedef %s to select class %s' % (t['fullname'], self.genTypeName(catt['id']))
172			selec.append(catt)
173			self.typedefs_for_usr.append(t)
174			- if match[0].has_key('fields') :
175			+ if match[0].has_key('fields') :
176			+ # copy all fields selection attrs over to the underlying class, see sav #49472
177			+ clsname = self.genTypeName(catt['id'])
178			+ newselattrs = {'name': clsname, 'n_name': clsname}
179			+ self.selector.sel_classes.append({'fields': match[0]['fields'], 'attrs': newselattrs,'used': 1 })
180			+ elif match[0].has_key('fields') :
181			# copy all fields selection attrs over to the underlying class, see sav #49472
182			clname = self.genTypeName(catt['id'])
183			for c in self.selector.sel_classes :
184			--- cint/reflex/python/genreflex/selclass.py (revision 28400)
185			+++ cint/reflex/python/genreflex/selclass.py (revision 28401)
186			@@ -290,8 +290,9 @@
187			for f in c['fields'] :
188			if 'name' in f and f['name'] == field :
189			attrs = c['attrs']
190			- if 'n_name' in attrs and attrs['n_name'] == clname : return f
191			- if 'n_pattern' in attrs and self.matchpattern(clname, attrs['n_pattern']) : return f
192			+ if 'n_name' in attrs and attrs['n_name'] == clname \
193			+ or 'n_pattern' in attrs and self.matchpattern(clname, attrs['n_pattern']) :
194			+ return f
195			return None
196			#----------------------------------------------------------------------------------
197			def excfield(self, clname, field ) :
198			--- cint/reflex/python/genreflex/gendict.py (revision 28400)
199			+++ cint/reflex/python/genreflex/gendict.py (revision 28401)
200			@@ -375,9 +375,10 @@
201			self.typedefs_for_usr.append(t)
202			if match[0].has_key('fields') :
203			# copy all fields selection attrs over to the underlying class, see sav #49472
204			+ # this part is needed for selfields which checks the selection, not the class's attrs
205			clsname = self.genTypeName(catt['id'])
206			- newselattrs = {'name': clsname, 'n_name': clsname}
207			- self.selector.sel_classes.append({'fields': match[0]['fields'], 'attrs': newselattrs,'used': 1 })
208			+ newselattrs = {'name': clsname, 'n_name': self.selector.genNName(clsname)}
209			+ self.selector.sel_classes.append({'fields': match[0]['fields'], 'attrs': newselattrs, 'used': 1, 'methods':[]})
210			elif match[0].has_key('fields') :
211			# copy all fields selection attrs over to the underlying class, see sav #49472
212			clname = self.genTypeName(catt['id'])
213			@@ -1134,7 +1135,7 @@
214			% (cls, typeidtype, cls, mod, typ)
215			if 'extra' in attrs :
216			for pname, pval in attrs['extra'].items() :
217			- if pname not in ('name','pattern','n_name','file_name','file_pattern') :
218			+ if pname not in ('name','pattern','n_name','file_name','file_pattern','fields') :
219			if pname == 'id' : pname = 'ClassID'
220			sc += '\n .AddProperty("%s", "%s")' % (pname, pval)
221