Merge.

Trundle · Trundle · commit c13a58085262 · 2009-06-09T23:35:56.000+02:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1357,7 +1357,7 @@ def p_key(self):
             self.write2file()
             return ''
 
-        elif self.c == key_dispatch[OPTS.pastebin_key]:
+        elif self.c in key_dispatch[OPTS.pastebin_key]:
             self.pastebin()
             return ''
 
diff --git a/bpython/keys.py b/bpython/keys.py
@@ -40,4 +40,4 @@
 
 # fill dispatch with function keys
 for x in xrange(1,13):
-    key_dispatch['F%s' % str(x)] = 'KEY_F(%s)' % str(x)
+    key_dispatch['F%s' % str(x)] = ('KEY_F(%s)' % str(x),)
