[robotframework] 2 new revisions pushed by jussi.ao...@gmail.com on 2011-07-25 11:43 GMT

[robotframework]

2 new revisions:

Revision: c9bea9b844d9
Author:   Jussi Malinen
Date:     Mon Jul 25 04:44:32 2011
Log:      if formatting is on in html_Escape, then whitespace has to be  
replaced...
http://code.google.com/p/robotframework/source/detail?r=c9bea9b844d9
Revision: 2c9b21642b1c
Author:   Jussi Malinen
Date:     Mon Jul 25 04:44:44 2011
Log:      Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=2c9b21642b1c

==============================================================================
Revision: c9bea9b844d9
Author:   Jussi Malinen
Date:     Mon Jul 25 04:44:32 2011
Log:      if formatting is on in html_Escape, then whitespace has to be  
replaced or ride will not show documentation correctly
http://code.google.com/p/robotframework/source/detail?r=c9bea9b844d9

Modified:
 /src/robot/utils/htmlutils.py

=======================================
--- /src/robot/utils/htmlutils.py       Sun Jul 10 12:23:28 2011
+++ /src/robot/utils/htmlutils.py       Mon Jul 25 04:44:32 2011
@@ -20,7 +20,7 @@
 def html_escape(text, formatting=False):
     # TODO: Remove formatting attribute after RIDE does not use it anymore
     if formatting:
-        return html_format(text)
+        return html_format(text).replace('\t', ' '*8).replace('  ', '  
&nbsp;').replace('\n','<br />\n')
     return _HtmlEscaper().format(text)



==============================================================================
Revision: 2c9b21642b1c
Author:   Jussi Malinen
Date:     Mon Jul 25 04:44:44 2011
Log:      Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=2c9b21642b1c