Merge lp:~jameinel/launchpadlib/notice into lp:~launchpad-pqm/launchpadlib/devel

[John A Meinel]

[John A Meinel (jameinel)]

This is another minor patch which changes the formatting of the "this application is asking for authorization on your behalf".

When I got that message the first time, it was quite difficult to read. Especially since the URL is intermixed with the rest of the text.

This just changes the formatting to be more readable.

Unfortunately it is built on my win32 patch, since that is the only way I can checkout the sources to modify it on windows.

[Leonard Richardson (leonardr)]

> This is another minor patch which changes the formatting of the "this
> application is asking for authorization on your behalf".
>
> When I got that message the first time, it was quite difficult to read.
> Especially since the URL is intermixed with the rest of the text.
>
> This just changes the formatting to be more readable.
>
> Unfortunately it is built on my win32 patch, since that is the only way I can
> checkout the sources to modify it on windows.

Looks good, approved.*

[Paul Hummer (rockstar)]

review: Approve

=== added file 'bootstrap.py'
--- bootstrap.py	1970-01-01 00:00:00 +0000
+++ bootstrap.py	2009-07-09 14:02:54 +0000
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+"""A trivial thunk to call the real bootstrap without needing a symlink."""
+import os
+import sys
+
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), '_bootstrap'))
+import bootstrap

=== removed symlink 'bootstrap.py'
=== target was '_bootstrap/bootstrap.py'
=== modified file 'src/launchpadlib/launchpad.py'
--- src/launchpadlib/launchpad.py	2009-03-23 21:50:35 +0000
+++ src/launchpadlib/launchpad.py	2009-07-09 14:47:46 +0000
@@ -148,11 +148,11 @@
         web_root = str(web_root_uri.ensureSlash())
         authorization_url = credentials.get_request_token(web_root=web_root)
         webbrowser.open(authorization_url)
-        print ("The authorization page (%s) should be opening in your "
-               "browser. After you have authorized this program to "
-               "access Launchpad on your behalf you should come back "
-               "here and press <Enter> to finish the authentication "
-               "process." % authorization_url)
+        print "The authorization page:"
+        print "   (%s)" % authorization_url
+        print "should be opening in your browser. After you have authorized"
+        print "this program to access Launchpad on your behalf you should come"
+        print "back here and press <Enter> to finish the authentication process."
         sys.stdin.readline()
         credentials.exchange_request_token_for_access_token(web_root)
         return cls(credentials, service_root, cache, timeout, proxy_info)