tools/docco/rl_doc_utils.py
branchpy33
changeset 3789 5bc95e1f3dd4
parent 3723 99aa837b6703
child 3811 f7eb60441a60
--- a/tools/docco/rl_doc_utils.py	Mon Nov 18 17:28:23 2013 +0000
+++ b/tools/docco/rl_doc_utils.py	Mon Nov 18 17:28:48 2013 +0000
@@ -46,7 +46,6 @@
        format the arg as replaceable.  The escape sequence for literal
        $ is $\\$ (^ is ^\\^.
     """
-    from string import join
     for (template,subst) in [(QFcodetemplate, codesubst), (QFreptemplate, QFsubst)]:
         fragment = text
         parts = []
@@ -65,7 +64,7 @@
                     fragment = fragment[index:]
         except ValueError:
             parts.append(fragment)
-        text = join(parts, "")
+        text = ''.join(parts)
     return text
 #print quickfix("$testing$ testing $one$ ^two^ $three(^four^)$")
 
@@ -126,7 +125,7 @@
 def restartList():
     getSequencer().reset('list1')
 
-def list(text, doBullet=1):
+def list1(text, doBullet=1):
     text=quickfix(text)
     if doBullet:
         text='<bullet><seq id="list1"/>.</bullet>'+text
@@ -311,7 +310,7 @@
         for key, value in style.__dict__.items():
             lines.append('%s = %s' % (key, value))
         lines.sort()
-        return string.join(lines, '\n')
+        return '\n'.join(lines)
 
     def drawFigure(self):
 
@@ -349,7 +348,7 @@
         for key, value in style.__dict__.items():
             if key not in ('name','parent'):
                 lines.append('%s = %s' % (key, value))
-        return string.join(lines, '\n')
+        return '\n'.join(lines)
 
 
 class ParaBox2(figures.Figure):