create input elements with attributes in a defined (sorted) order

Author: cmeerw

roundup/cgi/templating.py

@@ -444,7 +444,7 @@ def _set_input_default_args(dic):
 
 def cgi_escape_attrs(**attrs):
     return ' '.join(['%s="%s"'%(k,cgi.escape(str(v), True))
-        for k,v in attrs.items()])
+        for k,v in sorted(attrs.items())])
 
 def input_html4(**attrs):
     """Generate an 'input' (html4) element with given attributes"""

test/test_cgi.py

@@ -801,7 +801,7 @@ def hasPermission(s, p, classname=None, d=None, e=None, **kw):
           <p>deferred</p>
           <p>admin, anonymous</p>
           <p></p>
-          <p><input type="text" name="superseder" value="5000" size="30"></p>
+          <p><input name="superseder" size="30" type="text" value="5000"></p>
          </body>
         </html>
         """.strip ())

test/test_templating.py

@@ -212,7 +212,7 @@ def test_string_plain_or_hyperlinked(self):
 
     def test_string_field(self):
         p = StringHTMLProperty(self.client, 'test', '1', None, 'test', 'A string <b> with [email protected] embedded &lt; html</b>')
-        self.assertEqual(p.field(), '<input type="text" name="test1@test" value="A string &lt;b&gt; with [email protected] embedded &amp;lt; html&lt;/b&gt;" size="30">')
+        self.assertEqual(p.field(), '<input name="test1@test" size="30" type="text" value="A string &lt;b&gt; with [email protected] embedded &amp;lt; html&lt;/b&gt;">')
 
     def test_string_multiline(self):
         p = StringHTMLProperty(self.client, 'test', '1', None, 'test', 'A string <b> with [email protected] embedded &lt; html</b>')