Merge pull request #17 from Astrea49/2.0

Prefer `static_format` over `format` with static assets
This commit is contained in:
iDutchy 2021-09-01 04:26:31 +02:00 committed by GitHub
commit 7e18d30820
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -313,10 +313,11 @@ class Asset(AssetMixin):
if self._animated:
if format not in VALID_ASSET_FORMATS:
raise InvalidArgument(f'format must be one of {VALID_ASSET_FORMATS}')
else:
url = url.with_path(f'{path}.{format}')
elif static_format is MISSING:
if format not in VALID_STATIC_FORMATS:
raise InvalidArgument(f'format must be one of {VALID_STATIC_FORMATS}')
url = url.with_path(f'{path}.{format}')
url = url.with_path(f'{path}.{format}')
if static_format is not MISSING and not self._animated:
if static_format not in VALID_STATIC_FORMATS: