Issue 3084 - [cms] Show full tracebacks for exceptions passing template code

cms/sources.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2015 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,
@@ skipping 50 matching lines @@
 
     path = "/%s/%s" % (locale, page)
     return locale, urlparse.urlunparse(parsed[0:2] + (path,) + parsed[3:])
 
   def read_config(self):
     configdata = self.read_file("settings.ini")[0]
     config = ConfigParser.SafeConfigParser()
     config.readfp(StringIO(configdata))
     return config
 
+  def exec_file(self, filename):
+    source, filename = self.read_file(filename)
+    code = compile(source, filename, "exec")
+    namespace = {}
+    exec code in namespace
+    return namespace
+
   #
   # Page helpers
   #
 
   @staticmethod
   def page_filename(page, format):
     return "pages/%s.%s" % (page, format)
 
   def list_pages(self):
     for filename in self.list_files("pages"):
@@ skipping 141 matching lines @@
     try:
       self._archive.getinfo("./%s" % filename)
     except KeyError:
       return False
     return True
 
   def read_file(self, filename, binary=False):
     data = self._archive.read("./%s" % filename)
     if not binary:
       data = data.decode("utf-8")
-    return (data, None)

[Wladimir Palant, 2015/09/16 17:35:53]

How about returning "%s!%s" % (self._name, filename) instead of None? This will
give *some* context in production instead of none whatsoever.

[Sebastian Noack, 2015/09/16 19:04:04]

Not sure if I like the notation with the exclamation mark, but I don't have a
better idea. Done.

[Wladimir Palant, 2015/09/16 21:08:59]

For reference, this notation is inspired by the JAR protocol
(http://docs.oracle.com/cd/E19253-01/819-0913/author/jar.html#jarprotocol).

-
-  def exec_file(self, filename):
-    code = self.read_file(filename)[0]
-    namespace = {}
-    exec code in namespace
-    return namespace

[Wladimir Palant, 2015/09/16 17:35:53]

I looked into this and this change appears to be unnecessary - a simple tweak to
the existing import_symbol method should do:

  source, filename = self.read_file(filename)
  code = compile(source, filename, "exec")
  namespace = {}
  exec code in namespace

[Sebastian Noack, 2015/09/16 19:04:04]

Nice catch. Done.

+    return (data, "%s!%s" % (self._name, filename))
 
   def list_files(self, subdir):
     prefix = "./%s/" % subdir
     for filename in self._archive.namelist():
       if filename.startswith(prefix):
         yield filename[len(prefix):]
 
   if os.name == "posix":
     def get_cache_dir(self):
       return "/var/cache/" + self._name
@@ skipping 20 matching lines @@
   def read_file(self, filename, binary=False):
     path = self.get_path(filename)
 
     if binary:
       file = open(path, "rb")
     else:
       file = io.open(path, "r", encoding="utf-8")
 
     with file:
       return (file.read(), path)
-
-  def exec_file(self, filename):
-    namespace = {}
-    execfile(self.get_path(filename), namespace)
-    return namespace
 
   def list_files(self, subdir):
     result = []
     def do_list(dir, relpath):
       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
 
   def get_cache_dir(self):
     return os.path.join(self._dir, "cache")