Skip to content

Commit

Permalink
Misc
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin Durant committed Apr 7, 2016
1 parent 87cdbe5 commit a025750
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions s3fs/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ def __init__(self, anon=None, key=None, secret=None, **kwargs):
self.secret = secret
self.kwargs = kwargs
self.dirs = {}
self.no_refresh = False
if anon is None:
try:
self.anon = False
Expand All @@ -112,9 +113,8 @@ def __init__(self, anon=None, key=None, secret=None, **kwargs):
return
except ClientError:
logger.debug('Credentials failed/missing, trying anonymous')
self.anon = False
self.anon = True
self.s3 = self.connect()
self.no_refresh = False

def connect(self, refresh=False):
"""
Expand Down Expand Up @@ -406,7 +406,7 @@ def merge(self, path, filelist):
self.s3.complete_multipart_upload(Bucket=bucket, Key=key,
UploadId=mpu['UploadId'], MultipartUpload=part_info)
self._ls(bucket, refresh=True)


def copy(self, path1, path2):
""" Copy file between locations on S3 """
Expand Down

0 comments on commit a025750

Please sign in to comment.