Skip to content

Commit

Permalink
Merge pull request #92 from liormizr/fix_configuration_default_boto3_…
Browse files Browse the repository at this point in the history
…resource

fix_configuration_default_boto3_resource
  • Loading branch information
liormizr authored Sep 12, 2021
2 parents c41a2b0 + 9950dd0 commit 598984f
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions s3path.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,16 @@ def make_uri(self, path):


class _S3ConfigurationMap:
def __init__(self, default_resource, **default_arguments):
self.default_resource = default_resource
def __init__(self, default_resource_kwargs, **default_arguments):
self.default_resource_kwargs = default_resource_kwargs
self.default_arguments = default_arguments
self.arguments = None
self.resources = None

@property
def default_resource(self):
return boto3.resource('s3', **self.default_resource_kwargs)

def _initial_setup(self):
self.arguments = {PureS3Path('/'): self.default_arguments}
self.resources = {PureS3Path('/'): self.default_resource}
Expand Down Expand Up @@ -144,11 +148,7 @@ class _S3Accessor(_Accessor):
"""

def __init__(self, **kwargs):
try:
self._s3 = boto3.resource('s3', **kwargs)
except AttributeError:
self._s3 = None
self.configuration_map = _S3ConfigurationMap(default_resource=self._s3)
self.configuration_map = _S3ConfigurationMap(default_resource_kwargs=kwargs)

def stat(self, path):
resource, _ = self.configuration_map.get_configuration(path)
Expand Down Expand Up @@ -208,7 +208,7 @@ def open(self, path, *, mode='r', buffering=-1, encoding=None, errors=None, newl
'newline': newline,
}
transport_params = {'defer_seek': True}
dummy_object = self._s3.Object('bucket', 'key')
dummy_object = resource.Object('bucket', 'key')
if smart_open.__version__ >= '5.1.0':
self._smart_open_new_version_kwargs(
dummy_object,
Expand Down

0 comments on commit 598984f

Please sign in to comment.