[Checkins] Re: SVN: zope.app.form/trunk/ made zope.app.form work with python2.5

[Philipp von Weitershausen]

nikhil n wrote:
> Log message for revision 78581:
>    made zope.app.form work with python2.5

You introduced a mixture of spaces and tabs in this checkin. Please 
remove the tabs (replace them by 4 spaces). Thanks.

(It is generally recommended to configure your text editor *never* to 
insert tabs when writing Python code.)



> Changed:
>   U   zope.app.form/trunk/CHANGES.txt
>   U   zope.app.form/trunk/src/zope/app/form/browser/tests/test_objectwidget.py
> 
> -=-
> Modified: zope.app.form/trunk/CHANGES.txt
> ===================================================================
> --- zope.app.form/trunk/CHANGES.txt	2007-08-04 11:52:55 UTC (rev 78580)
> +++ zope.app.form/trunk/CHANGES.txt	2007-08-04 12:07:25 UTC (rev 78581)
> @@ -2,6 +2,10 @@
>  Changes
>  =======
>  
> +Next Version
> +------------
> + - zope.app.form now supports Python2.5
> +
>  After 3.4.0b1
>  =============
>  
> 
> Modified: zope.app.form/trunk/src/zope/app/form/browser/tests/test_objectwidget.py
> ===================================================================
> --- zope.app.form/trunk/src/zope/app/form/browser/tests/test_objectwidget.py	2007-08-04 11:52:55 UTC (rev 78580)
> +++ zope.app.form/trunk/src/zope/app/form/browser/tests/test_objectwidget.py	2007-08-04 12:07:25 UTC (rev 78581)
> @@ -16,6 +16,7 @@
>  $Id$
>  """
>  import unittest
> +import sys
>  from zope.testing import doctest
>  
>  from zope.app.testing import ztapi, setup
> @@ -101,8 +102,16 @@
>          widget = self._WidgetFactory(self.field, self.request)
>          self.assertRaises(MissingInputError, widget.getInputValue)
>          error_html = widget.error()
> -        self.failUnless("email: <zope.app.form.interfaces.Mis" in error_html)
> -        self.failUnless("name: <zope.app.form.interfaces.Miss" in error_html)
> +	if(sys.version_info < (2, 5)):
> +        	self.failUnless("email: <zope.app.form.interfaces.Mis" 
> +                                in error_html)
> +		self.failUnless("name: <zope.app.form.interfaces.Miss"
> +                                in error_html)
> +	else:
> +		self.failUnless("email: MissingInputError(u'field.foo.email', u'', None)"
> +				in error_html)
> +		self.failUnless("name: MissingInputError(u'field.foo.name', u'', None)"
> +				in error_html)
>  
>      def test_applyChangesNoChange(self):
>          self.content.foo = TestContact()


-- 
http://worldcookery.com -- Professional Zope documentation and training