Update checked in version of gsutil to version 4.6

third_party/boto/bin/s3put

 #!/usr/bin/env python
 # Copyright (c) 2006,2007,2008 Mitch Garnaat http://garnaat.org/
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
 # without limitation the rights to use, copy, modify, merge, publish, dis-
 # tribute, sublicense, and/or sell copies of the Software, and to permit
 # persons to whom the Software is furnished to do so, subject to the fol-
 # lowing conditions:
@@ skipping 155 matching lines @@
                 _upload(retries_left=retries_left - 1)
             else:
                 print 'Failed uploading part #%d' % part_num
                 raise exc
         else:
             if debug == 1:
                 print '... Uploaded part #%d' % part_num
 
     _upload()
 
+def check_valid_region(conn, region):
+    if conn is None:
+        print 'Invalid region (%s)' % region
+        sys.exit(1)
 
 def multipart_upload(bucketname, aws_key, aws_secret, source_path, keyname,
                      reduced, debug, cb, num_cb, acl='private', headers={},
                      guess_mimetype=True, parallel_processes=4,
                      region=DEFAULT_REGION):
     """
     Parallel multipart upload.
     """
     conn = boto.s3.connect_to_region(region, aws_access_key_id=aws_key,
                                      aws_secret_access_key=aws_secret)
+    check_valid_region(conn, region)
     conn.debug = debug
     bucket = conn.get_bucket(bucketname)
 
     if guess_mimetype:
         mtype = mimetypes.guess_type(keyname)[0] or 'application/octet-stream'
         headers.update({'Content-Type': mtype})
 
     mp = bucket.initiate_multipart_upload(keyname, headers=headers,
                                           reduced_redundancy=reduced)
 
@@ skipping 131 matching lines @@
 
     connect_args = {
         'aws_access_key_id': aws_access_key_id,
         'aws_secret_access_key': aws_secret_access_key
     }
 
     if host:
         connect_args['host'] = host
 
     c = boto.s3.connect_to_region(region or DEFAULT_REGION, **connect_args)
+    check_valid_region(c, region or DEFAULT_REGION)
     c.debug = debug
     b = c.get_bucket(bucket_name, validate=False)
 
     # Attempt to determine location and warn if no --host or --region
     # arguments were passed. Then try to automagically figure out
     # what should have been passed and fix it.
     if host is None and region is None:
         try:
             location = b.get_location()
 
@@ skipping 70 matching lines @@
                                  reduced, debug, cb, num_cb,
                                  grant or 'private', headers,
                                  region=region or DEFAULT_REGION)
             else:
                 singlepart_upload(b, key_name, fullpath, cb=cb, num_cb=num_cb,
                                   policy=grant, reduced_redundancy=reduced,
                                   headers=headers)
 
 if __name__ == "__main__":
     main()