Skip to content

Commit 0a292ce

Browse files
authored
Remove calls to string.{join,lower,upper} (ros#174)
* Remove calls to string.{join,lower,upper} The functions are not present in Python 3.8. Signed-off-by: Gaël Écorchard <[email protected]> * Revert unrelated changes Signed-off-by: Gaël Écorchard <[email protected]>
1 parent 0e371b6 commit 0a292ce

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

src/dynamic_reconfigure/parameter_generator.py

+14-15
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
from string import Template
4747
import os
4848
import inspect
49-
import string
5049
import sys
5150
import re
5251

@@ -175,18 +174,18 @@ def get_field(self):
175174
ret = []
176175
for x in fld:
177176
if x == self.name:
178-
ret.append(string.lower(x))
177+
ret.append(x.lower())
179178
else:
180-
ret.append(string.upper(x))
181-
return string.join(ret, "::")
179+
ret.append(x.upper())
180+
return '::'.join(ret)
182181

183182
def get_class(self, parent=False):
184183
cls = []
185184
cls.extend(self.get_parents())
186-
cls = [string.upper(x) for x in cls]
185+
cls = [x.upper() for x in cls]
187186
if parent is True:
188187
cls.pop()
189-
return string.join(cls, "::")
188+
return '::'.join(cls)
190189

191190
# dictionary used to create the generated classes
192191
def to_dict(self):
@@ -212,8 +211,8 @@ def to_dict(self):
212211
'parentclass': self.get_class(parent=True),
213212
'parentname': self.get_group(self.parent).name,
214213
'field': self.get_field(),
215-
'upper': string.upper(self.name),
216-
'lower': string.lower(name)
214+
'upper': self.name.upper(),
215+
'lower': name.lower(),
217216
}
218217

219218
def pytype(self, drtype):
@@ -456,9 +455,9 @@ def appendgroup(self, list, group):
456455
setters.append(Template(" if(\"${name}\"==(*_i)->name){${name} = boost::any_cast<${ctype}>(val);}").substitute(p))
457456
params.append(Template("${ctype} ${name};").substitute(p))
458457

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)
462461
grouptemplate = open(os.path.join(self.dynconfpath, "templates", "GroupClass.h.template")).read()
463462
list.append(Template(grouptemplate).safe_substitute(group.to_dict(), subgroups=subgroups, setters=setters, params=params, configname=self.name))
464463

@@ -521,10 +520,10 @@ def write_params(group):
521520
write_params(self.group)
522521
self.appendgroup(groups, self.group)
523522

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)
528527
f.write(Template(template).substitute(
529528
uname=self.name.upper(),
530529
configname=self.name, pkgname=self.pkgname, paramdescr=paramdescr,

0 commit comments

Comments
 (0)