Stop relying on dictionary key order.

zopefoundation · Feb 25, 2013 · e712d6c · e712d6c
1 parent 8d58980
commit e712d6c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/src/z3c/table/README.txt b/src/z3c/table/README.txt
@@ -550,8 +550,8 @@ and the second column:
   >>> simpleColumn.header
   u'The second column'
 
-  >>> simpleColumn.cssClasses
-  {'td': 'tdCol', 'th': 'thCol'}
+  >>> sorted(simpleColumn.cssClasses.items())
+  [('td', 'tdCol'), ('th', 'thCol')]
 
 
 Headers
@@ -605,7 +605,7 @@ column as ascending:
    <thead>
     <tr>
      <th><a
-      href="?table-sortOrder=descending&table-sortOn=table-titleColumn-0"
+      href="?table-sortOn=table-titleColumn-0&table-sortOrder=descending"
       title="Sort">Title</a></th>
   ...
   </table>
@@ -619,7 +619,7 @@ ascending again:
    <thead>
     <tr>
      <th><a
-      href="?table-sortOrder=ascending&table-sortOn=table-titleColumn-0"
+      href="?table-sortOn=table-titleColumn-0&table-sortOrder=ascending"
       title="Sort">Title</a></th>
   ...
   </table>
@@ -637,7 +637,7 @@ the link should allow to switch again to ascending:
    <thead>
     <tr>
      <th><a
-      href="?table-sortOrder=ascending&table-sortOn=table-titleColumn-0"
+      href="?table-sortOn=table-titleColumn-0&table-sortOrder=ascending"
       title="Sort">Title</a></th>
   ...
   </table>
diff --git a/src/z3c/table/header.py b/src/z3c/table/header.py
@@ -96,7 +96,7 @@ def render(self):
         args = self.getQueryStringArgs()
         args.update({'%s-sortOn' % prefix: colID,
                      '%s-sortOrder' % prefix: sortOrder})
-        queryString = '?%s' % (urlencode(args))
+        queryString = '?%s' % (urlencode(sorted(args.items())))
 
         return '<a href="%s" title="%s">%s</a>' % (
             queryString,

diff --git a/src/z3c/table/sort.txt b/src/z3c/table/sort.txt
@@ -277,8 +277,8 @@ Let's see now various sortings:
   <table>
     <thead>
       <tr>
-        <th class="sorted-on ascending"><a href="?table-sortOrder=descending&table-sortOn=table-title-0" title="Sort">Title</a></th>
-        <th><a href="?table-sortOrder=ascending&table-sortOn=table-number-1" title="Sort">Number</a></th>
+        <th class="sorted-on ascending"><a href="?table-sortOn=table-title-0&table-sortOrder=descending" title="Sort">Title</a></th>
+        <th><a href="?table-sortOn=table-number-1&table-sortOrder=ascending" title="Sort">Number</a></th>
       </tr>
     </thead>
     <tbody>
@@ -314,8 +314,8 @@ Let's see the `number` column:
   <table>
     <thead>
       <tr>
-        <th><a href="?table-sortOrder=ascending&table-sortOn=table-title-0" title="Sort">Title</a></th>
-        <th class="sorted-on ascending"><a href="?table-sortOrder=descending&table-sortOn=table-number-1" title="Sort">Number</a></th>
+        <th><a href="?table-sortOn=table-title-0&table-sortOrder=ascending" title="Sort">Title</a></th>
+        <th class="sorted-on ascending"><a href="?table-sortOn=table-number-1&table-sortOrder=descending" title="Sort">Number</a></th>
       </tr>
     </thead>
     <tbody>
@@ -352,8 +352,8 @@ Let's see the `title` column but descending:
   <table>
     <thead>
       <tr>
-        <th class="sorted-on descending"><a href="?table-sortOrder=ascending&table-sortOn=table-title-0" title="Sort">Title</a></th>
-        <th><a href="?table-sortOrder=descending&table-sortOn=table-number-1" title="Sort">Number</a></th>
+        <th class="sorted-on descending"><a href="?table-sortOn=table-title-0&table-sortOrder=ascending" title="Sort">Title</a></th>
+        <th><a href="?table-sortOn=table-number-1&table-sortOrder=descending" title="Sort">Number</a></th>
       </tr>
     </thead>
     <tbody>