1
=== modified file 'document_page/migrations/7.0.1.0.1/post-migration.py'
2
--- document_page/migrations/7.0.1.0.1/post-migration.py	2014-09-15 07:43:23 +0000
3
+++ document_page/migrations/7.0.1.0.1/post-migration.py	2014-10-20 12:48:46 +0000
4
@@ -111,9 +111,6 @@
5
111
re_ol_li = re.compile("^(\*\*+|#+):? ")
111
re_ol_li = re.compile("^(\*\*+|#+):? ")
6
112
re_ul_ol_li = re.compile("^(\*+|#+):? ")
112
re_ul_ol_li = re.compile("^(\*+|#+):? ")
7
113
re_youtube = re.compile("^(https?://)?(www\.)?youtube.com/(watch\?(.*)v=|embed/)([^&]+)")
113
re_youtube = re.compile("^(https?://)?(www\.)?youtube.com/(watch\?(.*)v=|embed/)([^&]+)")
8
114
re_b_i = re.compile("'''''(([^']|([^']('{1,4})?[^']))+)'''''")
9
115
re_b = re.compile("'''(([^']|([^'](''?)?[^']))+)'''")
10
116
re_i = re.compile("''(([^']|([^']'?[^']))+)''")
11
117
114
12
118
115
13
119
class Wiky:
116
class Wiky:
14
@@ -316,9 +313,36 @@
15
316
                    break
313
                    break
16
317
314
17
318
        # Bold, Italics, Emphasis
315
        # Bold, Italics, Emphasis
23
319
        wikitext = re_b_i.sub("<b><i>\1</i></b>", wikitext)
316
        head = ''
24
320
        wikitext = re_b.sub("<b>\1</b>", wikitext)
317
        tail = wikitext
25
321
        wikitext = re_i.sub("<i>\1</i>", wikitext)
318
        while tail:
26
322
319
            quote_pos = tail.find("'")
27
323
        return wikitext
320
            if quote_pos > -1:
28
321
                head += tail[:quote_pos]
29
322
                tail = tail[quote_pos:]
30
323
                pos = 0
31
324
                while pos < len(tail) and tail[pos] == "'":
32
325
                    pos += 1
33
326
                if pos == 2 or pos == 3 or pos == 5:
34
327
                    endquote_pos = tail.find("'"*pos, pos)
35
328
                    if endquote_pos > -1:
36
329
                        text = tail[pos:endquote_pos]
37
330
                        if pos == 2:
38
331
                            text = '<i>%s</i>' % text
39
332
                        elif pos == 3:
40
333
                            text = '<b>%s</b>' % text
41
334
                        elif pos == 5:
42
335
                            text = '<b><i>%s</i></b>' % text
43
336
                        head += text
44
337
                        tail = tail[endquote_pos + pos:]
45
338
                    else:
46
339
                        head += tail[:pos]
47
340
                        tail = tail[pos:]
48
341
                else:
49
342
                    head += tail[:pos]
50
343
                    tail = tail[pos:]
51
344
            else:
52
345
                head += tail
53
346
                tail = ''
54
347
        return head
55
324
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
348
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
Status:	Merged
Merged at revision:	8174
Proposed branch:	lp:~therp-nl/openupgrade-addons/7.0-wiki-nobacktracking-regex
Merge into:	lp:openupgrade-addons
Diff against target:	55 lines (+32/-8) 1 file modified document_page/migrations/7.0.1.0.1/post-migration.py (+32/-8)
To merge this branch:	bzr merge lp:~therp-nl/openupgrade-addons/7.0-wiki-nobacktracking-regex
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Ronald Portier (Therp)	code review and test		Approve on 2014-10-20
Pedro Manuel Baeza	code review		Approve on 2014-10-20
Sandy Carter (http://www.savoirfairelinux.com) (community)	code review, no test	2014-10-20	Approve on 2014-10-20
Review via email: mp+238872@code.launchpad.net