r47208 - Merge haproxy-dict-ordering-8286: Fix a test that relied on dict ordering
hawkowl-TA+aISz0psMTMxyoc4vAAJOcrHinNvQL0E9HWUfgJXw@public.gmane.org Sun, 10 Apr 2016 21:49:34 -0600 (MDT)
| Newsgroups | gmane.comp.python.twisted.commits |
|---|---|
| Message-ID | <[email protected]> |
Author: hawkowl
Date: Sun Apr 10 21:49:27 2016
New Revision: 47208
Added:
trunk/twisted/topfiles/8286.misc
Modified:
trunk/twisted/protocols/haproxy/_parser.py
Log:
Merge haproxy-dict-ordering-8286: Fix a test that relied on dict ordering
Author: hawkowl
Reviewer: mithrandi
Fixes: #8286
Modified: trunk/twisted/protocols/haproxy/_parser.py
==============================================================================
--- trunk/twisted/protocols/haproxy/_parser.py (original)
+++ trunk/twisted/protocols/haproxy/_parser.py Sun Apr 10 21:49:27 2016
@@ -35,10 +35,10 @@
description = ':'.join(
[quoteStringArgument(str(arg)) for arg in args] +
- ['%s=%s' % (quoteStringArgument(str(key)),
+ sorted(['%s=%s' % (quoteStringArgument(str(key)),
quoteStringArgument(str(value)))
for key, value in iteritems(kwargs)
- ])
+ ]))
return description