Accomodate reviewer's comments.

Author: SurferJeffAtGoogle

appengine/mail/attachment.py

@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 from google.appengine.api import app_identity
 from google.appengine.api import mail
 import webapp2
@@ -20,18 +21,19 @@
 class AttachmentHandler(webapp2.RequestHandler):
     def post(self):
         f = self.request.POST['file']
-        mail.send_mail(sender=('%s@appspot.gserviceaccount.com' %
-                               app_identity.get_application_id()),
+        mail.send_mail(sender='{}@appspot.gserviceaccount.com'.format(
+            app_identity.get_application_id()),
                        to="Albert Johnson <[email protected]>",
                        subject="The doc you requested",
-                       body="""Attached is the document file you requested.
+                       body="""
+Attached is the document file you requested.
 
 The example.com Team
 """,
                        attachments=[(f.filename, f.file.read())])
 # [END send_attachment]
         self.response.content_type = 'text/plain'
-        self.response.write('Sent %s to Albert.' % f.filename)
+        self.response.write('Sent {} to Albert.'.format(f.filename))
 
     def get(self):
         self.response.content_type = 'text/html'

appengine/mail/attachment_test.py

@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 import attachment
 import webtest
 

appengine/mail/handle_bounced_email.py

@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 import logging
 
 from google.appengine.ext.webapp.mail_handlers import BounceNotificationHandler

appengine/mail/handle_bounced_email_test.py

@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 from google.appengine.ext.webapp.mail_handlers import BounceNotification
 
 import handle_bounced_email

appengine/mail/handle_catchall.py

@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 from google.appengine.api import mail
 
 import handle_incoming_email

appengine/mail/handle_incoming_email_test.py

@@ -42,11 +42,12 @@ def get(self):
     def post(self):
         print repr(self.request.POST)
         id = self.request.POST['thread_id']
-        send_example_mail('%s@appspot.gserviceaccount.com' %
-                          app_identity.get_application_id(), id)
+        send_example_mail('{}@appspot.gserviceaccount.com'.format(
+            app_identity.get_application_id()), id)
         self.response.content_type = 'text/plain'
         self.response.write(
-            'Sent an email to Albert with Reference header set to %s.' % id)
+            'Sent an email to Albert with Reference header set to {}.'
+            .format(id))
 
 
 app = webapp2.WSGIApplication([

appengine/mail/handle_owner.py

@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 import header
 import webtest
 

appengine/mail/handle_support.py

@@ -26,4 +26,4 @@
 <p><a href="attachment">Send email with attachments.</a></p>
 <p><a href="header">Send email with headers.</a></p>
 </body>
-</html>
+</html>

appengine/mail/header.py

@@ -37,8 +37,8 @@ def send_approved_mail(sender_address):
 
 class SendMailHandler(webapp2.RequestHandler):
     def get(self):
-        send_approved_mail('%s@appspot.gserviceaccount.com' %
-                           app_identity.get_application_id())
+        send_approved_mail('{}@appspot.gserviceaccount.com'.format(
+            app_identity.get_application_id()))
         self.response.content_type = 'text/plain'
         self.response.write('Sent an email to Albert.')
 

appengine/mail/header_test.py

@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 import send_mail
 import webtest
 

appengine/mail/index.html

@@ -40,8 +40,8 @@ def send_approved_mail(sender_address):
 
 class SendMessageHandler(webapp2.RequestHandler):
     def get(self):
-        send_approved_mail('%s@appspot.gserviceaccount.com' %
-                           app_identity.get_application_id())
+        send_approved_mail('{}@appspot.gserviceaccount.com'.format(
+            app_identity.get_application_id()))
         self.response.content_type = 'text/plain'
         self.response.write('Sent an email message to Albert.')
 

appengine/mail/send_mail.py

@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 import send_message
 import webtest
 

appengine/mail/send_mail_test.py

@@ -35,18 +35,19 @@ def post(self):
         else:
             confirmation_url = create_new_user_confirmation(user_address)
             sender_address = (
-                'Example.com Support <%s@appspot.gserviceaccount.com>' %
-                app_identity.get_application_id())
+                'Example.com Support <{}@appspot.gserviceaccount.com>'.format(
+                    app_identity.get_application_id()))
             subject = 'Confirm your registration'
             body = """Thank you for creating an account!
 Please confirm your email address by clicking on the link below:
 
-%s
-""" % confirmation_url
+{}
+""".format(confirmation_url)
             mail.send_mail(sender_address, user_address, subject, body)
 # [END send-confirm-email]
             self.response.content_type = 'text/plain'
-            self.response.write('An email has been sent to %s.' % user_address)
+            self.response.write('An email has been sent to {}.'.format(
+                user_address))
 
     def get(self):
         self.response.content_type = 'text/html'
@@ -76,7 +77,7 @@ def create_new_user_confirmation(user_address):
     record = UserConfirmationRecord(user_address=user_address,
                                     id=random_id)
     record.put()
-    return 'https://%s/user/confirm?code=%s' % (
+    return 'https://{}/user/confirm?code={}'.format(
         socket.getfqdn(socket.gethostname()), random_id)
 
 
@@ -93,7 +94,8 @@ def get(self):
                 record.confirmed = True
                 record.put()
                 self.response.content_type = 'text/plain'
-                self.response.write('Confirmed %s.' % record.user_address)
+                self.response.write('Confirmed {}.'
+                                    .format(record.user_address))
                 return
         self.response.status_int = 404
 

appengine/mail/send_message.py

@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 import user_signup
 import webtest
 
@@ -25,7 +26,7 @@ def test_user_signup(testbed):
     assert 'An email has been sent to [email protected].' in response.body
 
     records = user_signup.UserConfirmationRecord.query().fetch(1)
-    response = app.get('/user/confirm?code=%s' % records[0].key.id())
+    response = app.get('/user/confirm?code={}'.format(records[0].key.id()))
     assert response.status_int == 200
     assert 'Confirmed [email protected].' in response.body