lib/python/web_support.py (make_pre);

  Fix bug which caused make_pre to include only the last element of
  the passed list in its output.
(__test);
  Regression test.


git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@2509 e39458fd-73e7-0310-bf30-c45bca0a0e42

1 files changed, 2 insertions, 1 deletions

diff --git a/lib/python/web_support.py b/lib/python/web_support.py
index 8a2c96e63e..de174bd510 100644
--- a/lib/python/web_support.py
+++ b/lib/python/web_support.py
@@ -422,7 +422,7 @@ def make_pre(lines):
     for l in lines:
         append(l)
         append('\n')
-    return tag('pre', ''.join(l))
+    return tag('pre', ''.join(r))
 
 def make_menu(convert, *entries):
     """Creates an unnumbered list of hyperlinks.
@@ -676,6 +676,7 @@ def __test():
            == '<span class="red">green</span>'
     assert TD(A("http://www.example.net/", "example")).toString() \
            == '<td><a href="http://www.example.net/">example</a></td>'
+    assert make_pre(['a', 'b']).toString() == '<pre>a\nb\n</pre>'
 
     s = cStringIO.StringIO()
     RedirectResult(u.scriptRelativeFull("123")).flatten(s.write)