--- a/app/soc/models/base.py	Sun Oct 19 16:17:32 2008 +0000
+++ b/app/soc/models/base.py	Sun Oct 19 17:33:44 2008 +0000
@@ -27,7 +27,7 @@
 
 from google.appengine.ext import db
 
-from soc.views.helper import forms
+from soc.views.helper import forms as forms_helper
 
 
 class ModelWithFieldAttributes(db.Model):
@@ -69,7 +69,7 @@
       Property itself via the Model entity.
     """
     if not cls._fields_cache or (cls != cls._fields_cache.__class__.Meta.model):
-      class FieldsProxy(forms.DbModelForm):
+      class FieldsProxy(forms_helper.DbModelForm):
         """Form used as a proxy to access User model properties attributes.
         """
       
@@ -81,4 +81,4 @@
       
       cls._fields_cache = FieldsProxy()
 
-    return cls._fields_cache
+    return cls._fields_cache
\ No newline at end of file

--- a/app/soc/models/task.py	Sun Oct 19 16:17:32 2008 +0000
+++ b/app/soc/models/task.py	Sun Oct 19 17:33:44 2008 +0000
@@ -44,9 +44,9 @@
   """
  
   #: A required many:1 relationship with the Proposal on which the
-  #: Task is based.  A Task may be based on only a single Proposal, 
+  #: Task is based.  A Task may be based on only a single Proposal,
   #: but a Proposal can be the foundation for multiple Tasks. The
-  #: back-reference in the Proposal model is a Query named 'tasks'.  
+  #: back-reference in the Proposal model is a Query named 'tasks'.
   proposal = db.ReferenceProperty(reference_class=soc.models.proposal.Proposal,
                                   required=True,
                                   collection_name="tasks")

--- a/app/soc/views/user/profile.py	Sun Oct 19 16:17:32 2008 +0000
+++ b/app/soc/views/user/profile.py	Sun Oct 19 17:33:44 2008 +0000
@@ -107,10 +107,10 @@
     # not logged in, and no link name, so request that the user sign in 
     return simple.requestLogin(request, page, template, context,
         # TODO(tlarsen): /user/profile could be a link to a help page instead
-        login_message_fmt=ugettext_lazy('To create a new'
-                          ' <a href="/user/profile">User Profile</a>'
-                          ' or modify an existing one, you must first'
-                          ' <a href="%(sign_in)s">sign in</a>.'))
+        login_message_fmt=ugettext_lazy(
+            'To create a new <a href="/user/profile">User Profile</a>'
+            ' or modify an existing one, you must first'
+            ' <a href="%(sign_in)s">sign in</a>.'))
 
   if (not id) and link_name:
     # not logged in, so show read-only public profile for link_name user