Merge branch 'cloudfront-logging' into develop

boto/cloudfront/distribution.py

@@ -30,7 +30,7 @@
 from boto.cloudfront.origin import S3Origin, CustomOrigin
 from boto.s3.acl import ACL
 
-class DistributionConfig:
+class DistributionConfig(object):
 
     def __init__(self, connection=None, origin=None, enabled=False,
                  caller_reference='', cnames=None, comment='',
@@ -100,7 +100,7 @@ def __init__(self, connection=None, origin=None, enabled=False,
             self.cnames = cnames
         self.comment = comment
         self.trusted_signers = trusted_signers
-        self.logging = None
+        self.logging = logging
         self.default_root_object = default_root_object
 
     def to_xml(self):
@@ -214,7 +214,7 @@ def to_xml(self):
         s += '</StreamingDistributionConfig>\n'
         return s
 
-class DistributionSummary:
+class DistributionSummary(object):
 
     def __init__(self, connection=None, domain_name='', id='',
                  last_modified_time=None, status='', origin=None,
@@ -279,7 +279,7 @@ class StreamingDistributionSummary(DistributionSummary):
     def get_distribution(self):
         return self.connection.get_streaming_distribution_info(self.id)
 
-class Distribution:
+class Distribution(object):
 
     def __init__(self, connection=None, config=None, domain_name='',
                  id='', last_modified_time=None, status=''):

tests/unit/cloudfront/test_distribution.py

@@ -0,0 +1,21 @@
+import unittest
+
+from boto.cloudfront.distribution import DistributionConfig
+from boto.cloudfront.logging import LoggingInfo
+
+
+class CloudfrontDistributionTest(unittest.TestCase):
+    cloudfront = True
+
+    def setUp(self):
+        self.dist = DistributionConfig()
+
+    def test_logging(self):
+        # Default.
+        self.assertEqual(self.dist.logging, None)
+
+        # Override.
+        lo = LoggingInfo(bucket='whatever', prefix='override_')
+        dist = DistributionConfig(logging=lo)
+        self.assertEqual(dist.logging.bucket, 'whatever')
+        self.assertEqual(dist.logging.prefix, 'override_')