[CMF-checkins] CVS: CMF/CMFDefault - RegistrationTool.py:1.13.4.1

Florent Guillaume fg@nuxeo.com
Fri, 14 Mar 2003 11:09:49 -0500


Update of /cvs-repository/CMF/CMFDefault
In directory cvs.zope.org:/tmp/cvs-serv21408

Modified Files:
      Tag: CMF-1_3-branch
	RegistrationTool.py 
Log Message:
Merge from HEAD:
Use return instead of raise (Collector #48).


=== CMF/CMFDefault/RegistrationTool.py 1.13 => 1.13.4.1 ===
--- CMF/CMFDefault/RegistrationTool.py:1.13	Sat Jun 29 11:01:55 2002
+++ CMF/CMFDefault/RegistrationTool.py	Fri Mar 14 11:09:48 2003
@@ -111,8 +111,8 @@
                 return 'You must enter a valid name.'
 
             if not self.isMemberIdAllowed(username):
-                raise ('The login name you selected is already '
-                       'in use or is not valid. Please choose another.')
+                return ('The login name you selected is already '
+                        'in use or is not valid. Please choose another.')
 
             if not props.get('email'):
                 return 'You must enter a valid email address.'