--- python-boto-2.0.orig/debian/TODO +++ python-boto-2.0/debian/TODO @@ -0,0 +1,2 @@ + + * generate sphinx doco and install to a python-boto-doc package. --- python-boto-2.0.orig/debian/copyright +++ python-boto-2.0/debian/copyright @@ -0,0 +1,37 @@ +This package was debianized by Eric Evans on +Wed, 04 Jul 2007 18:54:44 -0500 + +It was downloaded from: http://code.google.com/p/boto/ + +Upstream Author: Mitch Garnaat + +Copyright (c) 2006,2007 Mitch Garnaat http://garnaat.org/ + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Portions of boto/connection.py and boto.utils.py were copied or derived +from sample code supplied by Amazon. The following notice applies to that +code. + + This software code is made available "AS IS" without warranties of any + kind. You may copy, display, modify and redistribute the software code + either by itself or as incorporated into your code; provided that you do + not remove any proprietary notices. Your use of this software code is at + your own risk and you waive any claim against Amazon Digital Services, + Inc. or its affiliates with respect to your use of this software code. + (c) 2006 Amazon Digital Services, Inc. or its affiliates. --- python-boto-2.0.orig/debian/compat +++ python-boto-2.0/debian/compat @@ -0,0 +1 @@ +5 --- python-boto-2.0.orig/debian/control +++ python-boto-2.0/debian/control @@ -0,0 +1,28 @@ +Source: python-boto +Section: python +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Eric Evans +Build-Depends: debhelper (>= 7), python (>= 2.6.6-3~) +Homepage: http://code.google.com/p/boto/ +XS-Debian-Vcs-Git: git://git.debian.org/git/users/eevans/python-boto +XS-Debian-Vcs-Browser: http://git.debian.org/?p=users/eevans/python-boto +X-Python-Version: >= 2.5 +Standards-Version: 3.9.2 + +Package: python-boto +Architecture: all +Depends: ${python:Depends}, ${misc:Depends} +Provides: ${python:Provides} +Description: Python interface to Amazon's Web Services + Boto is a Python interface to the infrastructure services available from + Amazon. + . + Boto supports the following services: + * Elastic Compute Cloud (EC2) + * SimpleDB + * Simple Storage Service (S3) + * CloudFront + * Simple Queue Service (SQS) + * Elastic MapReduce + * Relational Database Service (RDS) --- python-boto-2.0.orig/debian/rules +++ python-boto-2.0/debian/rules @@ -0,0 +1,59 @@ +#!/usr/bin/make -f + +# Verbose mode +#export DH_VERBOSE=1 + +clean: + dh_testdir + dh_testroot + + rm -f build-stamp check-stamp install-stamp + rm -rf build + find boto/ -name *.pyc | xargs rm -f + + dh_clean + +build: build-stamp +build-stamp: + dh_testdir + + python setup.py build + + touch build-stamp + +check: check-stamp +check-stamp: + -boto/tests/test.py + >$@ + +maybe_check = $(if $(findstring nocheck,$(DEB_BUILD_OPTIONS)),,check) + +install: build-stamp + dh_testdir + dh_installdirs + + python setup.py install --root $(CURDIR)/debian/python-boto \ + --install-scripts usr/share/doc/python-boto/examples/ + + for f in `find $(CURDIR)/debian/python-boto -name \*.py`; do \ + sed -e '\,^#!/usr/bin/env python,d' < $$f > $$f.tmp; \ + mv $$f.tmp $$f; \ + done + + touch install-stamp + + +binary-arch: $(maybe_check) +binary-indep: $(maybe_check) install + dh_installchangelogs + dh_compress + dh_fixperms + dh_python2 + dh_gencontrol + dh_installdeb + dh_md5sums + dh_builddeb + +binary: binary-arch binary-indep +.PHONY: build clean binary-indep binary-arch binary + --- python-boto-2.0.orig/debian/watch +++ python-boto-2.0/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts="uversionmangle=s/(([ab]|rc)[0-9])$/~\1/" \ +http://googlecode.debian.net/p/boto/boto-(.*)\.tar\.gz --- python-boto-2.0.orig/debian/NEWS +++ python-boto-2.0/debian/NEWS @@ -0,0 +1,19 @@ +python-boto (1.1c-1) unstable; urgency=low + + Boto now defaults to using the virtual bucket hosting server API for + Amazon S3. A by-product of this is that bucket names must adhere to the + same rules as host names in DNS, most notably that they are treated as + case-insensitive. This means that it is impossible to access existing + buckets which have names containing upper-case characters without + resorting to the old-style calling format. + + You can enable the older calling format by passing an instance of + boto.s3.connection.OrdinaryCallingFormat when creating connection + objects using the "calling_format" keyword. For example: + + from boto.s3.connection import OrdinaryCallingFormat + from boto import connect_s3 + + con = connect_s3(key, secret, calling_format=OrdinaryCallingFormat()) + + -- Eric Evans Thu, 03 Apr 2008 11:19:38 -0500 --- python-boto-2.0.orig/debian/changelog +++ python-boto-2.0/debian/changelog @@ -0,0 +1,188 @@ +python-boto (2.0-0ubuntu1) oneiric; urgency=low + + * New upstream release. + * Remaining changes from debian: + - debian/rules: Run testsuite during build but ignore failures + since it currently doesn't pass. + - debian/rules, debian/control: Transition from pysupport to dh_python2 + (LP: #788514) + - debian/rules: + + README removed (no longer in source tarball) + + doc install of cq.py removed (it is now installed to /usr/bin) + * Changes from upstream: + - boto/auth.py: use email.utils.formatdate(usegmt=True) instead of strftime + as the latter breaks when boto is used from application setting up + locales (like bpython or ipython); upstream issue #140. + * Dropped delta from upstream: + - boto/ec2/snapshot.py: work around non-int data in volumeSize + returned from Eucalyptus. LP: #520707. [fix is upstream] + - boto/connection.py: Handle 2.7 the same way as 2.6 for httplib + compatibility. LP: #688773. [fix is upstream] + + -- Scott Moser Thu, 14 Jul 2011 16:11:57 -0400 + +python-boto (1.9b-4ubuntu2) oneiric; urgency=low + + * debian/rules, debian/control: Transition from pysupport to dh_python2 + (LP: #788514) + + -- Evan Broder Thu, 23 Jun 2011 11:59:24 -0700 + +python-boto (1.9b-4ubuntu1) oneiric; urgency=low + + * Merge from debian unstable (LP: #788651). Remaining changes: + - debian/rules: Run testsuite during build but ignore failures + since it currently doesn't pass. + - boto/ec2/snapshot.py: work around non-int data in volumeSize + returned from Eucalyptus. LP: #520707. + - boto/connection.py: Handle 2.7 the same way as 2.6 for httplib + compatibility. LP: #688773. + - boto/cloudfront/__init__.py, boto/connection.py: use + email.utils.formatdate(usegmt=True) instead of strftime as the latter + breaks when boto is used from application setting up locales (like + bpython or ipython); upstream issue #140. + * boto.egg-info/SOURCES.txt: add last EOL, as it is now in debian + + -- Scott Moser Thu, 26 May 2011 11:35:47 -0400 + +python-boto (1.9b-4) unstable; urgency=low + + * Do not require Name param on RegisterImage (Closes: #591466). + + -- Eric Evans Tue, 03 Aug 2010 11:41:59 -0400 + +python-boto (1.9b-3) unstable; urgency=low + + * Strings exceptions are not allowed in Python 2.6 (Closes: #585284). + + -- Eric Evans Wed, 07 Jul 2010 19:36:13 +0000 + +python-boto (1.9b-2) unstable; urgency=low + + * Depend on versions of Python >= 2.5 (Closes: #563439). + + -- Eric Evans Wed, 06 Jan 2010 12:20:56 -0600 + +python-boto (1.9b-1ubuntu5) natty; urgency=low + + * boto/cloudfront/__init__.py, boto/connection.py: use + email.utils.formatdate(usegmt=True) instead of strftime as the latter + breaks when boto is used from application setting up locales (like bpython + or ipython); upstream issue #140. + * boto.egg-info/SOURCES.txt: remove last EOL again to have less diff with + upstream. + + -- Loïc Minier Fri, 04 Mar 2011 22:16:36 +0100 + +python-boto (1.9b-1ubuntu4) natty; urgency=low + + * Handle 2.7 the same way as 2.6 for httplib compatibility. LP: #688773. + + -- Matthias Klose Tue, 14 Dec 2010 19:28:01 +0100 + +python-boto (1.9b-1ubuntu3) lucid; urgency=low + + * work around non-int data in volumeSize (LP: #520707) + + -- Scott Moser Wed, 17 Feb 2010 11:51:05 -0500 + +python-boto (1.9b-1ubuntu2) lucid; urgency=low + + * boto/ec2/connection.py: fix image registration (LP: #504530). + Patch taken from upstream: + http://bazaar.launchpad.net/~vcs-imports/boto/trunk/revision/1001 + + -- Mathias Gug Mon, 11 Jan 2010 16:12:10 -0500 + +python-boto (1.9b-1ubuntu1) lucid; urgency=low + + * merge Loic's changes made in 1.8d-1ubuntu2 + * Rename Vcs-* to XS-Debian-Vcs-*. + * Run testsuite during build but ignore failures since it currently doesn't + pass. + * Add ${misc:Depends}. + * Add XB-Python-Version: ${python:Versions}. + + -- Scott Moser Tue, 05 Jan 2010 15:12:37 -0500 + +python-boto (1.9b-1) unstable; urgency=low + + * New upstream version. + + -- Eric Evans Thu, 24 Dec 2009 13:27:40 -0600 + +python-boto (1.8d-1) unstable; urgency=low + + * New Upstream Version (Closes: #536194). + + -- Eric Evans Wed, 08 Jul 2009 11:29:47 -0500 + +python-boto (1.8c-1) unstable; urgency=low + + * New Upstream Version (Closes: #534537). + + -- Eric Evans Sun, 28 Jun 2009 13:43:25 -0500 + +python-boto (1.7a-2) unstable; urgency=low + + * Patched test file to restore compatibility with python 2.4, + (Closes: #525365). + + -- Eric Evans Tue, 28 Apr 2009 21:11:20 -0500 + +python-boto (1.7a-1) unstable; urgency=low + + * New Upstream Version (Closes: #524931). + + -- Eric Evans Wed, 22 Apr 2009 20:50:03 -0500 + +python-boto (1.6b-1) unstable; urgency=low + + * New Upstream Version + + -- Eric Evans Tue, 30 Dec 2008 16:13:24 -0600 + +python-boto (1.4c-1) unstable; urgency=low + + * New Upstream Version + + -- Eric Evans Wed, 01 Oct 2008 20:47:21 -0500 + +python-boto (1.2a-1) unstable; urgency=low + + * New Upstream Version + + -- Eric Evans Sun, 20 Apr 2008 04:41:52 +0000 + +python-boto (1.1c-1) unstable; urgency=low + + * New upstream release (Closes: #461148). + * Patched boto/s3/connection.py to provide a means of restoring + the older calling convention for buckets. + + -- Eric Evans Thu, 03 Apr 2008 16:14:29 -0500 + +python-boto (1.0a-1) unstable; urgency=low + + * New upstream release. + + -- Eric Evans Thu, 10 Jan 2008 12:57:42 -0600 + +python-boto (0.9d-1) unstable; urgency=low + + * New upstream release. + + -- Eric Evans Sat, 24 Nov 2007 17:12:40 -0600 + +python-boto (0.9b-1) unstable; urgency=low + + * New upstream release. + * Move tests to /usr/share/doc/python-boto/examples, (Closes: #433373). + + -- Eric Evans Mon, 16 Jul 2007 17:17:48 -0500 + +python-boto (0.9a-1) unstable; urgency=low + + * Initial release. (Closes: #431626) + + -- Eric Evans Wed, 04 Jul 2007 17:23:42 -0500 --- python-boto-2.0.orig/boto/auth.py +++ python-boto-2.0/boto/auth.py @@ -34,11 +34,11 @@ import boto.utils import hmac import sys -import time import urllib from boto.auth_handler import AuthHandler from boto.exception import BotoClientError +from email.utils import formatdate # # the following is necessary because of the incompatibilities # between Python 2.4, 2.5, and 2.6 as well as the fact that some @@ -111,8 +111,7 @@ method = http_request.method auth_path = http_request.auth_path if not headers.has_key('Date'): - headers['Date'] = time.strftime("%a, %d %b %Y %H:%M:%S GMT", - time.gmtime()) + headers['Date'] = formatdate(usegmt=True) c_string = boto.utils.canonical_string(method, auth_path, headers, None, self._provider) @@ -136,8 +135,7 @@ def add_auth(self, http_request, **kwargs): headers = http_request.headers if not headers.has_key('Date'): - headers['Date'] = time.strftime("%a, %d %b %Y %H:%M:%S GMT", - time.gmtime()) + headers['Date'] = formatdate(usegmt=True) b64_hmac = self.sign_string(headers['Date']) auth_hdr = self._provider.auth_header @@ -157,8 +155,7 @@ def add_auth(self, http_request, **kwargs): headers = http_request.headers if not headers.has_key('Date'): - headers['Date'] = time.strftime("%a, %d %b %Y %H:%M:%S GMT", - time.gmtime()) + headers['Date'] = formatdate(usegmt=True) b64_hmac = self.sign_string(headers['Date']) s = "AWS3-HTTPS AWSAccessKeyId=%s," % self._provider.access_key