From: xXKingRalphXx Date: Sun, 20 Mar 2016 02:17:36 +0000 (-0400) Subject: Shortened python version check in updateHostsFile.py X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=86df89d33ea88885d478f2ee4a1cca6c18461d56;p=stevenblack-hosts.git Shortened python version check in updateHostsFile.py --- diff --git a/data/malwaredomainlist.com/hosts b/data/malwaredomainlist.com/hosts index c262c6e0b..a07bc9133 100644 --- a/data/malwaredomainlist.com/hosts +++ b/data/malwaredomainlist.com/hosts @@ -1,6 +1,6 @@ # MalwareDomainList.com Hosts List # # http://www.malwaredomainlist.com/hostslist/hosts.txt # -# Last updated: Wed, 16 Mar 16 20:11:03 +0000 # +# Last updated: Fri, 18 Mar 16 18:16:30 +0000 # 127.0.0.1 localhost @@ -156,6 +156,7 @@ 127.0.0.1 b-traffickimb.tf 127.0.0.1 b.nevadaprivateoffice.com 127.0.0.1 babos.scrapping.cc +127.0.0.1 backup.terra5llc.com 127.0.0.1 bank.scarf-it-up.com 127.0.0.1 bargainracks.co.uk 127.0.0.1 baskadesign.com @@ -596,6 +597,7 @@ 127.0.0.1 mango.spiritualcounselingtoday.co 127.0.0.1 manoske.com 127.0.0.1 marchen-toy.co.jp +127.0.0.1 marialorena.com.br 127.0.0.1 markbruinink.nl 127.0.0.1 marketing-material.ieiworld.com 127.0.0.1 marx-brothers.mhwang.com @@ -639,6 +641,7 @@ 127.0.0.1 myuniques.ru 127.0.0.1 myvksaver.ru 127.0.0.1 n-nrafficimj.tf +127.0.0.1 naairah.com 127.0.0.1 nadegda-95.ru 127.0.0.1 nailbytes1.com 127.0.0.1 namso.butlerelectricsupply.com @@ -1569,6 +1572,7 @@ 127.0.0.1 zjjlf.croukwexdbyerr.net 127.0.0.1 zkic.com 127.0.0.1 zous.szm.sk +127.0.0.1 zt.tim-taxi.com 127.0.0.1 zu-yuan.com 127.0.0.1 zwierzu.zxy.me 127.0.0.1 zyrdu.cruisingsmallship.com diff --git a/data/someonewhocares.org/hosts b/data/someonewhocares.org/hosts index 88b49cffe..81de1640d 100644 --- a/data/someonewhocares.org/hosts +++ b/data/someonewhocares.org/hosts @@ -8,7 +8,7 @@ # Please forward any additions, corrections or comments by email to # hosts@someonewhocares.org -# Last updated: Mon, 14 Mar 2016 at 07:34:45 GMT +# Last updated: Sat, 19 Mar 2016 at 15:32:54 GMT # Use this file to prevent your computer from connecting to selected # internet hosts. This is an easy and effective way to protect you from @@ -3356,6 +3356,7 @@ 0.0.0.0 7bpeople.com 0.0.0.0 7bpeople.data.7bpeople.com 0.0.0.0 7cnbcnews.com +0.0.0.0 829331534d183e7d1f6a-8d91cc88b27b979d0ea53a10ce8855ec.r96.cf5.rackcdn.com 0.0.0.0 85103.hittail.com 0.0.0.0 8574dnj3yzjace8c8io6zr9u3n.hop.clickbank.net 0.0.0.0 86file.megajoy.com @@ -7087,6 +7088,7 @@ 0.0.0.0 ikcode.baidu.com 0.0.0.0 i.laih.com 0.0.0.0 ilinks.industrybrains.com +0.0.0.0 ilovemobi.com 0.0.0.0 imads.integral-marketing.com 0.0.0.0 im.adtech.de 0.0.0.0 image2.pubmatic.com @@ -8159,6 +8161,7 @@ 0.0.0.0 prpops.com 0.0.0.0 pr.ydp.yahoo.com 0.0.0.0 pstatic.datafastguru.info +0.0.0.0 pt21na.com 0.0.0.0 ptrads.mp3.com 0.0.0.0 ptreklam.com 0.0.0.0 ptreklam.com.tr @@ -9787,6 +9790,7 @@ 0.0.0.0 www.iicdn.com 0.0.0.0 www.ijacko.net 0.0.0.0 www.ilovecheating.com +0.0.0.0 www.ilovemobi.com 0.0.0.0 www.impressionaffiliate.com 0.0.0.0 www.impressionaffiliate.mobi 0.0.0.0 www.impressionlead.com @@ -9959,6 +9963,7 @@ 0.0.0.0 www.postmasterbannernet.com 0.0.0.0 www.postmasterdirect.com 0.0.0.0 www.postnewsads.com +0.0.0.0 www.predictivadnetwork.com 0.0.0.0 www.premiumholidayoffers.com 0.0.0.0 www.premiumproductsonline.com 0.0.0.0 www.premium-reward-club.com @@ -12331,15 +12336,6 @@ # # Windows 10 reporting domains. -0.0.0.0 a-0001.a-msedge.net -0.0.0.0 a-0002.a-msedge.net -0.0.0.0 a-0003.a-msedge.net -0.0.0.0 a-0004.a-msedge.net -0.0.0.0 a-0005.a-msedge.net -0.0.0.0 a-0006.a-msedge.net -0.0.0.0 a-0007.a-msedge.net -0.0.0.0 a-0008.a-msedge.net -0.0.0.0 a-0009.a-msedge.net 0.0.0.0 a.ads2.msads.net 0.0.0.0 a.ads2.msn.com 0.0.0.0 adnexus.net diff --git a/data/yoyo.org/hosts b/data/yoyo.org/hosts index 3877e785f..c3e26fad4 100644 --- a/data/yoyo.org/hosts +++ b/data/yoyo.org/hosts @@ -48,6 +48,7 @@ 0.0.0.0 a.ucoz.ru 0.0.0.0 a.xanga.com 0.0.0.0 a32.g.a.yimg.com +0.0.0.0 aaddzz.com 0.0.0.0 abacho.net 0.0.0.0 abc-ads.com 0.0.0.0 absoluteclickscom.com @@ -514,7 +515,6 @@ 0.0.0.0 ads.jubii.dk 0.0.0.0 ads.justhungry.com 0.0.0.0 ads.kaktuz.net -0.0.0.0 ads.kelbymediagroup.com 0.0.0.0 ads.kinobox.cz 0.0.0.0 ads.kinxxx.com 0.0.0.0 ads.kompass.com @@ -535,7 +535,6 @@ 0.0.0.0 ads.moceanads.com 0.0.0.0 ads.motor-forum.nl 0.0.0.0 ads.motormedia.nl -0.0.0.0 ads.movieflix.com 0.0.0.0 ads.msn.com 0.0.0.0 ads.multimania.lycos.fr 0.0.0.0 ads.nationalgeographic.com @@ -895,6 +894,7 @@ 0.0.0.0 adzerk.s3.amazonaws.com 0.0.0.0 adzones.com 0.0.0.0 af-ad.co.uk +0.0.0.0 afbtracking09.com 0.0.0.0 affbuzzads.com 0.0.0.0 affili.net 0.0.0.0 affiliate.1800flowers.com @@ -1441,7 +1441,6 @@ 0.0.0.0 forex-affiliate.net 0.0.0.0 fpctraffic.com 0.0.0.0 fpctraffic2.com -0.0.0.0 fragmentserv.iac-online.de 0.0.0.0 free-banners.com 0.0.0.0 freebanner.com 0.0.0.0 freelogs.com @@ -1553,6 +1552,7 @@ 0.0.0.0 idot.cz 0.0.0.0 idregie.com 0.0.0.0 idtargeting.com +0.0.0.0 ientrymail.com 0.0.0.0 iesnare.com 0.0.0.0 ifa.tube8live.com 0.0.0.0 ilbanner.com diff --git a/readme.md b/readme.md index ad6bd70fc..c114c3d96 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,4 @@ -#Unified hosts file +#Unified hosts file with porn extensions This repository consolidates several reputable `hosts` files, and merges them into a single unified hosts file with duplicates removed. @@ -7,7 +7,7 @@ Several variants are available. See the table below: **Expectation**: These unified hosts file should serve all devices, regardless of OS. -* Last updated: **March 17 2016**. +* Last updated: **March 20 2016**. ### Hosts file variants diff --git a/updateHostsFile.py b/updateHostsFile.py index dda1b51d0..998d9fb5c 100644 --- a/updateHostsFile.py +++ b/updateHostsFile.py @@ -49,10 +49,7 @@ def getFileByUrl(url): # In Python 3 "print" is a function, braces are added everywhere # Detecting Python 3 for version-dependent implementations -Python3 = False -cur_version = sys.version_info -if cur_version >= (3, 0): - Python3 = True +Python3 = sys.version_info >= (3,0) # This function works in both Python 2 and Python 3 def myInput(msg = ""):