Use new JSON interface of bpaste.net and remove the old XML-RPC interface

sebastinas · sebastinas · commit 971d166d7f04 · 2014-10-22T11:38:30.000+02:00
This change adds a dependency on requests.

Signed-off-by: Sebastian Ramacher &lt;sebastian@ramacher.at&gt;
diff --git a/bpython/config.py b/bpython/config.py
@@ -68,9 +68,11 @@ def loadini(struct, configfile):
             'tab_length': 4,
             'pastebin_confirm': True,
             'pastebin_private': False,
-            'pastebin_url': 'http://bpaste.net/xmlrpc/',
+            'pastebin_url': 'https://bpaste.net/json/new',
             'pastebin_private': True,
-            'pastebin_show_url': 'http://bpaste.net/show/$paste_id/',
+            'pastebin_show_url': 'https://bpaste.net/show/$paste_id',
+            'pastebin_removal_url': 'https://bpaste.net/remove/$removal_id',
+            'pastebin_expiry': '1week',
             'pastebin_helper': '',
             'save_append_py': False,
             'editor': os.environ.get('VISUAL', os.environ.get('EDITOR', 'vi'))
@@ -149,6 +151,8 @@ def loadini(struct, configfile):
     struct.pastebin_url = config.get('general', 'pastebin_url')
     struct.pastebin_private = config.get('general', 'pastebin_private')
     struct.pastebin_show_url = config.get('general', 'pastebin_show_url')
+    struct.pastebin_removal_url = config.get('general', 'pastebin_removal_url')
+    struct.pastebin_expiry = config.get('general', 'pastebin_expiry')
     struct.pastebin_helper = config.get('general', 'pastebin_helper')
 
     struct.cli_suggestion_width = config.getfloat('cli',
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -28,6 +28,7 @@
 import inspect
 import os
 import pydoc
+import requests
 import shlex
 import subprocess
 import sys
@@ -41,8 +42,7 @@
 from socket import error as SocketError
 from string import Template
 from urllib import quote as urlquote
-from urlparse import urlparse
-from xmlrpclib import ServerProxy, Error as XMLRPCError
+from urlparse import urlparse, urljoin
 
 from pygments.token import Token
 
@@ -771,32 +771,41 @@ def do_pastebin(self, s):
         if self.config.pastebin_helper:
             return self.do_pastebin_helper(s)
         else:
-            return self.do_pastebin_xmlrpc(s)
+            return self.do_pastebin_json(s)
 
-    def do_pastebin_xmlrpc(self, s):
-        """Upload to pastebin via XML-RPC."""
-        try:
-            pasteservice = ServerProxy(self.config.pastebin_url)
-        except IOError, e:
-            self.interact.notify(_("Pastebin error for URL '%s': %s") %
-                                 (self.config.pastebin_url, str(e)))
-            return
+    def do_pastebin_json(self, s):
+        """Upload to pastebin via json interface."""
+
+        url = urljoin(self.config.pastebin_url, '/json/new')
+        payload = {
+            'code': s,
+            'lexer': 'pycon',
+            'expiry': self.config.pastebin_expiry
+        }
 
         self.interact.notify(_('Posting data to pastebin...'))
         try:
-            paste_id = pasteservice.pastes.newPaste('pycon', s, '', '', '',
-                   self.config.pastebin_private)
-        except (SocketError, XMLRPCError), e:
-            self.interact.notify(_('Upload failed: %s') % (str(e), ) )
-            return
+            response = requests.post(url, data=payload, verify=True)
+            response.raise_for_status()
+        except requests.exceptions.RequestException as exc:
+          self.interact.notify(_('Upload failed: %s') % (str(exc), ))
+          return
 
         self.prev_pastebin_content = s
+        data = response.json()
 
         paste_url_template = Template(self.config.pastebin_show_url)
-        paste_id = urlquote(paste_id)
+        paste_id = urlquote(data['paste_id'])
         paste_url = paste_url_template.safe_substitute(paste_id=paste_id)
+
+        removal_url_template = Template(self.config.pastebin_removal_url)
+        removal_id = urlquote(data['removal_id'])
+        removal_url = removal_url_template.safe_substitute(removal_id=removal_id)
+
         self.prev_pastebin_url = paste_url
-        self.interact.notify(_('Pastebin URL: %s') % (paste_url, ), 10)
+        self.interact.notify(_('Pastebin URL: %s - Removal URL: %s') %
+                             (paste_url, removal_url))
+
         return paste_url
 
     def do_pastebin_helper(self, s):
diff --git a/doc/sphinx/source/configuration-options.rst b/doc/sphinx/source/configuration-options.rst
@@ -44,8 +44,8 @@ Soft tab size (default 4, see pep-8)
 pastebin_url
 ^^^^^^^^^^^^
 The pastebin url to post to (without a trailing slash). This pastebin has to be
-a pastebin which uses LodgeIt. Examples are: http://paste.pocoo.org/xmlrpc/ and
-http://bpaste.net/xmlrpc/ (default: http://bpaste.net/xmlrpc/)
+a pastebin which uses provides a similar interface to ``bpaste.net``'s JSON
+interface. (default: https://bpaste.net/json/new)
 
 pastebin_private
 ^^^^^^^^^^^^^^^^
@@ -57,9 +57,19 @@ Default: True).
 pastebin_show_url
 ^^^^^^^^^^^^^^^^^
 The url under which the new paste can be reached. ``$paste_id`` will be replaced
-by the ID of the new paste. Examples are: http://bpaste.net/show/$paste_id/ and
-http://paste.pocoo.org/show/$paste_id/ (default:
-http://bpaste.net/show/$paste_id/)
+by the ID of the new paste. (default: https://bpaste.net/show/$paste_id/)
+
+pastebin_removal_url
+^^^^^^^^^^^^^^^^^^^^
+The url under which a paste can be removed. ``$removal_id`` will be replaced
+by the removal ID of the paste. (default: https://bpaste.net/remova/$removal_id/)
+
+.. versionadded:: 0.14
+
+pastebin_expiry
+^^^^^^^^^^^^^^^
+Time duration after which a paste should expire. Valid values are ``1day``,
+``1week`` and ``1month``. (default: ``1week``)
 
 pastebin_helper
 ^^^^^^^^^^^^^^^
diff --git a/setup.py b/setup.py
@@ -180,7 +180,8 @@ def initialize_options(self):
     long_description = """bpython is a fancy interface to the Python
     interpreter for Unix-like operating systems.""",
     install_requires = [
-        'pygments'
+        'pygments',
+        'requests'
     ],
     extras_require = extras_require,
     tests_require = ['mock'],
