~tribaal/txaws/xss-hardening

« back to all changes in this revision

Viewing changes to txaws/script.py

  • Committer: Duncan McGreggor
  • Date: 2009-11-22 21:54:23 UTC
  • mfrom: (44.3.12 484858-s3-scripts)
  • mto: This revision was merged to the branch mainline in revision 54.
  • Revision ID: duncan@canonical.com-20091122215423-n1b5p6chlomhgh68
Merged from parent branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
36
36
    if not (options.access_key and options.secret_key):
37
37
        parser.error(
38
38
            "both the access key ID and the secret key must be supplied")
39
 
    region = options.region.upper()
40
 
    if region and region not in ["US", "EU"]:
 
39
    region = options.region
 
40
    if region and region.upper() not in ["US", "EU"]:
41
41
        parser.error("region must be one of 'US' or 'EU'")
42
42
    return (options, args)