Merge pull request boto#2384 from felixonmars/elb-py3

elb module: add backward-compatible support for Python 3.3+. Fixes boto#2384.
roehnan · Jul 10, 2014 · 4dcc9be · 4dcc9be
2 parents 4935f67 + 0819e1a
commit 4dcc9be
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/README.rst b/README.rst
@@ -77,7 +77,7 @@ At the moment, boto supports:
 
   * Amazon Route53 (Python 3)
   * Amazon Virtual Private Cloud (VPC)
-  * Elastic Load Balancing (ELB)
+  * Elastic Load Balancing (ELB) (Python 3)
   * AWS Direct Connect (Python 3)
 
 * Payments and Billing

diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -83,7 +83,7 @@ Currently Supported Services
 
   * :doc:`Route 53 <route53_tut>` -- (:doc:`API Reference <ref/route53>`) (Python 3)
   * :doc:`Virtual Private Cloud (VPC) <vpc_tut>` -- (:doc:`API Reference <ref/vpc>`)
-  * :doc:`Elastic Load Balancing (ELB) <elb_tut>` -- (:doc:`API Reference <ref/elb>`)
+  * :doc:`Elastic Load Balancing (ELB) <elb_tut>` -- (:doc:`API Reference <ref/elb>`) (Python 3)
   * AWS Direct Connect (Python 3)
 
 * **Payments & Billing**

diff --git a/tests/integration/ec2/elb/test_cert_verification.py b/tests/integration/ec2/elb/test_cert_verification.py
@@ -24,10 +24,10 @@
 """
 Check that all of the certs on all service endpoints validate.
 """
-import unittest
 
 from tests.integration import ServiceCertVerificationTest
 
+from boto.compat import unittest
 import boto.ec2.elb