Revert "Introduce INTERNAL_LINK_FIELDS setting."

This reverts commit 8343912.

Author: mosra

docs/changelog.rst

@@ -5,8 +5,6 @@ Next release
 ============
 
 * New signal: ``feed_generated``
-* Introduced ``INTERNAL_LINK_FIELDS`` to allow URL replacement in user-defined
-  metadata fields.
 
 3.7.1 (2017-01-10)
 ==================

docs/settings.rst

@@ -312,12 +312,6 @@ Basic settings
    A list of metadata fields containing reST/Markdown content to be parsed and
    translated to HTML.
 
-.. data:: INTERNAL_LINK_FIELDS = []
-
-   A list of metadata fields containing links to internal content to be
-   converted to absolute URLs. For example, a theme can use a ``:cover:``
-   article metadata field to include an image on page background or in a social
-   meta tag. For details see :ref:`ref-linking-to-internal-content`.
 
 URL settings
 ============

pelican/contents.py

@@ -204,68 +204,6 @@ def get_url_setting(self, key):
         key = key if self.in_default_lang else 'lang_%s' % key
         return self._expand_settings(key)
 
-    def _link_replacer(self, siteurl, m):
-        what = m.group('what')
-        value = urlparse(m.group('value'))
-        path = value.path
-        origin = m.group('path')
-
-        # XXX Put this in a different location.
-        if what in {'filename', 'attach'}:
-            if path.startswith('/'):
-                path = path[1:]
-            else:
-                # relative to the source path of this content
-                path = self.get_relative_source_path(
-                    os.path.join(self.relative_dir, path)
-                )
-
-            if path not in self._context['filenames']:
-                unquoted_path = path.replace('%20', ' ')
-
-                if unquoted_path in self._context['filenames']:
-                    path = unquoted_path
-
-            linked_content = self._context['filenames'].get(path)
-            if linked_content:
-                if what == 'attach':
-                    if isinstance(linked_content, Static):
-                        linked_content.attach_to(self)
-                    else:
-                        logger.warning(
-                            "%s used {attach} link syntax on a "
-                            "non-static file. Use {filename} instead.",
-                            self.get_relative_source_path())
-                origin = '/'.join((siteurl, linked_content.url))
-                origin = origin.replace('\\', '/')  # for Windows paths.
-            else:
-                logger.warning(
-                    "Unable to find '%s', skipping url replacement.",
-                    value.geturl(), extra={
-                        'limit_msg': ("Other resources were not found "
-                                      "and their urls not replaced")})
-        elif what == 'category':
-            origin = '/'.join((siteurl, Category(path, self.settings).url))
-        elif what == 'tag':
-            origin = '/'.join((siteurl, Tag(path, self.settings).url))
-        elif what == 'index':
-            origin = '/'.join((siteurl, self.settings['INDEX_SAVE_AS']))
-        elif what == 'author':
-            origin = '/'.join((siteurl, Author(path, self.settings).url))
-        else:
-            logger.warning(
-                "Replacement Indicator '%s' not recognized, "
-                "skipping replacement",
-                what)
-
-        # keep all other parts, such as query, fragment, etc.
-        parts = list(value)
-        parts[2] = origin
-        origin = urlunparse(parts)
-
-        return ''.join((m.group('markup'), m.group('quote'), origin,
-                        m.group('quote')))
-
     def _update_content(self, content, siteurl):
         """Update the content attribute.
 
@@ -289,26 +227,69 @@ def _update_content(self, content, siteurl):
             \2""".format(instrasite_link_regex)
         hrefs = re.compile(regex, re.X)
 
-        return hrefs.sub(lambda m: self._link_replacer(siteurl, m), content)
+        def replacer(m):
+            what = m.group('what')
+            value = urlparse(m.group('value'))
+            path = value.path
+            origin = m.group('path')
 
-    def __getattribute__(self, name):
-        try:
-            # Avoid infinite recursion
-            settings = object.__getattribute__(self, 'settings')
-            link_fields = settings['INTERNAL_LINK_FIELDS']
-            if name in link_fields:
-                link_regex = r"""^
-                    (?P<markup>)(?P<quote>)
-                    (?P<path>{0}(?P<value>.*))
-                    $""".format(settings['INTRASITE_LINK_REGEX'])
-                links = re.compile(link_regex, re.X)
-                return links.sub(
-                    lambda m: self._link_replacer(self.get_siteurl(), m),
-                    object.__getattribute__(self, name))
+            # XXX Put this in a different location.
+            if what in {'filename', 'attach'}:
+                if path.startswith('/'):
+                    path = path[1:]
+                else:
+                    # relative to the source path of this content
+                    path = self.get_relative_source_path(
+                        os.path.join(self.relative_dir, path)
+                    )
+
+                if path not in self._context['filenames']:
+                    unquoted_path = path.replace('%20', ' ')
+
+                    if unquoted_path in self._context['filenames']:
+                        path = unquoted_path
+
+                linked_content = self._context['filenames'].get(path)
+                if linked_content:
+                    if what == 'attach':
+                        if isinstance(linked_content, Static):
+                            linked_content.attach_to(self)
+                        else:
+                            logger.warning(
+                                "%s used {attach} link syntax on a "
+                                "non-static file. Use {filename} instead.",
+                                self.get_relative_source_path())
+                    origin = '/'.join((siteurl, linked_content.url))
+                    origin = origin.replace('\\', '/')  # for Windows paths.
+                else:
+                    logger.warning(
+                        "Unable to find '%s', skipping url replacement.",
+                        value.geturl(), extra={
+                            'limit_msg': ("Other resources were not found "
+                                          "and their urls not replaced")})
+            elif what == 'category':
+                origin = '/'.join((siteurl, Category(path, self.settings).url))
+            elif what == 'tag':
+                origin = '/'.join((siteurl, Tag(path, self.settings).url))
+            elif what == 'index':
+                origin = '/'.join((siteurl, self.settings['INDEX_SAVE_AS']))
+            elif what == 'author':
+                origin = '/'.join((siteurl, Author(path, self.settings).url))
             else:
-                return object.__getattribute__(self, name)
-        except AttributeError:
-            return object.__getattribute__(self, name)
+                logger.warning(
+                    "Replacement Indicator '%s' not recognized, "
+                    "skipping replacement",
+                    what)
+
+            # keep all other parts, such as query, fragment, etc.
+            parts = list(value)
+            parts[2] = origin
+            origin = urlunparse(parts)
+
+            return ''.join((m.group('markup'), m.group('quote'), origin,
+                            m.group('quote')))
+
+        return hrefs.sub(replacer, content)
 
     def get_siteurl(self):
         return self._context.get('localsiteurl', '')

pelican/settings.py

@@ -145,7 +145,6 @@ def load_source(name, path):
     'LOAD_CONTENT_CACHE': False,
     'WRITE_SELECTED': [],
     'FORMATTED_FIELDS': ['summary'],
-    'INTERNAL_LINK_FIELDS': [],
 }
 
 PYGMENTS_RST_OPTIONS = None