Issue #6942 - Add XTM integration in CMS

cms/sources.py

 # This file is part of the Adblock Plus web scripts,

[Tudor Avram, 2018/10/05 16:28:48]

The diffs in this file come from rebasing everything with `origin master`.

 # Copyright (C) 2006-present 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.
@@ skipping 105 matching lines @@
 
     def list_localizable_files(self):
         default_locale = self.read_config().get('general', 'defaultlocale')
         return filter(lambda f: os.path.splitext(f)[1].lower() != '.json',
                       self.list_files('locales/%s' % default_locale))
 
     def has_localizable_file(self, locale, filename):
         return self.has_file(self.localizable_file_filename(locale, filename))
 
     def read_localizable_file(self, locale, filename):
-        return self.read_file(self.localizable_file_filename(locale, filename), binary=True)[0]
+        return self.read_file(self.localizable_file_filename(locale, filename), True)[0]
 
     #
     # Static file helpers
     #
 
     @staticmethod
     def static_filename(filename):
         return 'static/%s' % filename
 
     def list_static(self):
         return self.list_files('static')
 
     def has_static(self, filename):
         return self.has_file(self.static_filename(filename))
 
     def read_static(self, filename):
-        return self.read_file(self.static_filename(filename), binary=True)[0]
+        return self.read_file(self.static_filename(filename), True)[0]
 
     #
     # Locale helpers
     #
 
     def locale_filename(self, locale, page):
         config = self.read_config()
         try:
             page = config.get('locale_overrides', page)
         except ConfigParser.Error:
@@ skipping 227 matching lines @@
     `additional-paths` key that contains the list of additional root folders,
     `MultiSource` will be instantiated and its bases will be the original
     source plus an additional source for each additional root folder.
     `MultiSource` looks up files in its base sources in the order they are
     provided, so the files in the additional folders will only be used if the
     original source doesn't contain that file.
     """
     source = FileSource(path)
 
     config = source.read_config()
-    print(source.read_file('settings.ini')[0])

[Vasily Kuznetsov, 2018/10/05 10:56:26]

Oops.

[Tudor Avram, 2018/10/05 12:34:40]

haha, that was from Thursday night :))

     try:
         ap = config.get('paths', 'additional-paths').strip()
         additional_paths = filter(None, ap.split())
     except (ConfigParser.NoSectionError, ConfigParser.NoOptionError):
         additional_paths = []
 
     if additional_paths:
         additional_sources = [
             create_source(os.path.join(path, p))
             for p in additional_paths
         ]
         source = MultiSource([source] + additional_sources)
 
     if cached:
         for fname in [
+            'list_files',
+            'list_locales',
             'resolve_link',
             'read_config',
             'read_template',
             'read_locale',
+            'read_file',
             'read_include',
             'exec_file',
         ]:
             setattr(source, fname, _memoize(getattr(source, fname)))
 
     return source