Skip to content

Commit

Permalink
Use Ordinary Calling Format (#12)
Browse files Browse the repository at this point in the history
* Use ordinary calling format in code

* Bump version to 0.1.1
  • Loading branch information
vincetse authored Sep 12, 2016
1 parent 541361b commit 474134f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
3 changes: 0 additions & 3 deletions boto.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[Boto]
metadata_service_timeout = 60.0
metadata_service_num_attempts = 5

[s3]
calling_format = boto.s3.connection.OrdinaryCallingFormat
4 changes: 3 additions & 1 deletion s3cache/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from __future__ import print_function
import os
import boto
import boto.s3.connection
from boto.exception import S3ResponseError
from .s3file import S3File
from .exception import S3CacheConnectError
Expand Down Expand Up @@ -32,7 +33,8 @@ def connect(self):
if self.conn is None:
try:
self.conn = boto.connect_s3(
port=self.port, host=self.host, is_secure=self.is_secure)
port=self.port, host=self.host, is_secure=self.is_secure,
calling_format=boto.s3.connection.OrdinaryCallingFormat())
except:
protocol = "https" if self.is_secure else "http"
endpoint = "{0}://{1}:{2}".format(protocol, self.host,
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setup(
name='s3cache',
version='0.1.0',
version='0.1.1',
description='Local cache of S3 buckets',
long_description=open('README.rst').read(),
url='https://github.com/vincetse/python-s3-cache',
Expand Down

0 comments on commit 474134f

Please sign in to comment.