You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2013/03/05 22:53:02 UTC

git commit: [#5805] handle leading tabs just like leading spaces since they can make preformatted blocks too

Updated Branches:
  refs/heads/db/5805 [created] a4b0daf20


[#5805] handle leading tabs just like leading spaces since they can make preformatted blocks too


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/a4b0daf2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/a4b0daf2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/a4b0daf2

Branch: refs/heads/db/5805
Commit: a4b0daf20a3e216b53fb090c7f6fc090c6e42f28
Parents: dbc9c19
Author: Dave Brondsema <db...@geek.net>
Authored: Tue Mar 5 21:52:48 2013 +0000
Committer: Dave Brondsema <db...@geek.net>
Committed: Tue Mar 5 21:52:48 2013 +0000

----------------------------------------------------------------------
 ForgeBlog/forgeblog/command/rssfeeds.py    |    2 +-
 ForgeBlog/forgeblog/tests/test_commands.py |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/a4b0daf2/ForgeBlog/forgeblog/command/rssfeeds.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/command/rssfeeds.py b/ForgeBlog/forgeblog/command/rssfeeds.py
index ce601ef..80df661 100644
--- a/ForgeBlog/forgeblog/command/rssfeeds.py
+++ b/ForgeBlog/forgeblog/command/rssfeeds.py
@@ -38,7 +38,7 @@ re_amp = re.compile(r'''
       (\#x[0-9A-F]+;)  # hex entity
     )
     ''', re.VERBOSE)
-re_leading_spaces = re.compile(r'^[ ]+', re.MULTILINE)
+re_leading_spaces = re.compile(r'^[\t ]+', re.MULTILINE)
 re_preserve_spaces = re.compile(r'''
     [ ]           # space
     (?=[ ])       # lookahead for a space

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/a4b0daf2/ForgeBlog/forgeblog/tests/test_commands.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/tests/test_commands.py b/ForgeBlog/forgeblog/tests/test_commands.py
index 8dc6aee..b830b62 100644
--- a/ForgeBlog/forgeblog/tests/test_commands.py
+++ b/ForgeBlog/forgeblog/tests/test_commands.py
@@ -171,7 +171,7 @@ http://blah.com/?x=y&a=b - not escaped either
     # note: the \# isn't necessary it could be just # but that's the way
     # html2text escapes all #s currently.  The extra escaping of \# ends up
     # being ok though when rendered
-    
+
     from forgeblog.command import rssfeeds
 
     assert_equal(rssfeeds.plain2markdown(text), expected)
@@ -181,3 +181,6 @@ http://blah.com/?x=y&a=b - not escaped either
 
     assert_equal(rssfeeds.plain2markdown('\ttab before (stuff)', preserve_multiple_spaces=True),
                  '&nbsp;&nbsp;&nbsp; tab before \(stuff\)')
+
+    assert_equal(rssfeeds.plain2markdown('\ttab before (stuff)', preserve_multiple_spaces=False),
+                 'tab before \(stuff\)')