Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix ASCII codec problem in boto.gs.bucket.Bucket; also added missing …

…copyright and fixed some comments
  • Loading branch information...
commit 1bc348f45bdf736520edadca1e6a1012d75847be 1 parent eef0e88
@mfschwartz mfschwartz authored
View
2  boto/gs/bucket.py
@@ -390,7 +390,7 @@ def _set_acl_helper(self, acl_or_str, key_name, headers, query_args,
if canned:
headers[self.connection.provider.acl_header] = acl_or_str
else:
- data = acl_or_str.encode('UTF-8')
+ data = acl_or_str
if generation:
query_args += '&generation=%s' % generation
View
2  boto/gs/connection.py
@@ -50,7 +50,7 @@ def create_bucket(self, bucket_name, headers=None,
storage_class='STANDARD'):
"""
Creates a new bucket. By default it's located in the USA. You can
- pass Location.EU to create an European bucket. You can also pass
+ pass Location.EU to create bucket in the EU. You can also pass
a LocationConstraint for where the bucket should be located, and
a StorageClass describing how the data should be stored.
View
2  tests/integration/gs/test_basic.py
@@ -25,7 +25,7 @@
# IN THE SOFTWARE.
"""
-Some unit tests for the GSConnection
+Some integration tests for the GSConnection
"""
import os
View
2  tests/integration/gs/test_generation_conditionals.py
@@ -21,7 +21,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
-"""Unit tests for GS versioning support."""
+"""Integration tests for GS versioning support."""
import StringIO
import os
View
2  tests/integration/gs/test_resumable_downloads.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-#
# Copyright 2010 Google Inc.
#
# Permission is hereby granted, free of charge, to any person obtaining a
View
2  tests/integration/gs/test_resumable_uploads.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-#
# Copyright 2010 Google Inc.
#
# Permission is hereby granted, free of charge, to any person obtaining a
View
2  tests/integration/gs/test_storage_uri.py
@@ -21,7 +21,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
-"""Unit tests for StorageUri interface."""
+"""Integration tests for StorageUri interface."""
import binascii
import re
View
2  tests/integration/gs/test_versioning.py
@@ -21,7 +21,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
-"""Unit tests for GS versioning support."""
+"""Integration tests for GS versioning support."""
from xml import sax
View
22 tests/integration/gs/util.py
@@ -1,3 +1,25 @@
+# Copyright (c) 2012, Google, Inc.
+# All rights reserved.
+#
+# 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
+# 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 MERCHANTABIL-
+# ITY, 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.
+
import time
from boto.provider import Provider
Please sign in to comment.
Something went wrong with that request. Please try again.