Skip to content

Fix for 301 Moved Permanently #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dotansimha wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for 301 Moved Permanently #54

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions s3-parallel-put
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ def putter(put, put_queue, stat_queue, options):
should_gzip = False
try:
if connection is None:
connection = S3Connection(is_secure=options.secure, host=options.host)
connection = boto.s3.connect_to_region(options.bucket_region,is_secure=options.secure)
if bucket is None:
bucket = connection.get_bucket(options.bucket)
key = put(bucket, key_name, value)
Expand Down Expand Up @@ -373,9 +373,9 @@ def main(argv):
group = OptionGroup(parser, 'Source options')
group.add_option('--walk', choices=('filesystem', 'tar', 's3'), default='filesystem', metavar='MODE',
help='set walk mode (filesystem or tar)')
group.add_option('--exclude', action='append', default=[], metavar='PATTERN',
group.add_option('--exclude', action='append', default=[], metavar='PATTERN',
help='exclude files matching PATTERN')
group.add_option('--include', action='append', default=[], metavar='PATTERN',
group.add_option('--include', action='append', default=[], metavar='PATTERN',
help='don\'t exclude files matching PATTERN')
group.add_option('--ignore-files-older-than-days', default=0, type=int,
help='ignore files older than x days')
Expand Down Expand Up @@ -437,13 +437,12 @@ def main(argv):
aws_secret_access_key=os.environ.get('AWS_SECRET_ACCESS_KEY'),
is_secure=True,
host=options.host,
calling_format = boto.s3.connection.OrdinaryCallingFormat(),
)

import ssl
if hasattr(ssl, '_create_unverified_context'):
ssl._create_default_https_context = ssl._create_unverified_context

bucket = connection.get_bucket(options.bucket)
del bucket
del connection
Expand Down