[silvatheme.silvacmsorg][Emiliano D'Alterio] Fixed UnicodeEncode...

author:    Emiliano D'Alterio
date:      Mon Sep 09 16:15:06 2013 +0200
revision:  720:811872e53796 in silvatheme.silvacmsorg
branch:    
details:   https://hg.infrae.com/silvatheme.silvacmsorg?cmd=changeset;node=811872e53796
modified:  src/silvatheme/silvacmsorg/cloud.py
added:     
removed:   
log:       Fixed UnicodeEncodeError in email template. Added PEP8 fixes.


diffstat:

 src/silvatheme/silvacmsorg/cloud.py |  65 +++++++++++++++++++++---------------
 1 files changed, 38 insertions(+), 27 deletions(-)

diffs (85 lines):

diff -r 65bef6102693 -r 811872e53796 src/silvatheme/silvacmsorg/cloud.py
--- a/src/silvatheme/silvacmsorg/cloud.py	Fri Sep 06 18:07:46 2013 +0200
+++ b/src/silvatheme/silvacmsorg/cloud.py	Mon Sep 09 16:15:06 2013 +0200
@@ -8,7 +8,7 @@
 from silva.translations import translate as _
 from zope.traversing.browser import absoluteURL
 
-TEMPLATE="""
+TEMPLATE = u"""
 You have a new cloud request!
 
 From: {name}
@@ -25,35 +25,46 @@
     """Describe a comment.
     """
     name = schema.TextLine(title=u"Your name", required=True)
-    company_name = schema.TextLine(title=u"Company", required=False, default=u'')
-    subdomain_name = schema.TextLine(title=u"Subdomain", required=True, default=u'')
+    company_name = schema.TextLine(
+        title=u"Company", required=False, default=u'')
+    subdomain_name = schema.TextLine(
+        title=u"Subdomain", required=True, default=u'')
     email = RFC822MailAddress(title=u"Email", required=True)
-    telephone = schema.TextLine(title=u"Telephone", required=False, default=u'')
-    comment = schema.Text(title=u"Comment", required=False)
+    telephone = schema.TextLine(
+        title=u"Telephone", required=False, default=u'')
+    comment = schema.Text(
+        title=u"Comment", required=False)
 
 
 class CloudForm(silvaforms.PublicForm):
-     """Cloud form.
-     """
-     grok.name('cloud.html')
-     grok.context(IContainer)
+    """Cloud form.
+    """
+    grok.name('cloud.html')
+    grok.context(IContainer)
 
-     label = _(u'Cloud instance')
-     description = _(u"""You can request a cloud instance using this form. The instance will usually be setup in less than a business day. Once your instance is setup you'll be sent a URL, e.g.: http://yourname.silvacms.org/. Then you'll have your own Silva sandbox and you can give Silva an extensive test drive.""")
-     fields = silvaforms.Fields(IContactFields)
+    label = _(u'Cloud instance')
+    description = _(u"""You can request a cloud instance using this form.
+                        The instance will usually
+                        be setup in less than a business day.
+                        Once your instance is setup you'll be sent a URL,
+                        e.g.: http://yourname.silvacms.org/.
+                        Then you'll have your own Silva sandbox
+                        and you can give Silva an extensive test drive.""")
+    fields = silvaforms.Fields(IContactFields)
 
-     @silvaforms.action(_(u"Get your cloud instance!"), identifier='cloud', accesskey='c')
-     def cloud(self):
-         data, errors = self.extractData()
-         if errors:
-             self.status = _(u'Please correct the errors.')
-             return silvaforms.FAILURE
-         sendmail(self.context, TEMPLATE.format(**data.getDictWithDefault()),
-                  mto='[email protected]', mfrom='[email protected]',
-                  subject='Cloud instance request from silvacms.org')
-         success = self.context.get_root()._getOb('success', None)
-         if success is not None:
-             self.response.redirect(absoluteURL(success, self.request))
-         else:
-             self.status = _(u'Thank you for your request.')
-         return silvaforms.SUCCESS
+    @silvaforms.action(_(u"Get your cloud instance!"),
+                       identifier='cloud', accesskey='c')
+    def cloud(self):
+        data, errors = self.extractData()
+        if errors:
+            self.status = _(u'Please correct the errors.')
+            return silvaforms.FAILURE
+        sendmail(self.context, TEMPLATE.format(**data.getDictWithDefault()),
+                 mto='[email protected]', mfrom='[email protected]',
+                 subject='Cloud instance request from silvacms.org')
+        success = self.context.get_root()._getOb('success', None)
+        if success is not None:
+            self.response.redirect(absoluteURL(success, self.request))
+        else:
+            self.status = _(u'Thank you for your request.')
+        return silvaforms.SUCCESS