Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

check for None in lifecycle actions

Browse Source
This commit is contained in:
Jon Beilke 2018-10-03 01:26:09 -05:00
parent 9b5f983cb5
commit a1a8ac7286
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
moto/s3/models.py
View File

@ -425,23 +425,23 @@ class FakeBucket(BaseModel):
nve_noncurrent_days = None nve_noncurrent_days = None
if rule.get('NoncurrentVersionExpiration'): if rule.get('NoncurrentVersionExpiration'):
if not rule["NoncurrentVersionExpiration"].get('NoncurrentDays'): if rule["NoncurrentVersionExpiration"].get('NoncurrentDays') is None:
raise MalformedXML() raise MalformedXML()
nve_noncurrent_days = rule["NoncurrentVersionExpiration"]["NoncurrentDays"] nve_noncurrent_days = rule["NoncurrentVersionExpiration"]["NoncurrentDays"]
nvt_noncurrent_days = None nvt_noncurrent_days = None
nvt_storage_class = None nvt_storage_class = None
if rule.get('NoncurrentVersionTransition'): if rule.get('NoncurrentVersionTransition'):
if not rule["NoncurrentVersionTransition"].get('NoncurrentDays'): if rule["NoncurrentVersionTransition"].get('NoncurrentDays') is None:
raise MalformedXML() raise MalformedXML()
if not rule["NoncurrentVersionTransition"].get('StorageClass'): if rule["NoncurrentVersionTransition"].get('StorageClass') is None:
raise MalformedXML() raise MalformedXML()
nvt_noncurrent_days = rule["NoncurrentVersionTransition"]["NoncurrentDays"] nvt_noncurrent_days = rule["NoncurrentVersionTransition"]["NoncurrentDays"]
nvt_storage_class = rule["NoncurrentVersionTransition"]["StorageClass"] nvt_storage_class = rule["NoncurrentVersionTransition"]["StorageClass"]
aimu_days = None aimu_days = None
if rule.get('AbortIncompleteMultipartUpload'): if rule.get('AbortIncompleteMultipartUpload'):
if not rule["AbortIncompleteMultipartUpload"].get('DaysAfterInitiation'): if rule["AbortIncompleteMultipartUpload"].get('DaysAfterInitiation') is None:
raise MalformedXML() raise MalformedXML()
aimu_days = rule["AbortIncompleteMultipartUpload"]["DaysAfterInitiation"] aimu_days = rule["AbortIncompleteMultipartUpload"]["DaysAfterInitiation"]