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