Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -967,8 +967,8 @@ def query_blob(self, query_expression, **kwargs):
error_cls=error_cls)

@staticmethod
def _generic_delete_blob_options(delete_snapshots=False, **kwargs):
# type: (bool, **Any) -> Dict[str, Any]
def _generic_delete_blob_options(delete_snapshots=None, **kwargs):
# type: (str, **Any) -> Dict[str, Any]
access_conditions = get_access_conditions(kwargs.pop('lease', None))
mod_conditions = get_modify_conditions(kwargs)
if delete_snapshots:
Expand All @@ -982,8 +982,8 @@ def _generic_delete_blob_options(delete_snapshots=False, **kwargs):
options.update(kwargs)
return options

def _delete_blob_options(self, delete_snapshots=False, **kwargs):
# type: (bool, **Any) -> Dict[str, Any]
def _delete_blob_options(self, delete_snapshots=None, **kwargs):
# type: (str, **Any) -> Dict[str, Any]
if self.snapshot and delete_snapshots:
raise ValueError("The delete_snapshots option cannot be used with a specific snapshot.")
options = self._generic_delete_blob_options(delete_snapshots, **kwargs)
Expand Down