Merging in latest boto.

tests/s3/test_connection.py

-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (c) 2006,2007 Mitch Garnaat http://garnaat.org/
+# Copyright (c) 2006-2011 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, dis-
 # tribute, sublicense, and/or sell copies of the Software, and to permit
 # persons to whom the Software is furnished to do so, subject to the fol-
 # lowing conditions:
 #
 # The above copyright notice and this permission notice shall be included
@@ skipping 47 matching lines @@
         # check to make sure content read from s3 is identical to original
         assert s1 == fp.read(), 'corrupted file'
         fp.close()
         # test generated URLs
         url = k.generate_url(3600)
         file = urllib.urlopen(url)
         assert s1 == file.read(), 'invalid URL %s' % url
         url = k.generate_url(3600, force_http=True)
         file = urllib.urlopen(url)
         assert s1 == file.read(), 'invalid URL %s' % url
+        url = k.generate_url(3600, force_http=True, headers={'x-amz-x-token' : 'XYZ'})
+        file = urllib.urlopen(url)
+        assert s1 == file.read(), 'invalid URL %s' % url
         bucket.delete_key(k)
         # test a few variations on get_all_keys - first load some data
         # for the first one, let's override the content type
         phony_mimetype = 'application/x-boto-test'
         headers = {'Content-Type': phony_mimetype}
         k.name = 'foo/bar'
         k.set_contents_from_string(s1, headers)
         k.name = 'foo/bas'
         k.set_contents_from_filename('foobar')
         k.name = 'foo/bat'
@@ skipping 97 matching lines @@
         
         # now delete all keys in bucket
         for k in bucket:
             if k.name == 'reduced_redundancy':
                 assert k.storage_class == 'REDUCED_REDUNDANCY'
             bucket.delete_key(k)
         # now delete bucket
         time.sleep(5)
         c.delete_bucket(bucket)
         print '--- tests completed ---'