cloudfront module: add backward-compatible support for Python 3.3+

Nozbe · Jul 3, 2014 · f929e0c · f929e0c
1 parent 1ac79d0
commit f929e0c
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 13 deletions.
diff --git a/README.rst b/README.rst
@@ -37,7 +37,7 @@ At the moment, boto supports:
 
 * Content Delivery
 
-  * Amazon CloudFront
+  * Amazon CloudFront (Python 3)
 
 * Database
 

diff --git a/boto/cloudfront/__init__.py b/boto/cloudfront/__init__.py
@@ -78,7 +78,7 @@ def _get_all_objects(self, resource, tags, result_set_class=None,
         rs_kwargs = result_set_kwargs or dict()
         rs = rs_class(tags, **rs_kwargs)
         h = handler.XmlHandler(rs, self)
-        xml.sax.parseString(body, h)
+        xml.sax.parseString(body.encode('utf-8'), h)
         return rs
 
     def _get_info(self, id, resource, dist_class):
@@ -94,7 +94,7 @@ def _get_info(self, id, resource, dist_class):
             if key.lower() == 'etag':
                 d.etag = response_headers[key]
         h = handler.XmlHandler(d, self)
-        xml.sax.parseString(body, h)
+        xml.sax.parseString(body.encode('utf-8'), h)
         return d
 
     def _get_config(self, id, resource, config_class):
@@ -107,7 +107,7 @@ def _get_config(self, id, resource, config_class):
         d = config_class(connection=self)
         d.etag = self.get_etag(response)
         h = handler.XmlHandler(d, self)
-        xml.sax.parseString(body, h)
+        xml.sax.parseString(body.encode('utf-8'), h)
         return d
 
     def _set_config(self, distribution_id, etag, config):
@@ -134,7 +134,7 @@ def _create_object(self, config, resource, dist_class):
         if response.status == 201:
             d = dist_class(connection=self)
             h = handler.XmlHandler(d, self)
-            xml.sax.parseString(body, h)
+            xml.sax.parseString(body.encode('utf-8'), h)
             d.etag = self.get_etag(response)
             return d
         else:
@@ -257,7 +257,7 @@ def create_invalidation_request(self, distribution_id, paths,
         body = response.read()
         if response.status == 201:
             h = handler.XmlHandler(paths, self)
-            xml.sax.parseString(body, h)
+            xml.sax.parseString(body.encode('utf-8'), h)
             return paths
         else:
             raise CloudFrontServerError(response.status, response.reason, body)
@@ -272,7 +272,7 @@ def invalidation_request_status(self, distribution_id,
         if response.status == 200:
             paths = InvalidationBatch([])
             h = handler.XmlHandler(paths, self)
-            xml.sax.parseString(body, h)
+            xml.sax.parseString(body.encode('utf-8'), h)
             return paths
         else:
             raise CloudFrontServerError(response.status, response.reason, body)

diff --git a/boto/cloudfront/distribution.py b/boto/cloudfront/distribution.py
@@ -22,7 +22,7 @@
 import uuid
 import base64
 import time
-from boto.compat import json
+from boto.compat import six, json
 from boto.cloudfront.identity import OriginAccessIdentity
 from boto.cloudfront.object import Object, StreamingObject
 from boto.cloudfront.signers import ActiveTrustedSigners, TrustedSigners
@@ -665,7 +665,7 @@ def _sign_string(message, private_key_file=None, private_key_string=None):
             raise ValueError("You must specify one of private_key_file or private_key_string")
         # If private_key_file is a file name, open it and read it
         if private_key_string is None:
-            if isinstance(private_key_file, basestring):
+            if isinstance(private_key_file, six.string_types):
                 with open(private_key_file, 'r') as file_handle:
                     private_key_string = file_handle.read()
             # Otherwise, treat it like a file

diff --git a/boto/cloudfront/invalidation.py b/boto/cloudfront/invalidation.py
@@ -20,8 +20,8 @@
 # IN THE SOFTWARE.
 
 import uuid
-import urllib
 
+from boto.compat import urllib
 from boto.resultset import ResultSet
 
 
@@ -71,7 +71,7 @@ def escape(self, p):
         """Escape a path, make sure it begins with a slash and contains no invalid characters"""
         if not p[0] == "/":
             p = "/%s" % p
-        return urllib.quote(p)
+        return urllib.parse.quote(p)
 
     def to_xml(self):
         """Get this batch as XML"""

diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -39,7 +39,7 @@ Currently Supported Services
 
 * **Content Delivery**
 
-  * :doc:`CloudFront <cloudfront_tut>` -- (:doc:`API Reference <ref/cloudfront>`)
+  * :doc:`CloudFront <cloudfront_tut>` -- (:doc:`API Reference <ref/cloudfront>`) (Python 3)
 
 * **Database**
 

diff --git a/tests/test.py b/tests/test.py
@@ -38,6 +38,7 @@
 PY3_WHITELIST = (
     'tests/unit/auth',
     'tests/unit/beanstalk',
+    'tests/unit/cloudfront',
     'tests/unit/cloudtrail',
     'tests/unit/directconnect',
     'tests/unit/elasticache',

diff --git a/tests/unit/cloudfront/test_signed_urls.py b/tests/unit/cloudfront/test_signed_urls.py
@@ -4,7 +4,7 @@
     import simplejson as json
 except ImportError:
     import json
-from cStringIO import StringIO
+from boto.compat import StringIO
 from textwrap import dedent
 
 from boto.cloudfront.distribution import Distribution