Interwiki Module Fixed

MoinMoin/util/interwiki.py

 # Copyright: 2010 MoinMoin:ThomasWaldmann
 # Copyright: 2010 MoinMoin:MicheleOrru
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
     MoinMoin - interwiki support code
 """
 
 from __future__ import absolute_import, division
 
 from werkzeug import url_quote
 
 from flask import current_app as app
 from flask import url_for
 
 import os.path
 from collections import namedtuple
 
-from MoinMoin.constants.keys import CURRENT, FIELDS, NAME_EXACT
+from MoinMoin.constants.keys import CURRENT, FIELDS, NAME_EXACT, NAMESPACE
 from MoinMoin.constants.contenttypes import CHARSET
 
 from MoinMoin import log
 logging = log.getLogger(__name__)
 
 
 def is_local_wiki(wiki_name):
     """
     check if <wiki_name> is THIS wiki
     """
     return wiki_name in [u'', u'Self', app.cfg.interwikiname, ]
 
 
 def is_known_wiki(wiki_name):
     """
     check if <wiki_name> is a known wiki name
 
     Note: interwiki_map should have entries for the special wikinames
     denoting THIS wiki, so we do not need to check these names separately.
     """
     return wiki_name in app.cfg.interwiki_map
 
 
 def get_fqname(item_name, field, namespace):

[waldi, 2013/06/29 14:30:10]

You may want to convert this to a member of CompositeName later.

     """
     Compute composite name from item_name, field, namespace
     composite name == [NAMESPACE/][@FIELD/]NAME
     """
     if field == NAME_EXACT:
         field = u''
     if field:

[waldi, 2013/06/29 14:30:10]

"if field and field != NAME_EXACT:"
may be faster and easier to read.

         item_name = u'@{0}/{1}'.format(field, item_name)
     if namespace:
         item_name = u'{0}/{1}'.format(namespace, item_name)
     return item_name
 
 
 def url_for_item(item_name, wiki_name=u'', field=u'', namespace=u'', rev=CURRENT, endpoint=u'frontend.show_item', _external=False):
     """
     Compute URL for some local or remote/interwiki item.
 
@@ skipping 75 matching lines @@
         length = len(namespace) + 1
         url = url[length:]
     return namespace, url
 
 
 class CompositeName(namedtuple('CompositeName', 'namespace, field, value')):
     """
     namedtuple to hold the compositename
     """
     @property
     def split(self):

[waldi, 2013/06/29 14:30:10]

Is this used? This looks like backward compatibility code and defines a
different view over the same data. If it is used, document it, otherwise remove
it.

         return {NAMESPACE: self.namespace, u'field': self.field, u'item_name': self.value}
 
     @property
     def fullname(self):
         return get_fqname(self.value, self.field, self.namespace)
 
     def __unicode__(self):
         return self.fullname
 
 
 def split_fqname(url):

[waldi, 2013/06/29 14:30:10]

You may want to convert this to a (static) member method of CompositeName later

     """
     Split a fully qualified url into namespace, field and pagename
     url -> [NAMESPACE/][@FIELD/]NAME
     param: url: the url to split
     returns: a namedtuple CompositeName(namespace, field, itemname)
     Example:
         url: u'ns1/ns2/@itemid/Page' return u'ns1/ns2', u'itemid', u'Page'
         url: u'@revid/OtherPage' return u'', u'revid', u'OtherPage'
         url: u'ns1/Page' return u'ns1', u'', u'Page'
         url: u'ns1/ns2/@notfield' return u'ns1/ns2', u'', u'@notfield'
@@ skipping 22 matching lines @@
     'ns1/ns2/AnyPage' -> "Self", "ns1/ns2", "", "AnyPage" if ns1/ns2 namespace exists OR
                          "Self", "ns1", "", "ns2/AnyPage" if ns1 namespace exists OR
                          "Self", "", "", "ns1/ns2/AnyPage" else.
     'MoinMoin/ns/@Somefield/AnyPage' -> "MoinMoin", "ns", "", "@Somefield/AnyPage" if ns namespace exists and field Somefield does not OR
                                      "MoinMoin", "ns", "Somefield", "AnyPage" if ns namespace and field Somefield exist OR
                                      "MoinMoin", "", "", "ns/@Somefield/AnyPage" else.
     :param wikiurl: the url to split
     :rtype: tuple
     :returns: (wikiname, namespace, field, pagename)
     """
-    # TODO Now using slash('/') as delimiter in interwiki markup instead of ':', change the moin 1.9 importer accordingly.
     if not isinstance(wikiurl, unicode):
         wikiurl = wikiurl.decode('utf-8')
     # Base case: no colon in wikiurl
     if not '/' in wikiurl:
         return u'Self', u'', NAME_EXACT, wikiurl
     wikiname = field = namespace = u''
     if not wikiurl.startswith('/'):
         interwiki_mapping = set()
         for interwiki_name in app.cfg.interwiki_map:
             interwiki_mapping.add(interwiki_name.split('/')[0])
@@ skipping 108 matching lines @@
     @staticmethod
     def from_file(filename):
         """
         Load and parse a valid interwiki map file.
         """
         filename = os.path.expanduser(filename)
         with open(filename) as f:
             parser = InterWikiMap(f.read())
 
         return parser