From 4cc00a892226d39b2062351a35ead95c18a5ea0b Mon Sep 17 00:00:00 2001 From: Allard Stijnman Date: Fri, 23 Sep 2016 10:49:17 +0200 Subject: [PATCH] New version: 1.2.17 --- README.md | 6 +-- freemail/data/disposable.txt | 2 +- freemail/data/free.txt | 77 +++++++++++++++++++++++++++++++++++- setup.py | 2 +- 4 files changed, 81 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 5826f80..f8c9ea5 100644 --- a/README.md +++ b/README.md @@ -16,9 +16,9 @@ domains directly by opening a pull request. There are three key data files in this project: -- [free.txt](https://github.com/wearespindle/freemail/blob/master/data/free.txt) contains a list of domains that are known to provide free email service -- [disposable.txt](https://github.com/wearespindle/freemail/blob/master/data/disposable.txt) contains a list of domains that are known to provide disposable email service -- [blacklist.txt](https://github.com/wearespindle/freemail/blob/master/data/blacklist.txt) contains a list of domains that this project will refuse to add to either list +- [free.txt](https://github.com/wearespindle/freemail/blob/master/freemail/data/free.txt) contains a list of domains that are known to provide free email service +- [disposable.txt](https://github.com/wearespindle/freemail/blob/master/freemail/data/disposable.txt) contains a list of domains that are known to provide disposable email service +- [blacklist.txt](https://github.com/wearespindle/freemail/blob/master/freemail/data/blacklist.txt) contains a list of domains that this project will refuse to add to either list Domains may only be a member of one list. diff --git a/freemail/data/disposable.txt b/freemail/data/disposable.txt index e84a2c4..d4eea1e 100644 --- a/freemail/data/disposable.txt +++ b/freemail/data/disposable.txt @@ -4,7 +4,6 @@ 0wnd.org 10minutemail.com 20minutemail.com -21cn.com 2prong.com 30minutemail.com 33mail.com @@ -163,6 +162,7 @@ meinspamschutz.de meltmail.com messagebeamer.de mintemail.com +mohmal.com moncourrier.fr.nf monemail.fr.nf monmail.fr.nf diff --git a/freemail/data/free.txt b/freemail/data/free.txt index 2123930..5d5b7cf 100644 --- a/freemail/data/free.txt +++ b/freemail/data/free.txt @@ -22,10 +22,12 @@ 1mum.com 1musicrow.com 1netdrive.com +1nsyncfan.com 1webave.com 1webhighway.com 2-mail.com 212.com +21cn.com 24horas.com 2980.com 2bmail.co.uk @@ -143,6 +145,7 @@ anymoment.com anytimenow.com aol.com apexmail.com +apmail.com apollo.lv aport.ru aport2000.ru @@ -157,6 +160,7 @@ aristotle.org army.net arnet.com.ar artlover.com +artlover.com.au asean-mail.com asheville.com asia-links.com @@ -216,6 +220,7 @@ baseballmail.com basketballmail.com batuta.net bboy.zzn.com +bcvibes.com beeebank.com beenhad.com beep.ru @@ -233,6 +238,7 @@ bettergolf.net bharatmail.com bigassweb.com bigblue.net.au +bigboab.com bigfoot.com bigfoot.de bigger.com @@ -268,6 +274,7 @@ bluemail.dk bluesfan.com blushmail.com boardermail.com +boatracers.com bodhi.lawlita.com bol.com.br bolando.com @@ -298,10 +305,12 @@ bsdmail.com buerotiger.de buffymail.com bullsfan.com +businessman.net busta-rhymes.com buyersusa.com bvimailbox.com byom.de +c2i.net c3.hu c4.com cabacabana.com @@ -322,6 +331,7 @@ careerbuildermail.com carioca.net cartestraina.ro casablancaresort.com +casema.nl cash4u.com cashette.com casino.com @@ -356,6 +366,7 @@ check1check.com cheerful.com chef.net chek.com +chello.nl chemist.com cheyenneweb.com chez.com @@ -390,9 +401,11 @@ city-of-york.net cityofcardiff.net cityoflondon.org claramail.com +classicalfan.com classicmail.co.za clerk.com cliffhanger.com +close2you.net club4x4.net clubalfa.com clubbers.net @@ -444,6 +457,7 @@ cooperation.net cooperationtogo.net copacabana.com cornells.com +corporatedirtbag.com cotas.net counsellor.com cox.com @@ -487,6 +501,7 @@ dailypioneer.com dallasmail.com dangerous-minds.com dawnsonmail.com +dawsonmail.com dbzmail.com deadlymob.org deagot.com @@ -502,6 +517,7 @@ deskpilot.com destin.com detik.com deutschland-net.com +devotedcouples.com dezigner.ru dfwatson.com di-ve.com @@ -552,6 +568,7 @@ dunloprider.com duno.com dutchmail.com dwp.net +dygo.com dyndns.org e-apollo.lv e-mail.dk @@ -573,6 +590,7 @@ ecardmail.com echina.com ecompare.com edmail.com +edtnmail.com educacao.te.pt ehmail.com eintagsmail.de @@ -621,6 +639,7 @@ englandmail.com epage.ru epix.net eposta.hu +eramail.co.za eresmas.com eriga.lv estranet.it @@ -672,6 +691,7 @@ fastkawasaki.com fastmail.ca fastmail.cn fastmail.co.uk +fastmail.com fastmail.com.au fastmail.es fastmail.fm @@ -727,15 +747,18 @@ fmgirl.com fmguy.com fnbmail.co.za fnmail.com +folkfan.com foodmail.com footballmail.com for-president.com +force9.co.uk forpresident.com fortuncity.com fortunecity.com forum.dk foxmail.com fr33mail.info +free-online.net free-org.com free.com.pe free.fr @@ -783,6 +806,7 @@ from-europe.com from-holland.com from-japan.net from-mexico.com +from-outerspace.com from-russia.com fromalabama.com fromalaska.com @@ -791,6 +815,7 @@ fromarkansas.com fromcalifornia.com fromconnecticut.com fromgeorgia.com +fromhawaii.net fromidaho.com fromindiana.com fromiowa.com @@ -803,6 +828,7 @@ frommichigan.com fromminnesota.com frommississippi.com frommissouri.com +fromnebraska.com fromnevada.com fromnewhampshire.com fromnewjersey.com @@ -855,6 +881,7 @@ gci.net geecities.com geek.com geeklife.com +general-hospital.com gentlemansclub.de geocities.com geography.net @@ -882,6 +909,7 @@ go.ro go.ru go2net.com gocollege.com +gocubs.com gofree.co.uk goldmail.ru goldtoolbox.com @@ -893,6 +921,7 @@ goodnewsmail.com goodstick.com googlemail.com goplay.com +gospelfan.com gothere.uk.com gotmail.com gotomy.com @@ -907,6 +936,7 @@ groupmail.com gtmc.net gua.net guessmail.com +guju.net guy.com guy2.com guyanafriends.com @@ -914,6 +944,7 @@ h-mail.us hab-verschlafen.de habmalnefrage.de hackermail.com +hackermail.net hailmail.net hairdresser.net hamptonroads.com @@ -935,6 +966,7 @@ helter-skelter.com herediano.com herono1.com herr-der-mails.de +hetnet.nl hey.to hhdevel.com highquality.com @@ -950,16 +982,19 @@ hockeymail.com hollywoodkids.com home-email.com home.de +home.nl home.ro home.se homemail.com homestead.com +homeworkcentral.com honduras.com hongkong.com hoopsmail.com hot-shot.com hot.ee hotbrev.com +hotfire.net hotletter.com hotmail.ca hotmail.ch @@ -972,6 +1007,7 @@ hotmail.fr hotmail.it hotmail.kg hotmail.kz +hotmail.nl hotmail.ru hotpop3.com hotvoice.com @@ -999,6 +1035,7 @@ icmsconsultants.com icq.com icqmail.com icrazy.com +id-base.com idigjesus.com idirect.com iespana.es @@ -1135,6 +1172,7 @@ kayafmmail.co.za kbjrmail.com kcks.com keg-party.com +keko.com.ar kellychen.com keromail.com keyemail.com @@ -1153,6 +1191,7 @@ kommespaeter.de konx.com korea.com koreamail.com +kpnmail.nl krim.ws krongthip.com krunis.com @@ -1226,6 +1265,7 @@ llangollen.com lobbyist.com localbar.com locos.com +london.com looksmart.co.uk looksmart.com lopezclub.com @@ -2582,6 +2622,7 @@ mailnator.com mailnew.com mailoye.com mailpanda.com +mailpokemon.com mailpost.zzn.com mailpride.com mailpuppy.com @@ -2627,6 +2668,7 @@ medical.net.au medscape.com meetingmall.com megapoint.com +mehrani.com mehtaweb.com meine-dateien.info meine-diashow.de @@ -2679,6 +2721,7 @@ mr-potatohead.com msgbox.com msn.cn msn.com +msn.nl mttestdriver.com munich.com music.com @@ -2748,7 +2791,9 @@ netexpressway.com netgenie.com netian.com netizen.com.ar +netlane.com netmongol.com +netnet.com.sg netnoir.net netpiper.com netralink.com @@ -2825,11 +2870,13 @@ onet.eu onet.pl oninet.pt online.ie +online.nl onlinewiz.com onmilwaukee.com onobox.com op.pl opayq.com +operafan.com operamail.com opoczta.pl optician.com @@ -2875,6 +2922,7 @@ outlook.jp outlook.kr outlook.lv outlook.my +outlook.nl outlook.ph outlook.pt outlook.sa @@ -2927,6 +2975,7 @@ pigpig.net pinoymail.com piracha.net pisem.net +planet.nl planetaccess.com planetarymotion.net planetearthinter.net @@ -2936,6 +2985,7 @@ planetout.com plasa.com playersodds.com playful.com +plus.com plusmail.com.br pmail.net pobox.sk @@ -2943,6 +2993,8 @@ pochta.ru poczta.fm poczta.onet.pl poetic.com +pokemonpost.com +pokepost.com polandmail.com polbox.com politician.com @@ -3004,6 +3056,7 @@ quakemail.com qualityservice.com quantentunnel.de quickhosts.com +quicknet.nl quickwebmail.com quiklinks.com quikmail.com @@ -3097,6 +3150,7 @@ sayhi.net saynotospams.com sbcglobal.net scandalmail.com +scarlet.nl schizo.com schmusemail.de schoolemail.com @@ -3180,6 +3234,7 @@ softhome.net sogou.com sohu.com sol.dk +solcon.nl soldier.hu solution4u.com songwriter.net @@ -3231,6 +3286,7 @@ starmail.org starmedia.com starspath.com start.com.au +stipte.nl stoned.com stones.com storksite.com @@ -3284,6 +3340,7 @@ tbwt.com tds.net teachermail.net teachers.org +teamdiscovery.com teamtulsa.net tech-center.com tech4peace.org @@ -3293,9 +3350,12 @@ technisamail.co.za technologist.com techscout.com techspot.com +tele2.nl telebot.com teleline.es telerymd.com +telfort.nl +telfortglasvezel.nl telinco.net telpage.net telstra.com @@ -3328,6 +3388,7 @@ the-astronaut.com the-beauty.com the-big-apple.com the-boss.com +the-canadian.com the-captain.com the-chinese.com the-country.com @@ -3336,12 +3397,14 @@ the-dutchman.com the-eagles.com the-englishman.com the-fastest.net +the-galaxy.net the-genius.com the-gentleman.com the-german.com the-gremlin.com the-italian.com the-lair.com +the-madman.com the-marine.com the-master.com the-mexican.com @@ -3367,6 +3430,7 @@ themillionare.net theplate.com thepokerface.com thepostmaster.net +theraces.com theracetrack.com therapist.net thestreetfighter.com @@ -3450,6 +3514,8 @@ uol.com.br uol.com.co uol.com.ve uomail.com +upc.nl +upcmail.nl upf.org ureach.com usa.com @@ -3460,6 +3526,7 @@ usma.net usmc.net uswestmail.net uymail.com +uyuyuy.com vahoo.com vampirehunter.com varbizmail.com @@ -3469,6 +3536,7 @@ velocall.com verizon.net verizonmail.com verlass-mich-nicht.de +versatel.nl veryfast.biz veryrealemail.com veryspeedy.net @@ -3493,6 +3561,8 @@ vivavelocity.com vivianhsu.net vnet.citiz.net vnn.vn +vodafone.nl +vodafonethuis.nl volcanomail.com vollbio.de volloeko.de @@ -3525,7 +3595,6 @@ webave.com webcammail.com webcity.ca webdream.com -webinbox.com webindia123.com webmail.co.za webmail.hu @@ -3587,6 +3656,7 @@ writeme.com writemeback.com wrongmail.com wtvhmail.com +wwdg.com www.com www2000.net wx88.net @@ -3596,8 +3666,10 @@ x-networks.net x5g.com xaker.ru xmastime.com +xms.nl xoom.com xpressmail.zzn.com +xs4all.nl xsecurity.org xsmail.com xtra.co.nz @@ -3689,6 +3761,7 @@ yyhmail.com zahadum.com zeepost.nl zhaowei.net +ziggo.nl zionweb.org zip.net zipido.com @@ -3706,4 +3779,6 @@ zuzzurello.com zwallet.com zweb.in zybermail.com +zydecofan.com zzn.com +zzom.co.uk diff --git a/setup.py b/setup.py index 9390e82..3460234 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ setup( # Versions should comply with PEP440. For a discussion on single-sourcing # the version across setup.py and the project code, see # https://packaging.python.org/en/latest/single_source_version.html - version='1.2.16', + version='1.2.17', description='A database of free and disposable email domains', long_description=long_description,