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

Fix bad merge.

Browse Source
This commit is contained in:
Steve Pulec 2018-12-29 06:33:55 -05:00
parent c7a7cc9c57
commit 9f3ae31a53
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
moto/iam/responses.py
View File

@ -1622,7 +1622,6 @@ UPDATE_SAML_PROVIDER_TEMPLATE = """<UpdateSAMLProviderResponse xmlns="https://ia
<RequestId>29f47818-99f5-11e1-a4c3-27EXAMPLE804</RequestId> <RequestId>29f47818-99f5-11e1-a4c3-27EXAMPLE804</RequestId>
</ResponseMetadata> </ResponseMetadata>
</UpdateSAMLProviderResponse>""" </UpdateSAMLProviderResponse>"""
=======
UPLOAD_SIGNING_CERTIFICATE_TEMPLATE = """<UploadSigningCertificateResponse xmlns="https://iam.amazonaws.com/doc/2010-05-08/"> UPLOAD_SIGNING_CERTIFICATE_TEMPLATE = """<UploadSigningCertificateResponse xmlns="https://iam.amazonaws.com/doc/2010-05-08/">
<UploadSigningCertificateResult> <UploadSigningCertificateResult>

6
moto/s3/exceptions.py
View File

@ -179,7 +179,7 @@ class InvalidStorageClass(S3ClientError):
"The storage class you specified is not valid", "The storage class you specified is not valid",
*args, **kwargs) *args, **kwargs)
class InvalidBucketName(S3ClientError): class InvalidBucketName(S3ClientError):
code = 400 code = 400
@ -187,8 +187,10 @@ class InvalidBucketName(S3ClientError):
super(InvalidBucketName, self).__init__( super(InvalidBucketName, self).__init__(
"InvalidBucketName", "InvalidBucketName",
"The specified bucket is not valid.", "The specified bucket is not valid.",
*args, **kwargs
)
class DuplicateTagKeys(S3ClientError): class DuplicateTagKeys(S3ClientError):
code = 400 code = 400