Fix upload part for py3

We were urlencoding the Content-Range header because strings are always
text_types. We should not be encoding spaces.

boto/connection.py

@@ -368,7 +368,7 @@ def authorize(self, connection, **kwargs):
             for key in self.headers:
                 val = self.headers[key]
                 if isinstance(val, six.text_type):
-                    safe = '!"#$%&\'()*+,/:;<=>?@[\\]^`{|}~'
+                    safe = '!"#$%&\'()*+,/:;<=>?@[\\]^`{|}~ '
                     self.headers[key] = quote(val.encode('utf-8'), safe)
             setattr(self, '_headers_quoted', True)
 

tests/unit/glacier/test_layer1.py

@@ -83,6 +83,15 @@ def test_get_archive_output(self):
 
 
 class TestGlacierUploadPart(GlacierLayer1ConnectionBase):
+    def test_upload_part_content_range_header(self):
+        fake_data = b'\xe2'
+        self.set_http_response(status_code=204)
+        self.service_connection.upload_part(
+            u'unicode_vault_name', 'upload_id', 'linear_hash', 'tree_hash',
+            (1,2), fake_data)
+        self.assertEqual(
+            self.actual_request.headers['Content-Range'], 'bytes 1-2/*')
+
     def test_upload_part_with_unicode_name(self):
         fake_data = b'\xe2'
         self.set_http_response(status_code=204)

tests/unit/test_connection.py

@@ -522,7 +522,7 @@ def test_get_status_error(self):
 
 class TestHTTPRequest(unittest.TestCase):
     def test_user_agent_not_url_encoded(self):
-        headers = {'Some-Header': u'should be url encoded',
+        headers = {'Some-Header': u'should be encoded \u2713',
                    'User-Agent': UserAgent}
         request = HTTPRequest('PUT', 'https', 'amazon.com', 443, None,
                               None, {}, headers, 'Body')
@@ -539,7 +539,7 @@ def mock_add_auth(req, **kwargs):
         # Ensure the headers at authorization are as expected i.e.
         # the user agent header was not url encoded but the other header was.
         self.assertEqual(mock_connection.headers_at_auth,
-                         {'Some-Header': 'should%20be%20url%20encoded',
+                         {'Some-Header': 'should be encoded %E2%9C%93',
                           'User-Agent': UserAgent})
 
     def test_content_length_str(self):