← Back to branch summary

~tribaal/txaws/xss-hardening

« back to all changes in this revision

Viewing changes to txaws/ec2/client.py

  • Committer: Jamu Kakar
  • Date: 2011-04-21 13:10:37 UTC
  • mto: This revision was merged to the branch mainline in revision 84.
  • Revision ID: jkakar@kakar.ca-20110421131037-wgxdheq8zkp2tnmk
- Made changes to silence deprecations warnings on Python 2.7.

Show diffs side-by-side

added added

removed removed

Lines of Context:
txaws/ec2/client.py
76
76
            "availabilityZone")
77
77
        products = []
78
78
        product_codes = instance_data.find("productCodes")
79
 
        if product_codes:
 
79
        if product_codes is not None:
80
80
            for product_data in instance_data.find("productCodes"):
81
81
                products.append(product_data.text)
82
82
        kernel_id = instance_data.findtext("kernelId")
236
236
            owner_id = group_info.findtext("ownerId")
237
237
            allowed_groups = []
238
238
            allowed_ips = []
239
 
            ip_permissions = group_info.find("ipPermissions") or ()
 
239
            ip_permissions = group_info.find("ipPermissions")
 
240
            if ip_permissions is None:
 
241
                ip_permissions = ()
240
242
            for ip_permission in ip_permissions:
241
243
                ip_protocol = ip_permission.findtext("ipProtocol")
242
244
                from_port = int(ip_permission.findtext("fromPort"))
630
632
        results = []
631
633
        root = XML(xml_bytes)
632
634
        keypairs = root.find("keySet")
633
 
        if not keypairs:
 
635
        if keypairs is None:
634
636
            return results
635
637
        for keypair_data in keypairs:
636
638
            key_name = keypair_data.findtext("keyName")