Bring back do_pastebin() and use the opportunity to factor out some shared code.

eikehein · eikehein · commit f514e8f5bd6f · 2012-05-28T16:14:16.000+02:00
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -774,6 +774,15 @@ def pastebin(self, s=None):
             not self.interact.confirm("Pastebin buffer? (y/N) ")):
             self.interact.notify("Pastebin aborted")
             return
+        return do_pastebin(s)
+
+
+    def do_pastebin(self, s):
+        if s == self.prev_pastebin_content:
+            self.interact.notify('Duplicate pastebin. Previous URL: ' +
+                                  self.prev_pastebin_url)
+            return self.prev_pastebin_url
+
         if self.config.pastebin_helper:
             return self.do_pastebin_helper(s)
         else:
@@ -788,11 +797,6 @@ def do_pastebin_xmlrpc(self, s):
                                  (self.config.pastebin_url, str(e)))
             return
 
-        if s == self.prev_pastebin_content:
-            self.interact.notify('Duplicate pastebin. Previous URL: ' +
-                                  self.prev_pastebin_url)
-            return self.prev_pastebin_url
-
         self.prev_pastebin_content = s
 
         self.interact.notify('Posting data to pastebin...')
@@ -812,11 +816,6 @@ def do_pastebin_xmlrpc(self, s):
 
     def do_pastebin_helper(self, s):
         """Call out to helper program for pastebin upload."""
-        if s == self.prev_pastebin_content:
-            self.interact.notify('Duplicate pastebin. Previous URL: ' +
-                                  self.prev_pastebin_url)
-            return self.prev_pastebin_url
-
         self.interact.notify('Posting data to pastebin...')
 
         try:
