Make pastebin URL really configurable.

Trundle · Trundle · commit 33d695abbbc2 · 2009-11-18T22:08:44.000+01:00
This closes issue bpython#67.
diff --git a/bpython/config.py b/bpython/config.py
@@ -44,7 +44,9 @@ def loadini(struct, configfile):
             'paste_time': 0.02,
             'syntax': True,
             'tab_length': 4,
-            'pastebin_url': 'http://bpaste.net'},
+            'pastebin_url': 'http://bpaste.net/xmlrpc/',
+            'pastebin_show_url': 'http://bpaste.net/show/$paste_id/',
+        },
         'keyboard': {
             'clear_line': 'C-u',
             'clear_screen': 'C-l',
@@ -87,6 +89,7 @@ def loadini(struct, configfile):
     struct.last_output_key = config.get('keyboard', 'last_output')
 
     struct.pastebin_url = config.get('general', 'pastebin_url')
+    struct.pastebin_show_url = config.get('general', 'pastebin_show_url')
 
     color_scheme_name = config.get('general', 'color_scheme')
 
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -35,7 +35,8 @@
 from glob import glob
 from itertools import takewhile
 from locale import getpreferredencoding
-from urlparse import urljoin
+from string import Template
+from urllib import quote as urlquote
 from xmlrpclib import ServerProxy, Error as XMLRPCError
 
 from pygments.lexers import PythonLexer
@@ -589,8 +590,7 @@ def write2file(self):
     def pastebin(self):
         """Upload to a pastebin and display the URL in the status bar."""
 
-        pasteservice_url = OPTS.pastebin_url
-        pasteservice = ServerProxy(urljoin(pasteservice_url, '/xmlrpc/'))
+        pasteservice = ServerProxy(OPTS.pastebin_url)
 
         s = self.getstdout()
 
@@ -601,7 +601,9 @@ def pastebin(self):
             self.statusbar.message('Upload failed: %s' % (str(e), ) )
             return
 
-        paste_url = urljoin(pasteservice_url, '/show/%s/' % (paste_id, ))
+        paste_url_template = Template(OPTS.pastebin_show_url)
+        paste_id = urlquote(paste_id)
+        paste_url = paste_url_template.safe_substitute(paste_id=paste_id)
         self.statusbar.message('Pastebin URL: %s' % (paste_url, ), 10)
 
     def make_list(self, items):
