Merge pull request #39 from moongazer07/master

race neutral names

blacklist.yaml

@@ -2,7 +2,7 @@
 name: BarbBlock
 version: '1.5'
 description: Blocks requests to sites which have used legal threats to remove themselves
-  from other blacklists.
+  from other blocklists.
 last_update: '2019-05-26'
 url_base: https://ssl.bblck.me/blacklists
 page_url: https://ssl.bblck.me/
@@ -572,4 +572,4 @@ blacklist:
   - whiskyqueue.com
   - whisperingcrib.com
   - womanear.com
-  - wryfinger.com
+  - wryfinger.com

extension/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "BarbBlock",
-  "description": "Blocks requests to sites which have used legal threats to remove themselves from other blacklists.",
+  "description": "Blocks requests to sites which have used legal threats to remove themselves from other blocklists.",
   "version": "1.5",
   "icons": {
     "16": "icon/icon16.png",

install.md

@@ -4,8 +4,8 @@ For Chrome and Firefox extensions, see the [main page](https://ssl.bblck.me/).
 
 ## Ublock Origin
 
-[Click this link to subscribe](abp:subscribe?location=https://ssl.bblck.me/blacklists/ublock-origin.txt&title=BarbBlock)
+[Click this link to subscribe](ubo:subscribe?location=https://paulgb.github.io/BarbBlock/blacklists/ublock-origin.txt&title=BarbBlock) 
 
 ## Adblock Plus
 
-[Click this link to subscribe](abp:subscribe?location=https://ssl.bblck.me/blacklists/adblock-plus.txt&title=BarbBlock)
+[Click this link to subscribe](abp:subscribe?location=https://paulgb.github.io/BarbBlock/blacklists/adblock-plus.txt&title=BarbBlock)

src/generate_blocklist.py

@@ -6,13 +6,13 @@ import yaml
 import jinja2
 
 
-def run_template_engine(blacklist_file, template_file, output_file):
+def run_template_engine(blocklist_file, template_file, output_file):
     template_path, template_file = os.path.split(template_file)
 
-    with open(blacklist_file) as bf:
+    with open(blocklist_file) as bf:
         context = yaml.load(bf)
     
-    context['domains'] = [d for blockset in context['blacklist']
+    context['domains'] = [d for blockset in context['blocklist']
                           for d in blockset['domains']]
 
     result = jinja2.Environment(
@@ -25,11 +25,11 @@ def run_template_engine(blacklist_file, template_file, output_file):
 
 def main():
     parser = argparse.ArgumentParser()
-    parser.add_argument('blacklist')
+    parser.add_argument('blocklist')
     parser.add_argument('template')
     parser.add_argument('outfile')
     args = parser.parse_args()
-    run_template_engine(args.blacklist, args.template, args.outfile)
+    run_template_engine(args.blocklist, args.template, args.outfile)
 
 
 if __name__ == '__main__':

templates/adblock-plus.txt.tmpl

@@ -3,7 +3,7 @@
 ! Title: {{ name }}
 ! Last modified: {{ last_update }}
 ! Expires: 1 days
-! Homepage: {{ page_url }}{% for blockset in blacklist %}
+! Homepage: {{ page_url }}{% for blockset in blocklist %}
 ! ============== Site group {{loop.index}} =============={% for issue in blockset.issues %}
 ! GitHub Issue: https://github.com/paulgb/BarbBlock/issues/{{ issue }}{% endfor %}{% if blockset.takedown %}
 ! Takedown URL: {{ blockset.takedown }}{% endif %}{% for domain in blockset.domains %}

templates/hosts-file.txt.tmpl

@@ -3,7 +3,7 @@
 # Last Update: {{ last_update }}
 # Homepage: {{ page_url }}
 # Canonical URL for this file: {{ url_base }}/hosts-file.txt
-{% for blockset in blacklist %}
+{% for blockset in blocklist %}
 # ============== Site group {{loop.index}} =============={% for issue in blockset.issues %}
 # GitHub Issue: https://github.com/paulgb/BarbBlock/issues/{{ issue }}{% endfor %}{% if blockset.takedown %}
 # Takedown URL: {{ blockset.takedown }}{% endif %}

templates/ublock-origin.txt.tmpl

@@ -2,7 +2,7 @@
 ! Homepage: {{ page_url }}
 ! Redirect: {{ url_base }}/ublock-origin.txt
 ! {{ description }}
-{% for blockset in blacklist %}! ============== Site group {{loop.index}} =============={% for issue in blockset.issues %}
+{% for blockset in blocklist %}! ============== Site group {{loop.index}} =============={% for issue in blockset.issues %}
 ! GitHub Issue: https://github.com/paulgb/BarbBlock/issues/{{ issue }}{% endfor %}{% if blockset.takedown %}
 ! Takedown URL: {{ blockset.takedown }}{% endif %}{% for domain in blockset.domains %}
 ||{{ domain }}^{% endfor %}