← Back to branch summary

~fwereade/pyjuju/late-command-change

« back to all changes in this revision

Viewing changes to ensemble/providers/ec2/machine.py

  • Committer: William Reade
  • Date: 2011-09-13 12:54:27 UTC
  • mfrom: (335.4.8 fix-docstrings)
  • Revision ID: fwereade@gmail.com-20110913125427-mc0j7uv61zg4fnba
module documentation is now built from docstrings; ensemble.providers docstrings should now be consistent [f=831805][r=niemeyer,jimbaker]

Show diffs side-by-side

added added

removed removed

Lines of Context:
ensemble/providers/ec2/machine.py
9
9
 
10
10
 
11
11
def machine_from_instance(instance):
 
12
    """Create an :class:`EC2ProviderMachine` from a txaws :class:`Instance`
 
13
 
 
14
    :param instance: the EC2 Instance
 
15
 
 
16
    :return: a matching :class:`EC2ProviderMachine`
 
17
    """
12
18
    return EC2ProviderMachine(
13
19
        instance.instance_id,
14
20
        instance.dns_name,