Issue 6754 - Support the "circumvention" type

sitescripts/subscriptions/subscriptionParser.py

 # This file is part of the Adblock Plus web scripts,
 # 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
@@ skipping 182 matching lines @@
             found = False
             for key in group:
                 if self._data[key] != None:
                     found = True
             if not found:
                 str = ', '.join(group)
                 warn('None of the attributes %s present in %s' % (str, path))
 
         if len(self.variants) == 0:
             warn('No list locations given in %s' % path)
-        if self.type not in ('ads', 'anti-adblock', 'other', 'malware', 'social', 'privacy'):
+        if self.type not in ('ads', 'anti-adblock', 'circumvention', 'other', 'malware', 'social', 'privacy'):

[tlucas, 2018/06/20 13:02:37]

Nit: While adding or changing lines, please adhere to PEP-8 (i.e. wrap after 79
characters):

        if self.type not in ('ads', 'anti-adblock', 'circumvention', 'other',
                             'malware', 'social', 'privacy'):

             warn('Unknown type given in %s' % path)
         if self.digest != 'daily' and self.digest != 'weekly':
             warn('Unknown digest frequency given in %s' % path)
         if not self.digestDay[0:3].lower() in weekdays:
             warn('Unknown digest day given in %s' % path)
             self.digestDay = 'wed'
         self.digestDay = weekdays[self.digestDay[0:3].lower()]
         if self.recommendation is not None and self.type == 'ads' and not (self.languages and self.languages.strip()):
             warn('Recommendation without languages in %s' % path)
         if len(self.supplements) == 0:
@@ skipping 51 matching lines @@
 def getFallbackData():
     repo = os.path.abspath(get_config().get('subscriptions', 'repository'))
     redirectdata = subprocess.check_output(['hg', '-R', repo, 'cat', '-r', 'default', os.path.join(repo, 'redirects')])
     gonedata = subprocess.check_output(['hg', '-R', repo, 'cat', '-r', 'default', os.path.join(repo, 'gone')])
     return (redirectdata, gonedata)
 
 
 def _validate_URL(url):
     parse_result = urlparse(url)
     return parse_result.scheme in ('http', 'https') and parse_result.netloc != ''