Mercurial > moin-2.0
changeset 2072:ab2421ef4897
Merge with upstream.
| author | Andreas Kloeckner <inform@tiker.net> |
|---|---|
| date | Sun, 24 Mar 2013 19:36:24 -0500 |
| parents | 45da3fcc47f8 (current diff) 1faff598bbae (diff) |
| children | dc2749d23960 |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/MoinMoin/converter/_tests/test_include.py Sun Mar 24 19:28:53 2013 -0500 +++ b/MoinMoin/converter/_tests/test_include.py Sun Mar 24 19:36:24 2013 -0500 @@ -190,6 +190,9 @@ assert '<p></p>' not in rendered def test_IncludeAsLinkAlternate(self): + # the 3rd parameter, u'', should be a binary string defining a png image, but it is not needed for this simple test + update_item(u'logo.png', {CONTENTTYPE: u'image/png'}, u'') + update_item(u'page2', {CONTENTTYPE: u'text/x.moin.wiki;charset=utf-8'}, u"Single Line") # image as link alternate update_item(u'page1', {CONTENTTYPE: u'text/x.moin.wiki;charset=utf-8'}, u"text [[page2|{{logo.png}}]] text") rendered = Item.create(u'page1').content._render_data()
--- a/MoinMoin/script/migration/moin19/import19.py Sun Mar 24 19:28:53 2013 -0500 +++ b/MoinMoin/script/migration/moin19/import19.py Sun Mar 24 19:36:24 2013 -0500 @@ -223,7 +223,7 @@ # we prepare some values for the case we don't find a better value in edit-log: meta = {MTIME: -1, # fake, will get 0 in the end NAME: [item_name], # will get overwritten with name from edit-log - # if we have an entry there + # if we have an entry there } try: revpath = os.path.join(item.path, 'revisions', '{0:08d}'.format(revno - 1))