# This is a combination of 8 commits.

# This is the 1st commit message:

Spike of custom route waiter

# This is the commit message ansible#2:

Name waiter correctly

# This is the commit message ansible#3:

Switch to new waiter, and refactor waiters to be specced per service

# This is the commit message ansible#4:

PEP8

# This is the commit message ansible#5:

Require boto3/botocore at runtime instead of at import

# This is the commit message ansible#6:

PEP8

# This is the commit message ansible#7:

PEP8

# This is the commit message ansible#8:

Consolidate waiters to a single file

lib/ansible/module_utils/aws/waiters.py

@@ -175,4 +175,4 @@ def get_waiter(client, waiter_name):
         return waiters_by_name[(client.__class__.__name__, waiter_name)](client)
     except KeyError:
         raise NotImplementedError("Waiter {0} could not be found for client {1}. Available waiters: {2}".format(
-            waiter_name, type(client), ', '.join(repr(k) for k in waiters_by_name.keys())))
+            waiter_name, type(client), ', '.join(repr(k) for k in ec2_waiters.waiters_by_name.keys())))