Merge branch 'remove-buysellads' into master

Fixes #21.

* remove-buysellads:
  Preprocess: fix pylint errors
  Preprocess: remove BuySellAds

Author: PeterFeicht

commands/preprocess.py

@@ -321,14 +321,22 @@ def remove_google_analytics(html):
                 el.getparent().remove(el)
 
 
-# remove Carbon ads
+# remove ads
 def remove_ads(html):
+    # Carbon Ads
     for el in html.xpath('//script[@src]'):
         if 'carbonads.com/carbon.js' in el.get('src'):
             el.getparent().remove(el)
     for el in html.xpath('/html/body/style'):
         if el.text is not None and '#carbonads' in el.text:
             el.getparent().remove(el)
+    # BuySellAds
+    for el in html.xpath('//script[@type]'):
+        if 'buysellads.com' in el.text:
+            el.getparent().remove(el)
+    for el in html.xpath('//div[@id]'):
+        if el.get('id').startswith('bsap_'):
+            el.getparent().remove(el)
 
 
 # remove links to file info pages (e.g. on images)

preprocess.py

@@ -17,11 +17,11 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see http://www.gnu.org/licenses/.
 
-from commands import preprocess
 import argparse
 import concurrent.futures
 import os
 import shutil
+from commands import preprocess
 
 
 def main():

tests/test_preprocess.py

@@ -24,6 +24,7 @@
 import contextlib
 import unittest
 import unittest.mock
+from lxml import etree
 from commands.preprocess import build_rename_map
 from commands.preprocess import convert_loader_name
 from commands.preprocess import has_class
@@ -38,7 +39,6 @@
 from commands.preprocess import transform_ranges_placeholder
 from commands.preprocess import trasform_relative_link
 from commands.preprocess import rename_files
-from lxml import etree
 
 
 class DummyFile(object):

tests/test_preprocess_cssless.py

@@ -17,6 +17,7 @@
 
 import os
 import unittest
+from lxml import etree
 from commands.preprocess_cssless import preprocess_html_merge_cssless
 from commands.preprocess_cssless import silence_cssutils_warnings
 from commands.preprocess_cssless import convert_span_tables_to_tr_td
@@ -26,7 +27,6 @@
 from commands.preprocess_cssless import convert_font_size_property_to_pt
 from commands.preprocess_cssless \
     import convert_table_border_top_to_tr_background
-from lxml import etree
 
 
 class TestPreprocessHtmlMergeCss(unittest.TestCase):