Issue 254920043: fix several failing macros, fixes #532, #476, #353

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Issue 254920043: fix several failing macros, fixes #532, #476, #353 (Closed)

Can't Edit
Can't Publish+Mail
Start Review

Created:
8 years, 9 months ago by RogerHaase

Modified:
8 years, 9 months ago

Reviewers:
thomas.j.waldmann

Visibility:
Public.

More Reviews

Description

fix several failing macros, fixes #532, #476, #353

Patch Set 1 : #

Patch Set 2 : simplify patch by removing 3 files with changes to comments #

Total comments: 2

Created: 8 years, 9 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+161 lines, -66 lines)			Patch
M	MoinMoin/converter/_args_wiki.py	View	1	2 chunks	+40 lines, -14 lines	1 comment	Download
M	MoinMoin/converter/_tests/test__wiki_macro.py	View		1 chunk	+5 lines, -4 lines	0 comments	Download
M	MoinMoin/converter/_wiki_macro.py	View		4 chunks	+18 lines, -5 lines	0 comments	Download
M	MoinMoin/converter/creole_in.py	View		4 chunks	+18 lines, -5 lines	1 comment	Download
M	MoinMoin/converter/moinwiki_in.py	View		3 chunks	+11 lines, -3 lines	0 comments	Download
M	MoinMoin/macro/GetText.py	View		1 chunk	+1 line, -2 lines	0 comments	Download
M	MoinMoin/macro/GetVal.py	View		1 chunk	+14 lines, -7 lines	0 comments	Download
M	MoinMoin/macro/MailTo.py	View		2 chunks	+15 lines, -7 lines	0 comments	Download
M	MoinMoin/macro/PagenameList.py	View		2 chunks	+12 lines, -6 lines	0 comments	Download
M	MoinMoin/macro/RandomItem.py	View		1 chunk	+3 lines, -3 lines	0 comments	Download
M	MoinMoin/macro/Verbatim.py	View	1	2 chunks	+3 lines, -3 lines	0 comments	Download
M	MoinMoin/macro/_base.py	View		2 chunks	+15 lines, -0 lines	0 comments	Download
M	MoinMoin/macro/_tests/test_GetText.py	View		1 chunk	+1 line, -1 line	0 comments	Download
M	MoinMoin/macro/_tests/test_GetVal.py	View		1 chunk	+2 lines, -4 lines	0 comments	Download
M	MoinMoin/macro/_tests/test_Verbatim.py	View		1 chunk	+3 lines, -2 lines	0 comments	Download

Messages

Total messages: 1

Expand All Messages | Collapse All Messages

RogerHaase

8 years, 9 months ago (2015-07-08 16:47:34 UTC) #1

_args_wiki.py now has no-parse option for all macros and special parsing for
Include macro.

moinwiki_in.py and creole_in.py were changed to use no-parse option.

Changes to macros and tests reflect above changes

https://codereview.appspot.com/254920043/diff/100001/MoinMoin/converter/_args...
File MoinMoin/converter/_args_wiki.py (right):

https://codereview.appspot.com/254920043/diff/100001/MoinMoin/converter/_args...
MoinMoin/converter/_args_wiki.py:45: (\^?[-/\w\d]+[-\s\w]*)
_include_rules differs from _parse_rules (line 17)
1. add \^ to support <<Include(^ma)>> which still fails but for a different
reason
2. add / to support <<Include(Home/subitem)>>
3. add [-\s\w]* to support <<Include(AjudaNaFormatação, My Favorite Page, 6)>>
where My Favorite Page may be unquoted as in moin 1.9

https://codereview.appspot.com/254920043/diff/100001/MoinMoin/converter/creol...
File MoinMoin/converter/creole_in.py (right):

https://codereview.appspot.com/254920043/diff/100001/MoinMoin/converter/creol...
MoinMoin/converter/creole_in.py:134: macro_args = parse_arguments(macro_args,
parse_re=None)
here is reason so many macros are changed, effect is to treat entire macro
argument as if it were quoted and let each macro decide how to parse argument
string.

Expand All Messages | Collapse All Messages