Wiki Links with no description should not strip the prefix for external links

[Christian Boos]

The implementation for #867 ([wiki:Sometext] -> Sometext)
had a bad side-effect for external links: ([http://host] -> //host).

I'll propose a patch for fixing this.

PS: Also contained in the patch is the possibility to add a ] in the link description, by enclosing the description in '...' or "..." quotes, like one can already do for the target.

[Christian Boos]

The initial patch

[Christian Boos]

Forgot to "accept" the ticket I created.

(see #2045)

[Christopher Lenz]

I don't understand this change completely:

formatter.py

@@ -289 +289 @@
         target = fullmatch.group('ltgt') 
         if target and target[0] in "'\"":
             target = target[1:-1]
-        label = fullmatch.group('label') or target
+        label = fullmatch.group('label')
+        if not label:
+            if target:
+                label = target.startswith('//') and ns+':'+target or target
+            else:
+                label = ns
+        if label and label[0] in "'\"":
+            label = label[1:-1]
         rel = fullmatch.group('rel')
         if rel:
             return self._make_relative_link(rel, label or rel)

Why would target be empty? I.e. in what case would the ns be used as label? When removing the quotes around the label, why the if label check? Shouldn't the label always be set at that point?

For removing the quotes, I think the following code would be better (as in more readable):

    if label and label[0] in ("'", '"'):
        label = label[1:-1]

Finally, I'd also expand the and/or expression:

    if target:
        label = target
        if label.startswith('//'):
            label = ns + ':' + label
    else:
        ...

(But again, I don't see why target would be empty.)

[Christian Boos]

There is a least one situation where the target can be empty: [search: Search Trac] → Search Trac

This corresponds to #1937, which would be fixed by the above patch.

[Christopher Lenz]

Okay, so if you integrate the syntax recommendations I made above, please apply the patch. I'm planning to release 0.9b2 today (or maybe tomorrow).

It would probably also be a good idea to add some comments to the blocks that aren't so obvious ;-).

[Christian Boos]

Reworked patch applied in r2268. Additional unit tests added in r2269.