diff options
author | Alex Gr?nholm <alex.gronholm@nextday.fi> | 2013-11-20 23:42:12 +0200 |
---|---|---|
committer | Alex Gr?nholm <alex.gronholm@nextday.fi> | 2013-11-20 23:42:12 +0200 |
commit | 8d38352c69a7b8b0dc53ced71cee32ad5f347c42 (patch) | |
tree | 7b6f111ce706342a560929ddfd7996a5fa1f9c65 | |
parent | 1ec38e338e33cc1eb776669ce321afc71fa8abf0 (diff) | |
parent | 3b6237206633a972ab5196b93c8423568b02bb6d (diff) | |
download | pastedeploy-8d38352c69a7b8b0dc53ced71cee32ad5f347c42.tar.gz |
Merged in tseaver/pastedeploy/utils.fix_type_error-py3k (pull request #6)
Py3k-compatible sorting of 'kwargs.items'.
-rw-r--r-- | paste/deploy/util.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/paste/deploy/util.py b/paste/deploy/util.py index 02d3fa2..b6f766a 100644 --- a/paste/deploy/util.py +++ b/paste/deploy/util.py @@ -32,8 +32,7 @@ def fix_type_error(exc_info, callable, varargs, kwargs): if kwargs and args: args += ', ' if kwargs: - kwargs = kwargs.items() - kwargs.sort() + kwargs = sorted(kwargs.items()) args += ', '.join(['%s=...' % n for n, v in kwargs]) gotspec = '(%s)' % args msg = '%s; got %s, wanted %s' % (exc_info[1], gotspec, argspec) |