[Python-modules-commits] r19696 - in packages/python-launchpadlib/tags (5 files)
dktrkranz at users.alioth.debian.org
dktrkranz at users.alioth.debian.org
Mon Dec 19 20:47:42 UTC 2011
Date: Monday, December 19, 2011 @ 20:47:41
Author: dktrkranz
Revision: 19696
[svn-buildpackage] Tagging python-launchpadlib 1.9.12-1
Added:
packages/python-launchpadlib/tags/1.9.12-1/
packages/python-launchpadlib/tags/1.9.12-1/debian/changelog
(from rev 19695, packages/python-launchpadlib/trunk/debian/changelog)
packages/python-launchpadlib/tags/1.9.12-1/debian/patches/auth_message.patch
(from rev 19695, packages/python-launchpadlib/trunk/debian/patches/auth_message.patch)
Deleted:
packages/python-launchpadlib/tags/1.9.12-1/debian/changelog
packages/python-launchpadlib/tags/1.9.12-1/debian/patches/auth_message.patch
Deleted: packages/python-launchpadlib/tags/1.9.12-1/debian/changelog
===================================================================
--- packages/python-launchpadlib/trunk/debian/changelog 2011-12-19 20:18:19 UTC (rev 19693)
+++ packages/python-launchpadlib/tags/1.9.12-1/debian/changelog 2011-12-19 20:47:41 UTC (rev 19696)
@@ -1,239 +0,0 @@
-python-launchpadlib (1.9.11-1) unstable; urgency=low
-
- * New upstream release.
- - No longer use HOME environment variable to determine path of the
- home directory (Closes: #644678).
- * debian/patches/auth_message.patch:
- - Refresh for new upstream release.
- * debian/control:
- - Suggest python-pkg-resources and python-testresources.
- - Drop Breaks: ${python:Breaks} field, no longer needed.
- * debian/rules:
- - Pass --no-guessing-deps to dh_python2 to avoid listing unneeded
- dependencies, they are added manually instead.
-
- -- Luca Falavigna <dktrkranz at debian.org> Sat, 26 Nov 2011 10:51:46 +0100
-
-python-launchpadlib (1.9.9-2) unstable; urgency=low
-
- * debian/patches/auth_message.patch:
- - Add a delay before attempting to launch browser (Closes: #584556).
-
- -- Luca Falavigna <dktrkranz at debian.org> Sun, 02 Oct 2011 00:24:04 +0200
-
-python-launchpadlib (1.9.9-1) unstable; urgency=low
-
- * New upstream release.
- * debian/docs:
- - Do not install NEWS.txt, already provided as changelog.
-
- -- Luca Falavigna <dktrkranz at debian.org> Thu, 11 Aug 2011 18:30:25 +0200
-
-python-launchpadlib (1.9.8-2) unstable; urgency=low
-
- * Python transition:
- - Add support for python2.7 (Closes: #623211)
- * debian/control:
- - Bump Standards-Version to 3.9.2, no changes required.
-
- -- Luca Falavigna <dktrkranz at debian.org> Mon, 18 Apr 2011 22:46:51 +0200
-
-python-launchpadlib (1.9.8-1) unstable; urgency=low
-
- * New upstream release.
- - Restore compatibility with login_with() API (Closes: #616484).
- * debian/control:
- - Bump X-Python-Version to >= 2.6 (Closes: #615100).
- - Explicitly require minimun versions for python-lazr.uri and
- python-lazr.restfulclient dependencies (Closes: #616483).
- - Bump python-keyring minimum version to be at least 0.5.
- * debian/NEWS:
- - Document major issues with newer launchpadlib versions, shamelessly
- taken from ubuntu-dev-tools, and provided by Stefano Rivera.
-
- -- Luca Falavigna <dktrkranz at debian.org> Sun, 06 Mar 2011 00:45:13 +0100
-
-python-launchpadlib (1.8.0-2) unstable; urgency=low
-
- * Upload to unstable.
-
- -- Luca Falavigna <dktrkranz at debian.org> Thu, 24 Feb 2011 21:20:57 +0100
-
-python-launchpadlib (1.8.0-1) experimental; urgency=low
-
- * New upstream release.
- * Switch to dh_python2.
- * debian/control:
- - Depend on python-keyring.
- - Bump Standards-Version to 3.9.1, no changes required.
-
- -- Luca Falavigna <dktrkranz at debian.org> Sat, 04 Dec 2010 11:59:09 +0100
-
-python-launchpadlib (1.6.2-1) unstable; urgency=low
-
- * New upstream release.
- * debian/patches/no_package_data.patch:
- - Do not install documentation files in Python module directory.
- * debian/control:
- - Tighten python-lazr.restfulclient dependency to be >= 0.9.19.
- - Bump Standards-Version to 3.9.0, no changes required.
- * debian/docs:
- - Install documentation files under /usr/share/doc (Closes: #580324).
-
- -- Luca Falavigna <dktrkranz at debian.org> Mon, 28 Jun 2010 23:36:51 +0200
-
-python-launchpadlib (1.6.1-1) unstable; urgency=low
-
- * New upstream release.
- * debian/control:
- - Tighten python-lazr.restfulclient dependency to be >= 0.9.18.
-
- -- Luca Falavigna <dktrkranz at debian.org> Thu, 17 Jun 2010 20:35:14 +0200
-
-python-launchpadlib (1.6.0-1) unstable; urgency=low
-
- * New upstream version.
- * debian/control:
- - Add Breaks field listing packages not yet compatible with new
- Launchpad API 1.0.
- * debian/preinst:
- - Remove it, useful for Ubuntu Lucid only.
-
- -- Luca Falavigna <dktrkranz at debian.org> Thu, 13 May 2010 21:05:20 +0200
-
-python-launchpadlib (1.5.7-1) unstable; urgency=low
-
- * New upstream release.
- * Switch to format 3.0 (quilt).
-
- -- Luca Falavigna <dktrkranz at debian.org> Tue, 23 Mar 2010 21:21:00 +0100
-
-python-launchpadlib (1.5.6-1) unstable; urgency=low
-
- * New upstream release.
- * debian/control:
- - Move myself as Maintainer, DPMT as Uploaders.
- * debian/rules:
- - Install upstream changelog.
-
- -- Luca Falavigna <dktrkranz at debian.org> Sat, 06 Mar 2010 15:27:48 +0100
-
-python-launchpadlib (1.5.5-1) unstable; urgency=low
-
- * New upstream version.
- * debian/control:
- - Tighten python-lazr.restfulclient dependency to be >= 0.9.11.
-
- -- Luca Falavigna <dktrkranz at debian.org> Wed, 17 Feb 2010 21:49:35 +0100
-
-python-launchpadlib (1.5.4-2) unstable; urgency=low
-
- * Always depend on python-simplejson, drop the alternative python2.6
- dependency, as launchpadlib explicitly needs simplejson, not json
- provided by python2.6, thanks Martin Pitt! (Closes: #566795).
- * Bump Standards-Version to 3.8.4, no changes required.
-
- -- Luca Falavigna <dktrkranz at debian.org> Sat, 13 Feb 2010 14:12:53 +0100
-
-python-launchpadlib (1.5.4-1) unstable; urgency=low
-
- * New upstream release.
- * lazr.restfulclient must be at least 0.9.10.
-
- -- Luca Falavigna <dktrkranz at debian.org> Fri, 25 Dec 2009 15:47:59 +0100
-
-python-launchpadlib (1.5.3-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Luca Falavigna <dktrkranz at debian.org> Tue, 03 Nov 2009 22:13:38 +0100
-
-python-launchpadlib (1.5.2-1) unstable; urgency=low
-
- * Initial Debian release (Closes: #551273).
- * Package taken from Ubuntu, major changes introduced are:
- - Switch to debhelper 7.
- - Switch to python-support, also providing preinst script to handle
- removal of stale .pyc files to ease transition.
-
- -- Luca Falavigna <dktrkranz at debian.org> Sun, 18 Oct 2009 22:32:34 +0200
-
-python-launchpadlib (1.5.1-0ubuntu1) karmic; urgency=low
-
- * New upstream release.
-
- -- James Westby <james.westby at ubuntu.com> Tue, 25 Aug 2009 11:51:36 +0100
-
-python-launchpadlib (0.2~bzr35-0ubuntu1) jaunty; urgency=low
-
- * New upstream snapshot.
- - Optimise PATCH by not sending a GET afterwards, and using the object
- returned in the body of the response to the PATCH.
-
- -- James Westby <james.westby at ubuntu.com> Tue, 17 Feb 2009 21:09:34 +0000
-
-python-launchpadlib (0.2~bzr34-0ubuntu1) jaunty; urgency=low
-
- * New upstream snapshot.
- - Handle datetime parameters, converting them to string format before
- sending them out.
- - Make the error message if not using keyword args more understandable.
-
- -- James Westby <james.westby at ubuntu.com> Mon, 16 Feb 2009 15:46:06 +0000
-
-python-launchpadlib (0.2~bzr29-0ubuntu1) jaunty; urgency=low
-
- * New upstream snapshot.
- - Some fixes to the XSL.
- - Make launchpadlib take advantage of 'http_etag' information embedded
- in entry representations.
- - Make launchpadlib JSON-encode all outgoing strings that will be
- used as named operation arguments.
- - Make IPerson.archive available.
-
- -- James Westby <james.westby at canonical.com> Sun, 04 Jan 2009 01:09:05 +0000
-
-python-launchpadlib (0.2~bzr25-0ubuntu1) intrepid; urgency=low
-
- * New upstream snapshot.
- - Add support for hosted file resources, e.g. bug attachments.
- - Add support for indexing of collections that aren't top-level
- collections, so you don't have to slice and then index.
- - For hosted file resources expose filename and date uploaded.
- Take filename as an argument when uploading a file.
- - Automatically encode non-string parameters to named operations as JSON.
- * Increase dependency on python-httplib2 to (>= 0.4.0) as the new version
- uses some of its new features.
-
- -- James Westby <james.westby at canonical.com> Tue, 07 Oct 2008 13:23:46 +0100
-
-python-launchpadlib (0.2~bzr17-0ubuntu1) intrepid; urgency=low
-
- * New upstream snapshot.
- - Use the webbrowser module instead of trying to guess the user's browser.
- - dir() on a Resource object now shows all Launchpad attributes and
- operations. (bug 253407)
- - Sign all HTTP requests with the OAuth credentials (previously, requests
- triggered by redirects were not being signed.)
- - Make it possible to load a resource from a stored URL. (bug 251497)
- - Fix "A link attribute that's None gives an error instead of returning
- None". (bug 255364)
- - Do not fetch a collection's content when only requested to call a named
- operation on that collection (bug 253635)
- - Add support for slices on Collection objects (bug 251523)
- - Make it possible to look up projects by name.
- - Implement client-side conditional GET and PUT.
- - Request compressed data in the TE header, not the Accept-Encoding header.
- (bug 261619)
-
- -- James Westby <james.westby at canonical.com> Sun, 31 Aug 2008 18:57:01 +0100
-
-python-launchpadlib (0.1~bzr7-0ubuntu1) intrepid; urgency=low
-
- * Initial release (LP: #254592)
- * Disable setuptools_bzr in setup.py as we are building from a tarball,
- and this breaks the detection of data files, meaning that important
- data files are not included in the package.
-
- -- James Westby <james.westby at canonical.com> Mon, 04 Aug 2008 13:50:55 +0100
-
Copied: packages/python-launchpadlib/tags/1.9.12-1/debian/changelog (from rev 19695, packages/python-launchpadlib/trunk/debian/changelog)
===================================================================
--- packages/python-launchpadlib/tags/1.9.12-1/debian/changelog (rev 0)
+++ packages/python-launchpadlib/tags/1.9.12-1/debian/changelog 2011-12-19 20:47:41 UTC (rev 19696)
@@ -0,0 +1,247 @@
+python-launchpadlib (1.9.12-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/patches/auth_message.patch:
+ - Refresh for new upstream release.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Mon, 19 Dec 2011 21:43:08 +0100
+
+python-launchpadlib (1.9.11-1) unstable; urgency=low
+
+ * New upstream release.
+ - No longer use HOME environment variable to determine path of the
+ home directory (Closes: #644678).
+ * debian/patches/auth_message.patch:
+ - Refresh for new upstream release.
+ * debian/control:
+ - Suggest python-pkg-resources and python-testresources.
+ - Drop Breaks: ${python:Breaks} field, no longer needed.
+ * debian/rules:
+ - Pass --no-guessing-deps to dh_python2 to avoid listing unneeded
+ dependencies, they are added manually instead.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Sat, 26 Nov 2011 10:51:46 +0100
+
+python-launchpadlib (1.9.9-2) unstable; urgency=low
+
+ * debian/patches/auth_message.patch:
+ - Add a delay before attempting to launch browser (Closes: #584556).
+
+ -- Luca Falavigna <dktrkranz at debian.org> Sun, 02 Oct 2011 00:24:04 +0200
+
+python-launchpadlib (1.9.9-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/docs:
+ - Do not install NEWS.txt, already provided as changelog.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Thu, 11 Aug 2011 18:30:25 +0200
+
+python-launchpadlib (1.9.8-2) unstable; urgency=low
+
+ * Python transition:
+ - Add support for python2.7 (Closes: #623211)
+ * debian/control:
+ - Bump Standards-Version to 3.9.2, no changes required.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Mon, 18 Apr 2011 22:46:51 +0200
+
+python-launchpadlib (1.9.8-1) unstable; urgency=low
+
+ * New upstream release.
+ - Restore compatibility with login_with() API (Closes: #616484).
+ * debian/control:
+ - Bump X-Python-Version to >= 2.6 (Closes: #615100).
+ - Explicitly require minimun versions for python-lazr.uri and
+ python-lazr.restfulclient dependencies (Closes: #616483).
+ - Bump python-keyring minimum version to be at least 0.5.
+ * debian/NEWS:
+ - Document major issues with newer launchpadlib versions, shamelessly
+ taken from ubuntu-dev-tools, and provided by Stefano Rivera.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Sun, 06 Mar 2011 00:45:13 +0100
+
+python-launchpadlib (1.8.0-2) unstable; urgency=low
+
+ * Upload to unstable.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Thu, 24 Feb 2011 21:20:57 +0100
+
+python-launchpadlib (1.8.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * Switch to dh_python2.
+ * debian/control:
+ - Depend on python-keyring.
+ - Bump Standards-Version to 3.9.1, no changes required.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Sat, 04 Dec 2010 11:59:09 +0100
+
+python-launchpadlib (1.6.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/patches/no_package_data.patch:
+ - Do not install documentation files in Python module directory.
+ * debian/control:
+ - Tighten python-lazr.restfulclient dependency to be >= 0.9.19.
+ - Bump Standards-Version to 3.9.0, no changes required.
+ * debian/docs:
+ - Install documentation files under /usr/share/doc (Closes: #580324).
+
+ -- Luca Falavigna <dktrkranz at debian.org> Mon, 28 Jun 2010 23:36:51 +0200
+
+python-launchpadlib (1.6.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control:
+ - Tighten python-lazr.restfulclient dependency to be >= 0.9.18.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Thu, 17 Jun 2010 20:35:14 +0200
+
+python-launchpadlib (1.6.0-1) unstable; urgency=low
+
+ * New upstream version.
+ * debian/control:
+ - Add Breaks field listing packages not yet compatible with new
+ Launchpad API 1.0.
+ * debian/preinst:
+ - Remove it, useful for Ubuntu Lucid only.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Thu, 13 May 2010 21:05:20 +0200
+
+python-launchpadlib (1.5.7-1) unstable; urgency=low
+
+ * New upstream release.
+ * Switch to format 3.0 (quilt).
+
+ -- Luca Falavigna <dktrkranz at debian.org> Tue, 23 Mar 2010 21:21:00 +0100
+
+python-launchpadlib (1.5.6-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control:
+ - Move myself as Maintainer, DPMT as Uploaders.
+ * debian/rules:
+ - Install upstream changelog.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Sat, 06 Mar 2010 15:27:48 +0100
+
+python-launchpadlib (1.5.5-1) unstable; urgency=low
+
+ * New upstream version.
+ * debian/control:
+ - Tighten python-lazr.restfulclient dependency to be >= 0.9.11.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Wed, 17 Feb 2010 21:49:35 +0100
+
+python-launchpadlib (1.5.4-2) unstable; urgency=low
+
+ * Always depend on python-simplejson, drop the alternative python2.6
+ dependency, as launchpadlib explicitly needs simplejson, not json
+ provided by python2.6, thanks Martin Pitt! (Closes: #566795).
+ * Bump Standards-Version to 3.8.4, no changes required.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Sat, 13 Feb 2010 14:12:53 +0100
+
+python-launchpadlib (1.5.4-1) unstable; urgency=low
+
+ * New upstream release.
+ * lazr.restfulclient must be at least 0.9.10.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Fri, 25 Dec 2009 15:47:59 +0100
+
+python-launchpadlib (1.5.3-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Tue, 03 Nov 2009 22:13:38 +0100
+
+python-launchpadlib (1.5.2-1) unstable; urgency=low
+
+ * Initial Debian release (Closes: #551273).
+ * Package taken from Ubuntu, major changes introduced are:
+ - Switch to debhelper 7.
+ - Switch to python-support, also providing preinst script to handle
+ removal of stale .pyc files to ease transition.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Sun, 18 Oct 2009 22:32:34 +0200
+
+python-launchpadlib (1.5.1-0ubuntu1) karmic; urgency=low
+
+ * New upstream release.
+
+ -- James Westby <james.westby at ubuntu.com> Tue, 25 Aug 2009 11:51:36 +0100
+
+python-launchpadlib (0.2~bzr35-0ubuntu1) jaunty; urgency=low
+
+ * New upstream snapshot.
+ - Optimise PATCH by not sending a GET afterwards, and using the object
+ returned in the body of the response to the PATCH.
+
+ -- James Westby <james.westby at ubuntu.com> Tue, 17 Feb 2009 21:09:34 +0000
+
+python-launchpadlib (0.2~bzr34-0ubuntu1) jaunty; urgency=low
+
+ * New upstream snapshot.
+ - Handle datetime parameters, converting them to string format before
+ sending them out.
+ - Make the error message if not using keyword args more understandable.
+
+ -- James Westby <james.westby at ubuntu.com> Mon, 16 Feb 2009 15:46:06 +0000
+
+python-launchpadlib (0.2~bzr29-0ubuntu1) jaunty; urgency=low
+
+ * New upstream snapshot.
+ - Some fixes to the XSL.
+ - Make launchpadlib take advantage of 'http_etag' information embedded
+ in entry representations.
+ - Make launchpadlib JSON-encode all outgoing strings that will be
+ used as named operation arguments.
+ - Make IPerson.archive available.
+
+ -- James Westby <james.westby at canonical.com> Sun, 04 Jan 2009 01:09:05 +0000
+
+python-launchpadlib (0.2~bzr25-0ubuntu1) intrepid; urgency=low
+
+ * New upstream snapshot.
+ - Add support for hosted file resources, e.g. bug attachments.
+ - Add support for indexing of collections that aren't top-level
+ collections, so you don't have to slice and then index.
+ - For hosted file resources expose filename and date uploaded.
+ Take filename as an argument when uploading a file.
+ - Automatically encode non-string parameters to named operations as JSON.
+ * Increase dependency on python-httplib2 to (>= 0.4.0) as the new version
+ uses some of its new features.
+
+ -- James Westby <james.westby at canonical.com> Tue, 07 Oct 2008 13:23:46 +0100
+
+python-launchpadlib (0.2~bzr17-0ubuntu1) intrepid; urgency=low
+
+ * New upstream snapshot.
+ - Use the webbrowser module instead of trying to guess the user's browser.
+ - dir() on a Resource object now shows all Launchpad attributes and
+ operations. (bug 253407)
+ - Sign all HTTP requests with the OAuth credentials (previously, requests
+ triggered by redirects were not being signed.)
+ - Make it possible to load a resource from a stored URL. (bug 251497)
+ - Fix "A link attribute that's None gives an error instead of returning
+ None". (bug 255364)
+ - Do not fetch a collection's content when only requested to call a named
+ operation on that collection (bug 253635)
+ - Add support for slices on Collection objects (bug 251523)
+ - Make it possible to look up projects by name.
+ - Implement client-side conditional GET and PUT.
+ - Request compressed data in the TE header, not the Accept-Encoding header.
+ (bug 261619)
+
+ -- James Westby <james.westby at canonical.com> Sun, 31 Aug 2008 18:57:01 +0100
+
+python-launchpadlib (0.1~bzr7-0ubuntu1) intrepid; urgency=low
+
+ * Initial release (LP: #254592)
+ * Disable setuptools_bzr in setup.py as we are building from a tarball,
+ and this breaks the detection of data files, meaning that important
+ data files are not included in the package.
+
+ -- James Westby <james.westby at canonical.com> Mon, 04 Aug 2008 13:50:55 +0100
+
Deleted: packages/python-launchpadlib/tags/1.9.12-1/debian/patches/auth_message.patch
===================================================================
--- packages/python-launchpadlib/trunk/debian/patches/auth_message.patch 2011-12-19 20:18:19 UTC (rev 19693)
+++ packages/python-launchpadlib/tags/1.9.12-1/debian/patches/auth_message.patch 2011-12-19 20:47:41 UTC (rev 19696)
@@ -1,48 +0,0 @@
-Description: Add a delay before attempting to launch browser
-Author: Luca Falavigna <dktrkranz at debian.org>
-Bug-Debian: http://bugs.debian.org/584556
-Forwarded: https://launchpad.net/launchpadlib/+bug/643699
-
-Index: python-launchpadlib-1.9.9/src/launchpadlib/credentials.py
-===================================================================
---- python-launchpadlib-1.9.9.orig/src/launchpadlib/credentials.py 2011-08-12 16:03:32.135963413 +0200
-+++ python-launchpadlib-1.9.9/src/launchpadlib/credentials.py 2011-08-12 16:25:06.104003055 +0200
-@@ -31,7 +31,9 @@
- from cStringIO import StringIO
- import httplib2
- import os
-+from select import select
- import stat
-+from sys import stdin
- import time
- from urllib import urlencode
- from urlparse import urljoin
-@@ -520,7 +522,10 @@
- themselves.
- """
-
-- WAITING_FOR_USER = "The authorization page:\n (%s)\nshould be opening in your browser. Use your browser to authorize\nthis program to access Launchpad on your behalf. \n\nWaiting to hear from Launchpad about your decision..."
-+ WAITING_FOR_USER = "The authorization page:\n (%s)\nshould be opening in your browser. Use your browser to authorize\nthis program to access Launchpad on your behalf."
-+ TIMEOUT_MESSAGE = "Press any key to continue or wait (%d) seconds..."
-+ TIMEOUT = 5
-+ WAITING_FOR_LAUNCHPAD = "Waiting to hear from Launchpad about your decision..."
-
- def __init__(self, service_root, application_name, consumer_name=None,
- credential_save_failed=None, allow_access_levels=None):
-@@ -556,8 +561,15 @@
- """Have the end-user authorize the token in their browser."""
-
- authorization_url = self.authorization_url(request_token)
-- webbrowser.open(authorization_url)
- self.output(self.WAITING_FOR_USER % authorization_url)
-+ self.output(self.TIMEOUT_MESSAGE % self.TIMEOUT)
-+ # Wait a little time before attempting to launch browser,
-+ # give users the chance to press a key to skip it anyway.
-+ rlist, _, _ = select([stdin], [], [], self.TIMEOUT)
-+ if rlist:
-+ stdin.readline()
-+ self.output(self.WAITING_FOR_LAUNCHPAD)
-+ webbrowser.open(authorization_url)
- while credentials.access_token is None:
- time.sleep(access_token_poll_time)
- try:
Copied: packages/python-launchpadlib/tags/1.9.12-1/debian/patches/auth_message.patch (from rev 19695, packages/python-launchpadlib/trunk/debian/patches/auth_message.patch)
===================================================================
--- packages/python-launchpadlib/tags/1.9.12-1/debian/patches/auth_message.patch (rev 0)
+++ packages/python-launchpadlib/tags/1.9.12-1/debian/patches/auth_message.patch 2011-12-19 20:47:41 UTC (rev 19696)
@@ -0,0 +1,48 @@
+Description: Add a delay before attempting to launch browser
+Author: Luca Falavigna <dktrkranz at debian.org>
+Bug-Debian: http://bugs.debian.org/584556
+Forwarded: https://launchpad.net/launchpadlib/+bug/643699
+
+Index: python-launchpadlib-1.9.9/src/launchpadlib/credentials.py
+===================================================================
+--- python-launchpadlib-1.9.9.orig/src/launchpadlib/credentials.py 2011-08-12 16:03:32.135963413 +0200
++++ python-launchpadlib-1.9.9/src/launchpadlib/credentials.py 2011-08-12 16:25:06.104003055 +0200
+@@ -31,7 +31,9 @@
+ from cStringIO import StringIO
+ import httplib2
+ import os
++from select import select
+ import stat
++from sys import stdin
+ import time
+ from urllib import urlencode
+ from urlparse import urljoin
+@@ -530,7 +532,10 @@
+ themselves.
+ """
+
+- WAITING_FOR_USER = "The authorization page:\n (%s)\nshould be opening in your browser. Use your browser to authorize\nthis program to access Launchpad on your behalf. \n\nWaiting to hear from Launchpad about your decision..."
++ WAITING_FOR_USER = "The authorization page:\n (%s)\nshould be opening in your browser. Use your browser to authorize\nthis program to access Launchpad on your behalf."
++ TIMEOUT_MESSAGE = "Press any key to continue or wait (%d) seconds..."
++ TIMEOUT = 5
++ WAITING_FOR_LAUNCHPAD = "Waiting to hear from Launchpad about your decision..."
+
+ def __init__(self, service_root, application_name, consumer_name=None,
+ credential_save_failed=None, allow_access_levels=None):
+@@ -566,8 +571,15 @@
+ """Have the end-user authorize the token in their browser."""
+
+ authorization_url = self.authorization_url(request_token)
+- webbrowser.open(authorization_url)
+ self.output(self.WAITING_FOR_USER % authorization_url)
++ self.output(self.TIMEOUT_MESSAGE % self.TIMEOUT)
++ # Wait a little time before attempting to launch browser,
++ # give users the chance to press a key to skip it anyway.
++ rlist, _, _ = select([stdin], [], [], self.TIMEOUT)
++ if rlist:
++ stdin.readline()
++ self.output(self.WAITING_FOR_LAUNCHPAD)
++ webbrowser.open(authorization_url)
+ while credentials.access_token is None:
+ time.sleep(access_token_poll_time)
+ try:
More information about the Python-modules-commits
mailing list