Skip to content

Commit e3aac16

Browse files
authored
Revert "Support account_host and check blob size attribute exists (#341)"
This reverts commit 4e29698.
1 parent 4e29698 commit e3aac16

File tree

1 file changed

+8
-19
lines changed

1 file changed

+8
-19
lines changed

adlfs/spec.py

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -624,16 +624,10 @@ def do_connect(self):
624624
self.service_client = AIOBlobServiceClient.from_connection_string(
625625
conn_str=self.connection_string
626626
)
627-
elif self.account_name is not None:
628-
if hasattr(self, 'account_host'):
629-
self.account_url: str = (
630-
f"https://{self.account_host}"
631-
)
632-
else:
633-
self.account_url: str = (
634-
f"https://{self.account_name}.blob.core.windows.net"
635-
)
636-
627+
elif self.account_name:
628+
self.account_url: str = (
629+
f"https://{self.account_name}.blob.core.windows.net"
630+
)
637631
creds = [self.credential, self.account_key]
638632
if any(creds):
639633
self.service_client = [
@@ -987,7 +981,7 @@ async def _ls(
987981
outblobs.append(blob_)
988982
elif (
989983
blob_["name"].count("/") == depth
990-
and (hasattr(blob_, "size") and blob_["size"] == 0)
984+
and blob_["size"] == 0
991985
):
992986
outblobs.append(blob_)
993987
else:
@@ -2074,15 +2068,10 @@ def connect_client(self):
20742068
ValueError if none of the connection details are available
20752069
"""
20762070
try:
2077-
if hasattr(self.fs, 'account_host'):
2078-
self.fs.account_url: str = (
2079-
f"https://{self.fs.account_host}"
2080-
)
2081-
else:
2082-
self.fs.account_url: str = (
2083-
f"https://{self.fs.account_name}.blob.core.windows.net"
2084-
)
20852071

2072+
self.fs.account_url: str = (
2073+
f"https://{self.fs.account_name}.blob.core.windows.net"
2074+
)
20862075
creds = [self.fs.sync_credential, self.fs.account_key, self.fs.credential]
20872076
if any(creds):
20882077
self.container_client = [

0 commit comments

Comments
 (0)