Multiple CMS improvements

sitescripts/cms/sources.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2013 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
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
 
 import sys, os, subprocess, zipfile, json, urlparse, codecs
 from StringIO import StringIO
 from ConfigParser import SafeConfigParser
 
 class Source:
   def resolve_link(self, url, locale):
     parsed = urlparse.urlparse(url)
     page = parsed.path
     if parsed.scheme != "" or page.startswith("/") or page.startswith("."):
       # Not a page link
       return None, None
 
+    if parsed.path == "" and url != "":
+      # Page-relative link
+      return None, None
+
     config = self.read_config()
     default_locale = config.get("general", "defaultlocale")
     default_page = config.get("general", "defaultpage")
 
     checked_page = page
     if config.has_option("locale_overrides", page):
       checked_page = config.get("locale_overrides", page)
 
     if self.has_localizable_file(default_locale, checked_page):
       if not self.has_localizable_file(locale, checked_page):
@@ skipping 195 matching lines @@
     return os.path.isfile(self.get_path(filename))
 
   def read_file(self, filename, binary=False):
     encoding = None if binary else "utf-8"
     with codecs.open(self.get_path(filename), "rb", encoding=encoding) as handle:
       return handle.read()
 
   def list_files(self, subdir):
     result = []
     def do_list(dir, relpath):
-      files = os.listdir(dir)
+      try:
+        files = os.listdir(dir)
+      except OSError:
+        return
+
       for filename in files:
         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