Merge lp:~bjornt/launchpad/public-paste into lp:launchpad

[Björn Tillenius]

[Björn Tillenius (bjornt)]

Change utilities/paste to use pastebin.ubuntu.com by default.

It's still possible to paste to pastebin.canonical.com by passing the -p
flag.

There's a hack in the code to remove the HTTPRobotRulesProcessor.
handler. We need to remove it, since pastebin.ubuntu.com doesn't allow.
any robots to access the site, so browser.open() fails. It's not trivial
to have zope.browser create a mechanize object without that processor to
begin with.

--
Björn Tillenius | https://launchpad.net/~bjornt

[Jonathan Lange (jml)]

Thanks so much for doing this. No comments on the code.

There is a bug already filed for this, I'd much appreciate it if you could find it and close it.

Thanks again,
jml

review: Approve

[Björn Tillenius (bjornt)]

On Thu, Aug 13, 2009 at 10:29:31AM -0000, Jonathan Lange wrote:
> Review: Approve
> Thanks so much for doing this. No comments on the code.

Thanks!

> There is a bug already filed for this, I'd much appreciate it if you
> could find it and close it.

Indeed. The bug is even marked in progress, assigned to me, and linked
to the branch :)

--
Björn Tillenius | https://launchpad.net/~bjornt

[Jonathan Lange (jml)]

2009/8/13 Björn Tillenius <email address hidden>:
>> There is a bug already filed for this, I'd much appreciate it if you
>> could find it and close it.
>
> Indeed. The bug is even marked in progress, assigned to me, and linked
> to the branch :)
>

Rock'n'roll :)

jml

=== modified file 'utilities/paste'
--- utilities/paste	2009-06-24 20:22:29 +0000
+++ utilities/paste	2009-08-13 09:25:01 +0000
@@ -17,13 +17,15 @@
 import _pythonpath
 
 from ClientCookie import Cookie, CookieJar
+from mechanize import HTTPRobotRulesProcessor
 
 from zope.testbrowser.browser import Browser
 
 
 # Should we be able to override any of these?
 AUTH_FILE = '~/.lp_auth_cookie'
-PASTE_HOST = 'pastebin.canonical.com'
+PRIVATE_PASTE_HOST = 'pastebin.canonical.com'
+PUBLIC_PASTE_HOST = 'pastebin.ubuntu.com'
 PASTE_PATH = ''
 LP_AUTH_INSTRUCTIONS = """
 %s doesn't contain a valid LP authentication cookie.
@@ -41,6 +43,9 @@
     parser.add_option('-b', '--browser',
                       default=False, action='store_true',
                       help='Open web browser to the pastebin.')
+    parser.add_option('-p', '--private',
+                      default=False, action='store_true',
+                      help='Use a private pastebin (pastebin.canonical.com).')
     parser.add_option('-s', '--syntax',
                       default='text', type='string',
                       help='The syntax of the pastebin.')
@@ -113,25 +118,35 @@
         ('content', content),
         )
 
-    # Figure out the authentication.
-    lp_cookie = get_lp_auth_cookie(AUTH_FILE)
-    if lp_cookie is None:
-        print LP_AUTH_INSTRUCTIONS
-        return
-    cookiejar = CookieJar()
-    cookiejar.set_cookie(lp_cookie)
     browser = Browser()
-    browser.mech_browser.set_cookiejar(cookiejar)
-
-    browser.open(urljoin('https://' + PASTE_HOST, PASTE_PATH))
-
-    # We need to authenticate before pasting.
-    oid_form = browser.getForm(id='openid_message')
-    if oid_form is not None:
-        authenticated = authenticate(browser)
-        if not authenticated:
+    paste_host = PUBLIC_PASTE_HOST
+    if parser.options.private:
+        paste_host = PRIVATE_PASTE_HOST
+        # Figure out the authentication.
+        lp_cookie = get_lp_auth_cookie(AUTH_FILE)
+        if lp_cookie is None:
             print LP_AUTH_INSTRUCTIONS
             return
+        cookiejar = CookieJar()
+        cookiejar.set_cookie(lp_cookie)
+        browser.mech_browser.set_cookiejar(cookiejar)
+
+    # Remove the the check for robots.txt, since the one on
+    # pastebin.ubuntu.com doesn't allow us to open the page. We're not
+    # really a robot.
+    browser.mech_browser.handlers = [
+        handler for handler in browser.mech_browser.handlers
+        if not isinstance(handler, HTTPRobotRulesProcessor)]
+    browser.open(urljoin('https://' + paste_host, PASTE_PATH))
+
+    if parser.options.private:
+        # We need to authenticate before pasting.
+        oid_form = browser.getForm(id='openid_message')
+        if oid_form is not None:
+            authenticated = authenticate(browser)
+            if not authenticated:
+                print LP_AUTH_INSTRUCTIONS
+                return
     for name, value in form:
         browser.getControl(name=name).value = value
     browser.getControl('Paste!').click()