always use tuples for string interpolations

Trundle · Trundle · commit 9e2efc789e06 · 2009-05-28T17:26:59.000+02:00
diff --git a/bpython/_internal.py b/bpython/_internal.py
@@ -51,7 +51,7 @@ def _help(obj):
     else:
         output = doc.document(obj)
         if not output:
-            output = "No help found for %s" % obj
+            output = "No help found for %s" % (obj, )
             return
 
     if output is None:
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -140,7 +140,7 @@ def readlines(self, x):
 def DEBUG(s):
     """This shouldn't ever be called in any release of bpython, so
     beat me up if you find anything calling it."""
-    open('/home/bob/tmp/plonker', 'a').write("%s\n" % str(s))
+    open('/home/bob/tmp/plonker', 'a').write("%s\n" % (str(s), ))
 
 
 def make_colours():
@@ -231,7 +231,7 @@ def showtraceback(self):
     def writetb(self, l):
         """This outputs the traceback and should be overridden for anything
         fancy."""
-        map(self.write, ["\x01y\x03%s" % i for i in l])
+        map(self.write, ["\x01y\x03%s" % (i, ) for i in l])
 
 
 class Repl(object):
@@ -713,7 +713,7 @@ def mkargspec(self, topline, down):
             ln = len(str(i))
             kw = None
             if kwargs and k+1 > len(args) - len(kwargs):
-                kw = '%s' % str(kwargs[k - (len(args) - len(kwargs))])
+                kw = str(kwargs[k - (len(args) - len(kwargs))])
                 ln += len(kw) + 1
 
             if ln + x >= w:
@@ -746,12 +746,12 @@ def mkargspec(self, topline, down):
         if _args:
             self.list_win.addstr(', ',
                 curses.color_pair(self._C["g"]+1))
-            self.list_win.addstr('*%s' % _args,
+            self.list_win.addstr('*%s' % (_args, ),
                 curses.color_pair(self._C["m"]+1))
         if _kwargs:
             self.list_win.addstr(', ',
                 curses.color_pair(self._C["g"]+1))
-            self.list_win.addstr('**%s' % _kwargs,
+            self.list_win.addstr('**%s' % (_kwargs, ),
                 curses.color_pair(self._C["m"]+1))
         self.list_win.addstr(')', curses.color_pair(self._C["y"]+1))
 
@@ -792,9 +792,9 @@ def write2file(self):
             f.write(s)
             f.close()
         except IOError:
-            self.statusbar.message("Disk write error for file '%s'." % fn)
+            self.statusbar.message("Disk write error for file '%s'." % (fn, ))
         else:
-            self.statusbar.message('Saved to %s' % fn)
+            self.statusbar.message('Saved to %s' % (fn, ))
 
     def pastebin(self):
         """Upload to a pastebin and display the URL in the status bar."""
@@ -808,11 +808,11 @@ def pastebin(self):
         try:
             paste_id = pasteservice.pastes.newPaste('pycon', s)
         except XMLRPCError, e:
-            self.statusbar.message( 'Upload failed: %s' % str(e) )
+            self.statusbar.message( 'Upload failed: %s' % (str(e), ) )
             return
         
-        paste_url = urljoin(pasteservice_url, '/show/%s/' % paste_id)
-        self.statusbar.message('Pastebin URL: %s' % paste_url, 10)
+        paste_url = urljoin(pasteservice_url, '/show/%s/' % (paste_id, ))
+        self.statusbar.message('Pastebin URL: %s' % (paste_url, ), 10)
 
     def make_list(self, items):
         """Compile a list of items. At the moment this simply returns
diff --git a/bpython/formatter.py b/bpython/formatter.py
@@ -93,9 +93,9 @@ def format(self, tokensource, outfile):
                 continue
 
             if token in f_strings:
-                o += f_strings[token] % text
+                o += f_strings[token] % (text, )
             else:
-                o += f_strings[Token] % text
+                o += f_strings[Token] % (text, )
         outfile.write(o.rstrip())
 
 # vim: sw=4 ts=4 sts=4 ai et
