changeset 1342:b8ee9f0cb30e

Merged upstream changes to htmlmarkup.py (partly)
author Alexander Schremmer <alex AT alexanderweb DOT de>
date Sun, 20 Aug 2006 13:48:16 +0200
parents 5ffa0d1ae026
children 144c3281e88f
files MoinMoin/support/htmlmarkup.py
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/support/htmlmarkup.py	Sat Aug 19 23:04:55 2006 +0200
+++ b/MoinMoin/support/htmlmarkup.py	Sun Aug 20 13:48:16 2006 +0200
@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
-# copied from trac.util.markup, revision 3446, merged on 2006-06-30
+# copied from trac.util.html, revision 3609, merged on 2006-08-20
 #
 # Copyright (C) 2003-2006 Edgewall Software
+# Copyright 2006 MoinMoin:AlexanderSchremmer
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
@@ -318,8 +319,11 @@
             else:
                 yield escape(child, quotes=False)
 
+    def __unicode__(self):
+        return u''.join(self.serialize())
+
     def __str__(self):
-        return Markup(''.join(self.serialize()))
+        return ''.join(self.serialize())
 
     def __add__(self, other):
         return Fragment()(self, other)