Issue 3168 - Add a script for generating content blocker lists

sitescripts/content_blocker_lists/bin/generate_lists.py

 #!/usr/bin/env python
 # coding: utf-8
 
 # This file is part of Adblock Plus <https://adblockplus.org/>,
 # 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.
 #
@@ skipping 42 matching lines @@
     abp2blocklist_path = config.get("content_blocker_lists",
                                     "abp2blocklist_path")
     process = subprocess.Popen(("node", "abp2blocklist.js"),
                                cwd=abp2blocklist_path, stdin=subprocess.PIPE,
                                stdout=destination_file)
     try:
       for source in sources:
         print >>process.stdin, source
     finally:
       process.stdin.close()
-      if process.wait():

[Felix Dahlke, 2015/11/19 11:15:20]

Do you think this is too obscure?

[Sebastian Noack, 2015/11/19 20:08:34]

This ...

1. Introduces an unnecessary level of indentation.
2. Even worse, will swallow exceptions raised in the try block

So please just call process.wait() here and check for the return code at the
bottom outside the try and with block.

[Felix Dahlke, 2015/11/19 20:48:43]

Done.

-        raise Exception("abp2blocklist returned %s" % process.returncode)
+      process.wait()
+
+  if process.returncode:
+    raise Exception("abp2blocklist returned %s" % process.returncode)
 
 if __name__ == "__main__":
   _update_abp2blocklist()
 
   easylist = _download("easylist_url")
   exceptionrules = _download("exceptionrules_url")
 
   _convert_filter_list([easylist], "easylist_content_blocker_path")
   _convert_filter_list([easylist, exceptionrules],
                        "combined_content_blocker_path")