From d3665ca2a19a1234f5e8d35ecedf76bc3960eb60 Mon Sep 17 00:00:00 2001
From: David Beitey <david@davidjb.com>
Date: Wed, 5 Sep 2012 09:24:32 +1000
Subject: [PATCH 1/3] Fix incorrect demo link in README

---
 README.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index 45b32901..0dafca30 100644
--- a/README.rst
+++ b/README.rst
@@ -3,8 +3,7 @@ Deform Demo
 
 Demonstration application for the `Deform
 <http://docs.pylonsproject.org/projects/deform/dev/>`_ Python HTML form
-library.  Please see `http://deformdemo.repoze.org
-<http://docs.pylonsproject.org/projects/deform/dev/>`_ for a running version
+library.  Please see http://deformdemo.repoze.org for a running version
 of this application.
 
 Running the Demo

From af05a76ff94ea0b4b9a23c5350f11b4b78d52935 Mon Sep 17 00:00:00 2001
From: tonthon <tonthon21@gmail.com>
Date: Thu, 20 Sep 2012 12:45:46 +0200
Subject: [PATCH 2/3] Adding test case for deform #103 issue

---
 deformdemo/__init__.py | 24 ++++++-------
 deformdemo/test.py     | 80 ++++++++++++++++++++++++++----------------
 2 files changed, 61 insertions(+), 43 deletions(-)

diff --git a/deformdemo/__init__.py b/deformdemo/__init__.py
index d608fbae..91cf27c3 100644
--- a/deformdemo/__init__.py
+++ b/deformdemo/__init__.py
@@ -221,7 +221,7 @@ class Schema(colander.Schema):
     @view_config(renderer='templates/form.pt', name='autocomplete_input')
     @demonstrate('Autocomplete Input Widget')
     def autocomplete_input(self):
-        choices = ['bar', 'baz', 'two', 'three']
+        choices = ['bar', 'baz', 'two', 'three', 'foo & bar']
         widget = deform.widget.AutocompleteInputWidget(
             size=60,
             values = choices,
@@ -256,7 +256,7 @@ class Schema(colander.Schema):
     @view_config(renderer='json', name='autocomplete_input_values')
     def autocomplete_input_values(self):
         text = self.request.params.get('term', '')
-        return [x for x in ['bar', 'baz', 'two', 'three'] 
+        return [x for x in ['bar', 'baz', 'two', 'three']
                 if x.startswith(text)]
 
     @view_config(renderer='templates/form.pt', name='textarea')
@@ -758,7 +758,7 @@ class Schema(colander.Schema):
         schema = Schema()
         form = deform.Form(schema, buttons=('submit',))
         return self.render_form(form)
-        
+
     @view_config(renderer='templates/form.pt', name='file')
     @demonstrate('File Upload Widget')
     def file(self):
@@ -1059,7 +1059,7 @@ def deferred_choices_widget(node, kw):
         @colander.deferred
         def deferred_default(node, kw):
             return kw['default']
-        
+
         class Schema(colander.Schema):
             pepper = colander.SchemaNode(
                 colander.String(),
@@ -1190,7 +1190,7 @@ def i18n(self):
         minmax = {'min':1, 'max':10}
         locale_name = get_locale_name(self.request)
         class Schema(colander.Schema):
-            
+
             number = colander.SchemaNode(
                 colander.Integer(),
                 title=_('A number between ${min} and ${max}',
@@ -1372,8 +1372,8 @@ def multiple_forms(self):
         # form's element identifiers will not overlap the first
         # form's.
 
-        counter = itertools.count() 
-        
+        counter = itertools.count()
+
         class Schema1(colander.Schema):
             name1 = colander.SchemaNode(colander.String())
         schema1 = Schema1()
@@ -1421,7 +1421,7 @@ class Schema2(colander.Schema):
             'end':end,
             'title':'Multiple Forms on the Same Page',
             }
-        
+
     @view_config(renderer='templates/form.pt', name='widget_adapter')
     @demonstrate('Widget Adapter')
     def widget_adapter(self):
@@ -1556,7 +1556,7 @@ class BlogPostSchema(colander.Schema):
                 validator = deferred_category_validator,
                 widget = deferred_category_widget,
                 )
-        
+
         schema = BlogPostSchema().bind(
             max_date = datetime.date.max,
             max_bodylen = 5000,
@@ -1564,7 +1564,7 @@ class BlogPostSchema(colander.Schema):
             default_date = datetime.date.today(),
             categories = [('one', 'One'), ('two', 'Two')]
             )
-        
+
         form = deform.Form(schema, buttons=('submit',))
         return self.render_form(form)
 
@@ -1606,7 +1606,7 @@ class MySchema(CSRFSchema):
         schema = MySchema().bind(request=self.request)
         form = deform.Form(schema, buttons=('submit',))
         return self.render_form(form)
-        
+
 class MemoryTmpStore(dict):
     """ Instances of this class implement the
     :class:`deform.interfaces.FileUploadTempStore` interface"""
@@ -1657,7 +1657,7 @@ def handle_error(self, field, error):
             for e in error.children:
                 msgs.append('line %s: %s' % (e.pos+1, e))
             field.error = colander.Invalid(field.schema, '\n'.join(msgs))
-        
+
 
 def main(global_config, **settings):
     # paster serve entry point
diff --git a/deformdemo/test.py b/deformdemo/test.py
index 12393b6b..a59bf297 100644
--- a/deformdemo/test.py
+++ b/deformdemo/test.py
@@ -125,7 +125,7 @@ def test_submit_checked(self):
         browser.wait_for_page_to_load("30000")
         self.assertTrue(browser.is_checked("deformField1"))
         self.assertEqual(browser.get_text('css=#captured'), "{'want': True}")
-    
+
 class CheckedInputWidgetTests(Base, unittest.TestCase):
     url = "/checkedinput/"
     def test_render_default(self):
@@ -235,7 +235,7 @@ def test_submit_success(self):
         browser.wait_for_page_to_load("30000")
         self.assertSimilarRepr(browser.get_text('css=#captured'),
                             u"{'ssn': u'140-11-8866'}")
-        
+
 
 class CheckedPasswordWidgetTests(Base, unittest.TestCase):
     url = "/checkedpassword/"
@@ -791,7 +791,7 @@ def test_render_default(self):
         self.assertEqual(browser.get_attribute('deformField1@name'), 'sneaky')
         self.assertEqual(browser.get_value('deformField1'), 'true')
         self.assertEqual(browser.get_text('css=#captured'), 'None')
-    
+
     def test_render_submitted(self):
         browser.open(self.url)
         browser.wait_for_page_to_load("30000")
@@ -813,7 +813,7 @@ def test_render_default(self):
         self.assertEqual(browser.get_value('deformField1'), '')
         self.assertEqual(browser.get_value('deformField2'), '')
         self.assertEqual(browser.get_text('css=#captured'), 'None')
-    
+
     def test_render_submitted(self):
         browser.open(self.url)
         browser.wait_for_page_to_load("30000")
@@ -902,7 +902,7 @@ def test_render_default(self):
         self.assertEqual(browser.get_attribute('deformField2@name'), 'title')
         self.assertEqual(browser.get_value('deformField2'), '')
         self.assertEqual(browser.get_text('css=#captured'), 'None')
-    
+
     def test_submit_both_empty(self):
         browser.open(self.url)
         browser.wait_for_page_to_load("30000")
@@ -993,7 +993,7 @@ def test_render_en(self):
         self.assertEqual(label, 'A number between 1 and 10*')
         button = browser.get_text('css=button')
         self.assertEqual(button, 'Submit')
-    
+
     def test_render_ru(self):
         browser.open("%s?_LOCALE_=ru" % self.url)
         browser.wait_for_page_to_load("30000")
@@ -1003,7 +1003,7 @@ def test_render_ru(self):
         self.assertEqual(label, u'Число между 1 и 10*')
         button = browser.get_text('css=button')
         self.assertEqual(button, u'отправить')
-    
+
     def test_submit_empty_en(self):
         browser.open("%s?_LOCALE_=en" % self.url)
         browser.wait_for_page_to_load("30000")
@@ -1128,7 +1128,7 @@ def test_render_default(self):
         self.assertEqual(browser.get_attribute('css=#deformField1@type'),
                          'password')
         self.assertFalse(browser.is_element_present('css=.errorMsgLbl'))
-                         
+
     def test_render_submit_empty(self):
         browser.open(self.url)
         browser.wait_for_page_to_load("30000")
@@ -1303,7 +1303,7 @@ def test_upload_one_success(self):
         captured = browser.get_text('css=#captured')
         self.assertTrue("'filename': u'%s" % filename in captured)
         self.assertTrue(uid in captured)
-    
+
     def test_upload_multi_interaction(self):
         browser.open(self.url)
         browser.wait_for_page_to_load("30000")
@@ -1322,7 +1322,7 @@ def test_upload_multi_interaction(self):
         captured = browser.get_text('css=#captured')
         self.assertTrue("'filename': u'%s" % filename in captured)
         self.assertTrue(uid in captured)
-    
+
         # resubmit without entering a new filename should not change the file
         browser.click('submit')
         browser.wait_for_page_to_load("30000")
@@ -1356,7 +1356,7 @@ def test_upload_multi_interaction(self):
         self.assertTrue("'filename': u'%s" % filename2 in captured)
         self.assertTrue("'filename': u'%s" % filename in captured)
         self.assertEqual(browser.get_value('css=#deformField3-uid'), uid)
-        
+
         # resubmit should not change either file
         browser.click('submit')
         browser.wait_for_page_to_load("30000")
@@ -1605,7 +1605,7 @@ def test_render_default(self):
         self.assertTrue(browser.is_text_present("Texts"))
         self.assertEqual(browser.get_text('deformField1-addtext'),'Add Text')
         self.assertEqual(browser.get_text('css=#captured'), 'None')
-        
+
     def test_submit_none_added(self):
         browser.open(self.url)
         browser.wait_for_page_to_load("30000")
@@ -1649,7 +1649,7 @@ def test_submit_two_filled(self):
         self.assertFalse(browser.is_element_present('css=.errorMsgLbl'))
         captured = browser.get_text('css=#captured')
         self.assertSimilarRepr(
-            captured,  
+            captured,
             "{'texts': [u'bar', u'baz']}")
 
 class SequenceOfDateInputs(Base, unittest.TestCase):
@@ -1660,7 +1660,7 @@ def test_render_default(self):
         self.assertTrue(browser.is_text_present("Dates"))
         self.assertEqual(browser.get_text('deformField1-addtext'),'Add Date')
         self.assertEqual(browser.get_text('css=#captured'), 'None')
-        
+
     def test_submit_none_added(self):
         browser.open(self.url)
         browser.wait_for_page_to_load("30000")
@@ -1741,7 +1741,7 @@ def test_add_and_remove(self):
         self.assertSimilarRepr(
             captured,
             "{'names': [u'hello2', u'hello3', u'hello4', u'hello5']}")
-        
+
 class SequenceOfRichTextWidgetTests(Base, unittest.TestCase):
     url = "/sequence_of_richtext/"
     def test_render_default(self):
@@ -1750,7 +1750,7 @@ def test_render_default(self):
         self.assertTrue(browser.is_text_present("Texts"))
         self.assertEqual(browser.get_text('deformField1-addtext'),'Add Text')
         self.assertEqual(browser.get_text('css=#captured'), 'None')
-        
+
     def test_submit_none_added(self):
         browser.open(self.url)
         browser.wait_for_page_to_load("30000")
@@ -1789,7 +1789,7 @@ def test_submit_one_filled(self):
         self.assertFalse(browser.is_element_present('css=.errorMsgLbl'))
         captured = browser.get_text('css=#captured')
         self.assertSimilarRepr(
-            captured, 
+            captured,
             "{'texts': [u'<p>yo</p>']}")
 
 class SequenceOfMaskedTextInputs(Base, unittest.TestCase):
@@ -1800,7 +1800,7 @@ def test_render_default(self):
         self.assertTrue(browser.is_text_present("Texts"))
         self.assertEqual(browser.get_text('deformField1-addtext'),'Add Text')
         self.assertEqual(browser.get_text('css=#captured'), 'None')
-        
+
     def test_submit_none_added(self):
         browser.open(self.url)
         browser.wait_for_page_to_load("30000")
@@ -1860,7 +1860,7 @@ def test_render_default(self):
         options = browser.get_select_options('deformField1')
         self.assertEqual(
             options,
-            [u'- Select -', u'Habanero', u'Jalapeno', u'Chipotle']) 
+            [u'- Select -', u'Habanero', u'Jalapeno', u'Chipotle'])
         self.assertEqual(browser.get_text('css=.req'), '*')
         self.assertEqual(browser.get_text('css=#captured'), 'None')
 
@@ -1930,7 +1930,7 @@ def test_render_default(self):
         options = browser.get_select_options('deformField1')
         self.assertEqual(
             options,
-            [u'- Select -', u'Zero', u'One', u'Two']) 
+            [u'- Select -', u'Zero', u'One', u'Two'])
         self.assertEqual(browser.get_text('css=.req'), '*')
         self.assertEqual(browser.get_text('css=#captured'), 'None')
 
@@ -1958,7 +1958,7 @@ def test_submit_selected(self):
         self.assertEqual(browser.get_selected_index('deformField1'), '1')
         captured = browser.get_text('css=#captured')
         self.assertSimilarRepr(
-            captured, 
+            captured,
             "{'number': 0}")
 
 class SelectWidgetWithOptgroupTest(Base, unittest.TestCase):
@@ -1974,7 +1974,7 @@ def test_render_default(self):
         self.assertEqual(
             options,
             [u'Select your favorite musician',
-             u'Jimmy Page', u'Jimi Hendrix', u'Billy Cobham', u'John Bonham']) 
+             u'Jimmy Page', u'Jimi Hendrix', u'Billy Cobham', u'John Bonham'])
         self.assertEqual(browser.get_text('css=.req'), '*')
         self.assertEqual(browser.get_text('css=#captured'), 'None')
         self.assertEqual(int(browser.get_xpath_count('//optgroup')), 2)
@@ -2052,7 +2052,7 @@ def test_submit_filled(self):
         self.assertEqual(browser.get_value('deformField1'), 'hello')
         captured = browser.get_text('css=#captured')
         self.assertSimilarRepr(
-            captured, 
+            captured,
             "{'text': u'hello'}")
 
 class MoneyInputWidgetTests(Base, unittest.TestCase):
@@ -2122,8 +2122,7 @@ def test_submit_filled(self):
         browser.open(self.url)
         browser.wait_for_page_to_load("30000")
         browser.focus('deformField1')
-        browser.type('deformField1', 'bar')
-        browser.type_keys('deformField1', 'bar')
+        browser.type_keys('deformField1', 'ba')
         import time
         time.sleep(.2)
         self.assertTrue(browser.is_text_present('bar'))
@@ -2136,9 +2135,28 @@ def test_submit_filled(self):
         self.assertEqual(browser.get_value('deformField1'), u'bar')
         captured = browser.get_text('css=#captured')
         self.assertSimilarRepr(
-            captured, 
+            captured,
             "{'text': u'bar'}")
 
+    def test_special_chars(self):
+        browser.open(self.url)
+        browser.wait_for_page_to_load("30000")
+        browser.focus('deformField1')
+        browser.type_keys('deformField1', 'foo')
+        import time
+        time.sleep(.2)
+        self.assertTrue(browser.is_text_present('foo & bar'))
+        browser.mouse_over("//html/body/ul/li/a") # hurrr, necessary
+        browser.click("//html/body/ul/li/a")
+        browser.click('submit')
+        browser.wait_for_page_to_load("30000")
+        self.assertFalse(browser.is_element_present('css=.errorMsgLbl'))
+        self.assertEqual(browser.get_value('deformField1'), u'foo & bar')
+        captured = browser.get_text('css=#captured')
+        self.assertSimilarRepr(
+                captured,
+                "{'text': u'foo & bar'}")
+
 class AutocompleteRemoteInputWidgetTests(Base, unittest.TestCase):
     url = "/autocomplete_remote_input/"
     def test_render_default(self):
@@ -2276,7 +2294,7 @@ def test_submit_filled(self):
         self.assertEqual(browser.get_value('deformField1'), '<p>hello</p>')
         captured = browser.get_text('css=#captured')
         self.assertSimilarRepr(
-            captured, 
+            captured,
             "{'text': u'<p>hello</p>'}"
             )
 
@@ -2464,7 +2482,7 @@ def test_submit_default(self):
         captured = browser.get_text('css=#captured')
         self.assertEqual(
             eval(captured),
-            ({'csv': [(1, u'hello', Decimal("4.5")), 
+            ({'csv': [(1, u'hello', Decimal("4.5")),
                       (2, u'goodbye', Decimal("5.5"))]
               }))
 
@@ -2575,7 +2593,7 @@ def test_submit_first(self):
         self.assertEqual(browser.get_value('deformField1'), 'hey')
         captured = browser.get_text('css=#captured')
         self.assertSimilarRepr(
-            captured, 
+            captured,
             u"{'name1': u'hey'}")
 
     def test_submit_second(self):
@@ -2587,7 +2605,7 @@ def test_submit_second(self):
         self.assertEqual(browser.get_value('deformField3'), 'hey')
         captured = browser.get_text('css=#captured')
         self.assertSimilarRepr(
-            captured, 
+            captured,
             u"{'name2': u'hey'}"
             )
 
@@ -2623,7 +2641,7 @@ def test_submit_one_filled(self):
         browser.wait_for_page_to_load("30000")
         captured = browser.get_text('css=#captured')
         self.assertSimilarRepr(
-            captured, 
+            captured,
             u"{'two': u'', 'one': u'one'}"
             )
         self.assertFalse(browser.is_element_present('css=.errorMsgLbl'))

From 81746d2296d0fd67826d8c9522e3dbc46de3eed2 Mon Sep 17 00:00:00 2001
From: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
Date: Fri, 21 Sep 2012 13:19:40 +0200
Subject: [PATCH 3/3] revert fix 103

---
 deformdemo/__init__.py | 24 ++++++-------
 deformdemo/test.py     | 80 ++++++++++++++++--------------------------
 2 files changed, 43 insertions(+), 61 deletions(-)

diff --git a/deformdemo/__init__.py b/deformdemo/__init__.py
index 91cf27c3..d608fbae 100644
--- a/deformdemo/__init__.py
+++ b/deformdemo/__init__.py
@@ -221,7 +221,7 @@ class Schema(colander.Schema):
     @view_config(renderer='templates/form.pt', name='autocomplete_input')
     @demonstrate('Autocomplete Input Widget')
     def autocomplete_input(self):
-        choices = ['bar', 'baz', 'two', 'three', 'foo & bar']
+        choices = ['bar', 'baz', 'two', 'three']
         widget = deform.widget.AutocompleteInputWidget(
             size=60,
             values = choices,
@@ -256,7 +256,7 @@ class Schema(colander.Schema):
     @view_config(renderer='json', name='autocomplete_input_values')
     def autocomplete_input_values(self):
         text = self.request.params.get('term', '')
-        return [x for x in ['bar', 'baz', 'two', 'three']
+        return [x for x in ['bar', 'baz', 'two', 'three'] 
                 if x.startswith(text)]
 
     @view_config(renderer='templates/form.pt', name='textarea')
@@ -758,7 +758,7 @@ class Schema(colander.Schema):
         schema = Schema()
         form = deform.Form(schema, buttons=('submit',))
         return self.render_form(form)
-
+        
     @view_config(renderer='templates/form.pt', name='file')
     @demonstrate('File Upload Widget')
     def file(self):
@@ -1059,7 +1059,7 @@ def deferred_choices_widget(node, kw):
         @colander.deferred
         def deferred_default(node, kw):
             return kw['default']
-
+        
         class Schema(colander.Schema):
             pepper = colander.SchemaNode(
                 colander.String(),
@@ -1190,7 +1190,7 @@ def i18n(self):
         minmax = {'min':1, 'max':10}
         locale_name = get_locale_name(self.request)
         class Schema(colander.Schema):
-
+            
             number = colander.SchemaNode(
                 colander.Integer(),
                 title=_('A number between ${min} and ${max}',
@@ -1372,8 +1372,8 @@ def multiple_forms(self):
         # form's element identifiers will not overlap the first
         # form's.
 
-        counter = itertools.count()
-
+        counter = itertools.count() 
+        
         class Schema1(colander.Schema):
             name1 = colander.SchemaNode(colander.String())
         schema1 = Schema1()
@@ -1421,7 +1421,7 @@ class Schema2(colander.Schema):
             'end':end,
             'title':'Multiple Forms on the Same Page',
             }
-
+        
     @view_config(renderer='templates/form.pt', name='widget_adapter')
     @demonstrate('Widget Adapter')
     def widget_adapter(self):
@@ -1556,7 +1556,7 @@ class BlogPostSchema(colander.Schema):
                 validator = deferred_category_validator,
                 widget = deferred_category_widget,
                 )
-
+        
         schema = BlogPostSchema().bind(
             max_date = datetime.date.max,
             max_bodylen = 5000,
@@ -1564,7 +1564,7 @@ class BlogPostSchema(colander.Schema):
             default_date = datetime.date.today(),
             categories = [('one', 'One'), ('two', 'Two')]
             )
-
+        
         form = deform.Form(schema, buttons=('submit',))
         return self.render_form(form)
 
@@ -1606,7 +1606,7 @@ class MySchema(CSRFSchema):
         schema = MySchema().bind(request=self.request)
         form = deform.Form(schema, buttons=('submit',))
         return self.render_form(form)
-
+        
 class MemoryTmpStore(dict):
     """ Instances of this class implement the
     :class:`deform.interfaces.FileUploadTempStore` interface"""
@@ -1657,7 +1657,7 @@ def handle_error(self, field, error):
             for e in error.children:
                 msgs.append('line %s: %s' % (e.pos+1, e))
             field.error = colander.Invalid(field.schema, '\n'.join(msgs))
-
+        
 
 def main(global_config, **settings):
     # paster serve entry point
diff --git a/deformdemo/test.py b/deformdemo/test.py
index a59bf297..12393b6b 100644
--- a/deformdemo/test.py
+++ b/deformdemo/test.py
@@ -125,7 +125,7 @@ def test_submit_checked(self):
         browser.wait_for_page_to_load("30000")
         self.assertTrue(browser.is_checked("deformField1"))
         self.assertEqual(browser.get_text('css=#captured'), "{'want': True}")
-
+    
 class CheckedInputWidgetTests(Base, unittest.TestCase):
     url = "/checkedinput/"
     def test_render_default(self):
@@ -235,7 +235,7 @@ def test_submit_success(self):
         browser.wait_for_page_to_load("30000")
         self.assertSimilarRepr(browser.get_text('css=#captured'),
                             u"{'ssn': u'140-11-8866'}")
-
+        
 
 class CheckedPasswordWidgetTests(Base, unittest.TestCase):
     url = "/checkedpassword/"
@@ -791,7 +791,7 @@ def test_render_default(self):
         self.assertEqual(browser.get_attribute('deformField1@name'), 'sneaky')
         self.assertEqual(browser.get_value('deformField1'), 'true')
         self.assertEqual(browser.get_text('css=#captured'), 'None')
-
+    
     def test_render_submitted(self):
         browser.open(self.url)
         browser.wait_for_page_to_load("30000")
@@ -813,7 +813,7 @@ def test_render_default(self):
         self.assertEqual(browser.get_value('deformField1'), '')
         self.assertEqual(browser.get_value('deformField2'), '')
         self.assertEqual(browser.get_text('css=#captured'), 'None')
-
+    
     def test_render_submitted(self):
         browser.open(self.url)
         browser.wait_for_page_to_load("30000")
@@ -902,7 +902,7 @@ def test_render_default(self):
         self.assertEqual(browser.get_attribute('deformField2@name'), 'title')
         self.assertEqual(browser.get_value('deformField2'), '')
         self.assertEqual(browser.get_text('css=#captured'), 'None')
-
+    
     def test_submit_both_empty(self):
         browser.open(self.url)
         browser.wait_for_page_to_load("30000")
@@ -993,7 +993,7 @@ def test_render_en(self):
         self.assertEqual(label, 'A number between 1 and 10*')
         button = browser.get_text('css=button')
         self.assertEqual(button, 'Submit')
-
+    
     def test_render_ru(self):
         browser.open("%s?_LOCALE_=ru" % self.url)
         browser.wait_for_page_to_load("30000")
@@ -1003,7 +1003,7 @@ def test_render_ru(self):
         self.assertEqual(label, u'Число между 1 и 10*')
         button = browser.get_text('css=button')
         self.assertEqual(button, u'отправить')
-
+    
     def test_submit_empty_en(self):
         browser.open("%s?_LOCALE_=en" % self.url)
         browser.wait_for_page_to_load("30000")
@@ -1128,7 +1128,7 @@ def test_render_default(self):
         self.assertEqual(browser.get_attribute('css=#deformField1@type'),
                          'password')
         self.assertFalse(browser.is_element_present('css=.errorMsgLbl'))
-
+                         
     def test_render_submit_empty(self):
         browser.open(self.url)
         browser.wait_for_page_to_load("30000")
@@ -1303,7 +1303,7 @@ def test_upload_one_success(self):
         captured = browser.get_text('css=#captured')
         self.assertTrue("'filename': u'%s" % filename in captured)
         self.assertTrue(uid in captured)
-
+    
     def test_upload_multi_interaction(self):
         browser.open(self.url)
         browser.wait_for_page_to_load("30000")
@@ -1322,7 +1322,7 @@ def test_upload_multi_interaction(self):
         captured = browser.get_text('css=#captured')
         self.assertTrue("'filename': u'%s" % filename in captured)
         self.assertTrue(uid in captured)
-
+    
         # resubmit without entering a new filename should not change the file
         browser.click('submit')
         browser.wait_for_page_to_load("30000")
@@ -1356,7 +1356,7 @@ def test_upload_multi_interaction(self):
         self.assertTrue("'filename': u'%s" % filename2 in captured)
         self.assertTrue("'filename': u'%s" % filename in captured)
         self.assertEqual(browser.get_value('css=#deformField3-uid'), uid)
-
+        
         # resubmit should not change either file
         browser.click('submit')
         browser.wait_for_page_to_load("30000")
@@ -1605,7 +1605,7 @@ def test_render_default(self):
         self.assertTrue(browser.is_text_present("Texts"))
         self.assertEqual(browser.get_text('deformField1-addtext'),'Add Text')
         self.assertEqual(browser.get_text('css=#captured'), 'None')
-
+        
     def test_submit_none_added(self):
         browser.open(self.url)
         browser.wait_for_page_to_load("30000")
@@ -1649,7 +1649,7 @@ def test_submit_two_filled(self):
         self.assertFalse(browser.is_element_present('css=.errorMsgLbl'))
         captured = browser.get_text('css=#captured')
         self.assertSimilarRepr(
-            captured,
+            captured,  
             "{'texts': [u'bar', u'baz']}")
 
 class SequenceOfDateInputs(Base, unittest.TestCase):
@@ -1660,7 +1660,7 @@ def test_render_default(self):
         self.assertTrue(browser.is_text_present("Dates"))
         self.assertEqual(browser.get_text('deformField1-addtext'),'Add Date')
         self.assertEqual(browser.get_text('css=#captured'), 'None')
-
+        
     def test_submit_none_added(self):
         browser.open(self.url)
         browser.wait_for_page_to_load("30000")
@@ -1741,7 +1741,7 @@ def test_add_and_remove(self):
         self.assertSimilarRepr(
             captured,
             "{'names': [u'hello2', u'hello3', u'hello4', u'hello5']}")
-
+        
 class SequenceOfRichTextWidgetTests(Base, unittest.TestCase):
     url = "/sequence_of_richtext/"
     def test_render_default(self):
@@ -1750,7 +1750,7 @@ def test_render_default(self):
         self.assertTrue(browser.is_text_present("Texts"))
         self.assertEqual(browser.get_text('deformField1-addtext'),'Add Text')
         self.assertEqual(browser.get_text('css=#captured'), 'None')
-
+        
     def test_submit_none_added(self):
         browser.open(self.url)
         browser.wait_for_page_to_load("30000")
@@ -1789,7 +1789,7 @@ def test_submit_one_filled(self):
         self.assertFalse(browser.is_element_present('css=.errorMsgLbl'))
         captured = browser.get_text('css=#captured')
         self.assertSimilarRepr(
-            captured,
+            captured, 
             "{'texts': [u'<p>yo</p>']}")
 
 class SequenceOfMaskedTextInputs(Base, unittest.TestCase):
@@ -1800,7 +1800,7 @@ def test_render_default(self):
         self.assertTrue(browser.is_text_present("Texts"))
         self.assertEqual(browser.get_text('deformField1-addtext'),'Add Text')
         self.assertEqual(browser.get_text('css=#captured'), 'None')
-
+        
     def test_submit_none_added(self):
         browser.open(self.url)
         browser.wait_for_page_to_load("30000")
@@ -1860,7 +1860,7 @@ def test_render_default(self):
         options = browser.get_select_options('deformField1')
         self.assertEqual(
             options,
-            [u'- Select -', u'Habanero', u'Jalapeno', u'Chipotle'])
+            [u'- Select -', u'Habanero', u'Jalapeno', u'Chipotle']) 
         self.assertEqual(browser.get_text('css=.req'), '*')
         self.assertEqual(browser.get_text('css=#captured'), 'None')
 
@@ -1930,7 +1930,7 @@ def test_render_default(self):
         options = browser.get_select_options('deformField1')
         self.assertEqual(
             options,
-            [u'- Select -', u'Zero', u'One', u'Two'])
+            [u'- Select -', u'Zero', u'One', u'Two']) 
         self.assertEqual(browser.get_text('css=.req'), '*')
         self.assertEqual(browser.get_text('css=#captured'), 'None')
 
@@ -1958,7 +1958,7 @@ def test_submit_selected(self):
         self.assertEqual(browser.get_selected_index('deformField1'), '1')
         captured = browser.get_text('css=#captured')
         self.assertSimilarRepr(
-            captured,
+            captured, 
             "{'number': 0}")
 
 class SelectWidgetWithOptgroupTest(Base, unittest.TestCase):
@@ -1974,7 +1974,7 @@ def test_render_default(self):
         self.assertEqual(
             options,
             [u'Select your favorite musician',
-             u'Jimmy Page', u'Jimi Hendrix', u'Billy Cobham', u'John Bonham'])
+             u'Jimmy Page', u'Jimi Hendrix', u'Billy Cobham', u'John Bonham']) 
         self.assertEqual(browser.get_text('css=.req'), '*')
         self.assertEqual(browser.get_text('css=#captured'), 'None')
         self.assertEqual(int(browser.get_xpath_count('//optgroup')), 2)
@@ -2052,7 +2052,7 @@ def test_submit_filled(self):
         self.assertEqual(browser.get_value('deformField1'), 'hello')
         captured = browser.get_text('css=#captured')
         self.assertSimilarRepr(
-            captured,
+            captured, 
             "{'text': u'hello'}")
 
 class MoneyInputWidgetTests(Base, unittest.TestCase):
@@ -2122,7 +2122,8 @@ def test_submit_filled(self):
         browser.open(self.url)
         browser.wait_for_page_to_load("30000")
         browser.focus('deformField1')
-        browser.type_keys('deformField1', 'ba')
+        browser.type('deformField1', 'bar')
+        browser.type_keys('deformField1', 'bar')
         import time
         time.sleep(.2)
         self.assertTrue(browser.is_text_present('bar'))
@@ -2135,28 +2136,9 @@ def test_submit_filled(self):
         self.assertEqual(browser.get_value('deformField1'), u'bar')
         captured = browser.get_text('css=#captured')
         self.assertSimilarRepr(
-            captured,
+            captured, 
             "{'text': u'bar'}")
 
-    def test_special_chars(self):
-        browser.open(self.url)
-        browser.wait_for_page_to_load("30000")
-        browser.focus('deformField1')
-        browser.type_keys('deformField1', 'foo')
-        import time
-        time.sleep(.2)
-        self.assertTrue(browser.is_text_present('foo & bar'))
-        browser.mouse_over("//html/body/ul/li/a") # hurrr, necessary
-        browser.click("//html/body/ul/li/a")
-        browser.click('submit')
-        browser.wait_for_page_to_load("30000")
-        self.assertFalse(browser.is_element_present('css=.errorMsgLbl'))
-        self.assertEqual(browser.get_value('deformField1'), u'foo & bar')
-        captured = browser.get_text('css=#captured')
-        self.assertSimilarRepr(
-                captured,
-                "{'text': u'foo & bar'}")
-
 class AutocompleteRemoteInputWidgetTests(Base, unittest.TestCase):
     url = "/autocomplete_remote_input/"
     def test_render_default(self):
@@ -2294,7 +2276,7 @@ def test_submit_filled(self):
         self.assertEqual(browser.get_value('deformField1'), '<p>hello</p>')
         captured = browser.get_text('css=#captured')
         self.assertSimilarRepr(
-            captured,
+            captured, 
             "{'text': u'<p>hello</p>'}"
             )
 
@@ -2482,7 +2464,7 @@ def test_submit_default(self):
         captured = browser.get_text('css=#captured')
         self.assertEqual(
             eval(captured),
-            ({'csv': [(1, u'hello', Decimal("4.5")),
+            ({'csv': [(1, u'hello', Decimal("4.5")), 
                       (2, u'goodbye', Decimal("5.5"))]
               }))
 
@@ -2593,7 +2575,7 @@ def test_submit_first(self):
         self.assertEqual(browser.get_value('deformField1'), 'hey')
         captured = browser.get_text('css=#captured')
         self.assertSimilarRepr(
-            captured,
+            captured, 
             u"{'name1': u'hey'}")
 
     def test_submit_second(self):
@@ -2605,7 +2587,7 @@ def test_submit_second(self):
         self.assertEqual(browser.get_value('deformField3'), 'hey')
         captured = browser.get_text('css=#captured')
         self.assertSimilarRepr(
-            captured,
+            captured, 
             u"{'name2': u'hey'}"
             )
 
@@ -2641,7 +2623,7 @@ def test_submit_one_filled(self):
         browser.wait_for_page_to_load("30000")
         captured = browser.get_text('css=#captured')
         self.assertSimilarRepr(
-            captured,
+            captured, 
             u"{'two': u'', 'one': u'one'}"
             )
         self.assertFalse(browser.is_element_present('css=.errorMsgLbl'))