paul@338 | 1 | # HG changeset patch |
paul@338 | 2 | # User Paul Boddie <paul@boddie.org.uk> |
paul@338 | 3 | # Date 1359762149 -3600 |
paul@338 | 4 | # Node ID f192339c4473f140b07a1522ecac636abe616350 |
paul@338 | 5 | # Parent f548add9c9d5a0c445c752c82fb6465c2b442d21 |
paul@338 | 6 | Fixed the plain text formatting of links. |
paul@338 | 7 | |
paul@338 | 8 | diff -r f548add9c9d5 -r f192339c4473 MoinMoin/formatter/text_plain.py |
paul@338 | 9 | --- a/MoinMoin/formatter/text_plain.py Fri Feb 01 01:38:47 2013 +0100 |
paul@338 | 10 | +++ b/MoinMoin/formatter/text_plain.py Sat Feb 02 00:42:29 2013 +0100 |
paul@338 | 11 | @@ -45,14 +45,14 @@ |
paul@338 | 12 | self._text = [] |
paul@338 | 13 | return u'' |
paul@338 | 14 | else: |
paul@338 | 15 | - if "".join(self._text) == self._url: |
paul@338 | 16 | + try: |
paul@338 | 17 | + if "".join(self._text) == self._url: |
paul@338 | 18 | + return '' |
paul@338 | 19 | + else: |
paul@338 | 20 | + return u' [%s]' % self._url |
paul@338 | 21 | + finally: |
paul@338 | 22 | self._url = None |
paul@338 | 23 | self._text = None |
paul@338 | 24 | - return '' |
paul@338 | 25 | - else: |
paul@338 | 26 | - self._url = None |
paul@338 | 27 | - self._text = None |
paul@338 | 28 | - return u' [%s]' % (self._url) |
paul@338 | 29 | |
paul@338 | 30 | def url(self, on, url='', css=None, **kw): |
paul@338 | 31 | if on: |
paul@338 | 32 | @@ -60,14 +60,14 @@ |
paul@338 | 33 | self._text = [] |
paul@338 | 34 | return u'' |
paul@338 | 35 | else: |
paul@338 | 36 | - if "".join(self._text) == self._url: |
paul@338 | 37 | + try: |
paul@338 | 38 | + if "".join(self._text) == self._url: |
paul@338 | 39 | + return '' |
paul@338 | 40 | + else: |
paul@338 | 41 | + return u' [%s]' % self._url |
paul@338 | 42 | + finally: |
paul@338 | 43 | self._url = None |
paul@338 | 44 | self._text = None |
paul@338 | 45 | - return '' |
paul@338 | 46 | - else: |
paul@338 | 47 | - self._url = None |
paul@338 | 48 | - self._text = None |
paul@338 | 49 | - return u' [%s]' % (self._url) |
paul@338 | 50 | |
paul@338 | 51 | def attachment_link(self, on, url=None, **kw): |
paul@338 | 52 | if on: |