Also show the removal URL in the duplicate paste message.

ikanobori · ikanobori · commit 94e899971cdd · 2015-01-22T12:05:01.000+01:00
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -314,6 +314,7 @@ def __init__(self, interp, config):
         # to repl.pastebin
         self.prev_pastebin_content = ''
         self.prev_pastebin_url = ''
+        self.prev_removal_url = ''
         # Necessary to fix mercurial.ui.ui expecting sys.stderr to have this
         # attribute
         self.closed = False
@@ -677,8 +678,8 @@ def pastebin(self, s=None):
     def do_pastebin(self, s):
         """Actually perform the upload."""
         if s == self.prev_pastebin_content:
-            self.interact.notify(_('Duplicate pastebin. Previous URL: %s') %
-                                  (self.prev_pastebin_url, ))
+            self.interact.notify(_('Duplicate pastebin. Previous URL: %s. Removal URL: %s') %
+                                  (self.prev_pastebin_url, self.prev_removal_url))
             return self.prev_pastebin_url
 
         if self.config.pastebin_helper:
@@ -716,6 +717,7 @@ def do_pastebin_json(self, s):
         removal_url = removal_url_template.safe_substitute(removal_id=removal_id)
 
         self.prev_pastebin_url = paste_url
+        self.prev_removal_url  = removal_url
         self.interact.notify(_('Pastebin URL: %s - Removal URL: %s') %
                              (paste_url, removal_url))
 
