From 9f3ae31a53d64986c44869eb07a04e1828108be3 Mon Sep 17 00:00:00 2001
From: Steve Pulec <spulec@gmail.com>
Date: Sat, 29 Dec 2018 06:33:55 -0500
Subject: [PATCH] Fix bad merge.

---
 moto/iam/responses.py | 1 -
 moto/s3/exceptions.py | 6 ++++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/moto/iam/responses.py b/moto/iam/responses.py
index 804386cc..d0e749d5 100644
--- a/moto/iam/responses.py
+++ b/moto/iam/responses.py
@@ -1622,7 +1622,6 @@ UPDATE_SAML_PROVIDER_TEMPLATE = """<UpdateSAMLProviderResponse xmlns="https://ia
   <RequestId>29f47818-99f5-11e1-a4c3-27EXAMPLE804</RequestId>
 </ResponseMetadata>
 </UpdateSAMLProviderResponse>"""
-=======
 
 UPLOAD_SIGNING_CERTIFICATE_TEMPLATE = """<UploadSigningCertificateResponse xmlns="https://iam.amazonaws.com/doc/2010-05-08/">
   <UploadSigningCertificateResult>
diff --git a/moto/s3/exceptions.py b/moto/s3/exceptions.py
index fbac15c7..27c84211 100644
--- a/moto/s3/exceptions.py
+++ b/moto/s3/exceptions.py
@@ -179,7 +179,7 @@ class InvalidStorageClass(S3ClientError):
             "The storage class you specified is not valid",
             *args, **kwargs)
 
-        
+
 class InvalidBucketName(S3ClientError):
     code = 400
 
@@ -187,8 +187,10 @@ class InvalidBucketName(S3ClientError):
         super(InvalidBucketName, self).__init__(
             "InvalidBucketName",
             "The specified bucket is not valid.",
+            *args, **kwargs
+        )
+
 
-          
 class DuplicateTagKeys(S3ClientError):
     code = 400