Noissue - Adding support for tel link scheme in Source.resolve_link of CMS

cms/sources.py

 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2016 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ skipping 11 matching lines @@
 import subprocess
 import urlparse
 import zipfile
 import logging
 
 
 class Source:
     def resolve_link(self, url, locale):
         parsed = urlparse.urlparse(url)
         page = parsed.path
-        # manually testing tel scheme because it is not recoginzed by urlparse

[Vasily Kuznetsov, 2017/02/23 19:03:29]

I think it would be better to make this special case a separate if statement.
This would avoid uglier line formatting to fit into 80 character limit and also
emphasize that this is a workaround. How about doing something like:

    if url.startswith('tel:'):
        # Workaround for 'tel' scheme that is not recognized on some platforms.
        return None, None

-        if parsed.scheme != '' or url.startswith('tel:') or page.startswith('/') or page.startswith('.'):
+        if parsed.scheme != '' or page.startswith('/') or page.startswith('.'):
             # Not a page link
+            return None, None
+
+        if url.startswith('tel:'):
+            # Workaround for 'tel' scheme not recognized in Python <=2.7.3.
             return None, None
 
         if page == '' and url != '':
             # Page-relative link
             return None, None
 
         config = self.read_config()
         default_locale = config.get('general', 'defaultlocale')
         default_page = config.get('general', 'defaultpage')
         alternative_page = '/'.join([page.rstrip('/'), default_page]).lstrip('/')
@@ skipping 248 matching lines @@
                 path = os.path.join(dir, filename)
                 if os.path.isfile(path):
                     result.append(relpath + filename)
                 elif os.path.isdir(path):
                     do_list(path, relpath + filename + '/')
         do_list(self.get_path(subdir), '')
         return result
 
     def get_cache_dir(self):
         return os.path.join(self._dir, 'cache')