46
46
from string import Template
47
47
import os
48
48
import inspect
49
- import string
50
49
import sys
51
50
import re
52
51
@@ -175,18 +174,18 @@ def get_field(self):
175
174
ret = []
176
175
for x in fld :
177
176
if x == self .name :
178
- ret .append (string .lower (x ))
177
+ ret .append (x .lower ())
179
178
else :
180
- ret .append (string .upper (x ))
181
- return string .join (ret , "::" )
179
+ ret .append (x .upper ())
180
+ return '::' .join (ret )
182
181
183
182
def get_class (self , parent = False ):
184
183
cls = []
185
184
cls .extend (self .get_parents ())
186
- cls = [string .upper (x ) for x in cls ]
185
+ cls = [x .upper () for x in cls ]
187
186
if parent is True :
188
187
cls .pop ()
189
- return string .join (cls , "::" )
188
+ return '::' .join (cls )
190
189
191
190
# dictionary used to create the generated classes
192
191
def to_dict (self ):
@@ -212,8 +211,8 @@ def to_dict(self):
212
211
'parentclass' : self .get_class (parent = True ),
213
212
'parentname' : self .get_group (self .parent ).name ,
214
213
'field' : self .get_field (),
215
- 'upper' : string . upper ( self .name ),
216
- 'lower' : string .lower (name )
214
+ 'upper' : self .name . upper ( ),
215
+ 'lower' : name .lower (),
217
216
}
218
217
219
218
def pytype (self , drtype ):
@@ -456,9 +455,9 @@ def appendgroup(self, list, group):
456
455
setters .append (Template (" if(\" ${name}\" ==(*_i)->name){${name} = boost::any_cast<${ctype}>(val);}" ).substitute (p ))
457
456
params .append (Template ("${ctype} ${name};" ).substitute (p ))
458
457
459
- subgroups = string .join (subgroups , " \n " )
460
- setters = string .join (setters , " \n " )
461
- params = string .join (params , " \n " )
458
+ subgroups = ' \n ' .join (subgroups )
459
+ setters = ' \n ' .join (setters )
460
+ params = ' \n ' .join (params )
462
461
grouptemplate = open (os .path .join (self .dynconfpath , "templates" , "GroupClass.h.template" )).read ()
463
462
list .append (Template (grouptemplate ).safe_substitute (group .to_dict (), subgroups = subgroups , setters = setters , params = params , configname = self .name ))
464
463
@@ -521,10 +520,10 @@ def write_params(group):
521
520
write_params (self .group )
522
521
self .appendgroup (groups , self .group )
523
522
524
- paramdescr = string . join ( paramdescr , '\n ' )
525
- members = string . join ( members , '\n ' )
526
- groups = string . join ( groups , '\n ' )
527
- constants = string . join ( constants , '\n ' )
523
+ paramdescr = '\n ' . join ( paramdescr )
524
+ members = '\n ' . join ( members )
525
+ groups = '\n ' . join ( groups )
526
+ constants = '\n ' . join ( constants )
528
527
f .write (Template (template ).substitute (
529
528
uname = self .name .upper (),
530
529
configname = self .name , pkgname = self .pkgname , paramdescr = paramdescr ,
0 commit comments