From 200666040ff737181662824ea33cd019890181f9 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Thu, 12 Nov 2015 13:28:38 +0100
Subject: Python 3: dict.items() doesn't return a list anymore

Use sorted() instead, which works on lists as well as dict_items
objects.
---
 paste/exceptions/formatter.py | 4 ++--
 paste/util/template.py        | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/paste/exceptions/formatter.py b/paste/exceptions/formatter.py
index c83ab50..09309de 100644
--- a/paste/exceptions/formatter.py
+++ b/paste/exceptions/formatter.py
@@ -217,7 +217,7 @@ class TextFormatter(AbstractFormatter):
         elif isinstance(value, dict):
             lines = ['\n', title, '-'*len(title)]
             items = value.items()
-            items.sort()
+            items = sorted(items)
             for n, v in items:
                 try:
                     v = repr(v)
@@ -303,7 +303,7 @@ class HTMLFormatter(TextFormatter):
     def zebra_table(self, title, rows, table_class="variables"):
         if isinstance(rows, dict):
             rows = rows.items()
-            rows.sort()
+            rows = sorted(rows)
         table = ['<table class="%s">' % table_class,
                  '<tr class="header"><th colspan="2">%s</th></tr>'
                  % self.quote(title)]
diff --git a/paste/util/template.py b/paste/util/template.py
index f0826af..c0c5ed0 100644
--- a/paste/util/template.py
+++ b/paste/util/template.py
@@ -338,8 +338,7 @@ def url(v):
     return quote(v)
 
 def attr(**kw):
-    kw = kw.items()
-    kw.sort()
+    kw = sorted(kw.items())
     parts = []
     for name, value in kw:
         if value is None:
-- 
cgit v1.2.1