Release 2.4.2

Author: joepie91

.gitignore

@@ -3,3 +3,4 @@ build
 dist
 *.egg-info
 .tox
+.DS_Store

pythonwhois/net.py

@@ -2,7 +2,9 @@
 from codecs import encode, decode
 from . import shared
 
-def get_whois_raw(domain, server="", previous=[], rfc3490=True, never_cut=False, with_server_list=False, server_list=[]):
+def get_whois_raw(domain, server="", previous=None, rfc3490=True, never_cut=False, with_server_list=False, server_list=None):
+	previous = previous or []
+	server_list = server_list or []
 	# Sometimes IANA simply won't give us the right root WHOIS server
 	exceptions = {
 		".ac.uk": "whois.ja.net",
@@ -20,7 +22,6 @@ def get_whois_raw(domain, server="", previous=[], rfc3490=True, never_cut=False,
 
 	if len(previous) == 0 and server == "":
 		# Root query
-		server_list = [] # Otherwise it retains the list on subsequent queries, for some reason.
 		is_exception = False
 		for exception, exc_serv in exceptions.items():
 			if domain.endswith(exception):

pythonwhois/parse.py

@@ -247,6 +247,7 @@ def preprocess_regex(regex):
 	"   Registrant:\n      (?P<organization>.+)\n      (?P<name>.+)  (?P<email>.+)\n      (?P<phone>.*)\n      (?P<fax>.*)\n      (?P<street>.*)\n      (?P<city>.+), (?P<state>[^,\n]*)\n      (?P<country>.+)\n", # .com.tw (Western registrars)
 	"Registrant:\n(?P<organization1>.+)\n(?P<organization2>.+)\n(?P<street1>.+?)(?:,+(?P<street2>.+?)(?:,+(?P<street3>.+?)(?:,+(?P<street4>.+?)(?:,+(?P<street5>.+?)(?:,+(?P<street6>.+?)(?:,+(?P<street7>.+?))?)?)?)?)?)?,(?P<city>.+),(?P<country>.+)\n\n   Contact:\n      (?P<name>.+)   (?P<email>.+)\n      TEL:  (?P<phone>.+?)(?:(?:#|ext.?)(?P<phone_ext>.+))?\n      FAX:  (?P<fax>.+)(?:(?:#|ext.?)(?P<fax_ext>.+))?\n", # .com.tw (TWNIC/SEEDNET, Taiwanese companies only?)
 	"Registrant Contact Information:\n\nCompany English Name \(It should be the same as the registered/corporation name on your Business Register Certificate or relevant documents\):(?P<organization1>.+)\nCompany Chinese name:(?P<organization2>.+)\nAddress: (?P<street>.+)\nCountry: (?P<country>.+)\nEmail: (?P<email>.+)\n", # HKDNR (.hk)
+	"Registrant ID:(?P<handle>.+)\nRegistrant Name:(?P<name>.*)\n(?:Registrant Organization:(?P<organization>.*)\n)?Registrant Street1:(?P<street1>.+?)\n(?:Registrant Street2:(?P<street2>.+?)\n(?:Registrant Street2:(?P<street3>.+?)\n)?)?Registrant City:(?P<city>.+)\nRegistrant State:(?P<state>.*)\nRegistrant Postal Code:(?P<postalcode>.+)\nRegistrant Country:(?P<country>[A-Z]+)\nRegistrant Phone:(?P<phone>.*?)\nRegistrant Fax:(?P<fax>.*)\nRegistrant Email:(?P<email>.+)\n", # Realtime Register
 	"owner:\s+(?P<name>.+)", # .br
 	"person:\s+(?P<name>.+)", # nic.ru (person)
 	"org:\s+(?P<organization>.+)", # nic.ru (organization)
@@ -284,6 +285,7 @@ def preprocess_regex(regex):
 	"Tech Contact: (?P<handle>.+)\n(?P<organization>.+)\n(?P<street1>.+)\n(?P<street2>.+)\n(?:(?P<street3>.+)\n)?(?P<city>.+)\n(?P<postalcode>.+)\n(?P<country>[A-Z]+)\n", # .co.th, format 6
 	"   Technical Contact:\n      (?P<name>.+)  (?P<email>.+)\n      (?P<phone>.*)\n      (?P<fax>.*)\n", # .com.tw (Western registrars)
 	"Technical Contact Information:\n\n(?:Given name: (?P<firstname>.+)\n)?(?:Family name: (?P<lastname>.+)\n)?(?:Company name: (?P<organization>.+)\n)?Address: (?P<street>.+)\nCountry: (?P<country>.+)\nPhone: (?P<phone>.*)\nFax: (?P<fax>.*)\nEmail: (?P<email>.+)\n(?:Account Name: (?P<handle>.+)\n)?", # HKDNR (.hk)
+	"TECH ID:(?P<handle>.+)\nTECH Name:(?P<name>.*)\n(?:TECH Organization:(?P<organization>.*)\n)?TECH Street1:(?P<street1>.+?)\n(?:TECH Street2:(?P<street2>.+?)\n(?:TECH Street2:(?P<street3>.+?)\n)?)?TECH City:(?P<city>.+)\nTECH State:(?P<state>.*)\nTECH Postal Code:(?P<postalcode>.+)\nTECH Country:(?P<country>[A-Z]+)\nTECH Phone:(?P<phone>.*?)\nTECH Fax:(?P<fax>.*)\nTECH Email:(?P<email>.+)\n", # Realtime Register
 ]
 
 admin_contact_regexes = [
@@ -309,6 +311,7 @@ def preprocess_regex(regex):
 			"\[Tech-C\]\nType: (?P<type>.+)\nName: (?P<name>.+)\n(Organisation: (?P<organization>.+)\n){0,1}(Address: (?P<street1>.+)\n){1}(Address: (?P<street2>.+)\n){0,1}(Address: (?P<street3>.+)\n){0,1}(Address: (?P<street4>.+)\n){0,1}PostalCode: (?P<postalcode>.+)\nCity: (?P<city>.+)\nCountryCode: (?P<country>[A-Za-z]{2})\nPhone: (?P<phone>.+)\nFax: (?P<fax>.+)\nEmail: (?P<email>.+)\n(Remarks: (?P<remark>.+)\n){0,1}Changed: (?P<changed>.+)", # DeNIC
 	"   Administrative Contact:\n      (?P<name>.+)  (?P<email>.+)\n      (?P<phone>.*)\n      (?P<fax>.*)\n", # .com.tw (Western registrars)
 	"Administrative Contact Information:\n\n(?:Given name: (?P<firstname>.+)\n)?(?:Family name: (?P<lastname>.+)\n)?(?:Company name: (?P<organization>.+)\n)?Address: (?P<street>.+)\nCountry: (?P<country>.+)\nPhone: (?P<phone>.*)\nFax: (?P<fax>.*)\nEmail: (?P<email>.+)\n(?:Account Name: (?P<handle>.+)\n)?", # HKDNR (.hk)
+	"ADMIN ID:(?P<handle>.+)\nADMIN Name:(?P<name>.*)\n(?:ADMIN Organization:(?P<organization>.*)\n)?ADMIN Street1:(?P<street1>.+?)\n(?:ADMIN Street2:(?P<street2>.+?)\n(?:ADMIN Street2:(?P<street3>.+?)\n)?)?ADMIN City:(?P<city>.+)\nADMIN State:(?P<state>.*)\nADMIN Postal Code:(?P<postalcode>.+)\nADMIN Country:(?P<country>[A-Z]+)\nADMIN Phone:(?P<phone>.*?)\nADMIN Fax:(?P<fax>.*)\nADMIN Email:(?P<email>.+)\n", # Realtime Register
 ]
 
 billing_contact_regexes = [
@@ -325,6 +328,7 @@ def preprocess_regex(regex):
 	"Billing contact:\n(?:  (?P<organization>.+)\n)?  (?P<name>.+)\n  (?P<email>.+)\n  (?P<street>.+)\n  (?P<city>.+), (?P<state>.+) (?P<postalcode>.+) (?P<country>.+)\n  Phone: (?P<phone>.*)\n  Fax: (?P<fax>.*)\n", # Fabulous.com
 	"Billing Contact Information :[ ]*\n[ ]+(?P<firstname>.*)\n[ ]+(?P<lastname>.*)\n[ ]+(?P<organization>.*)\n[ ]+(?P<email>.*)\n[ ]+(?P<street>.*)\n[ ]+(?P<city>.*)\n[ ]+(?P<postalcode>.*)\n[ ]+(?P<phone>.*)\n[ ]+(?P<fax>.*)\n\n", # GAL Communication
 	"Billing Contact:\n   Name:           (?P<name>.+)\n   City:           (?P<city>.+)\n   State:          (?P<state>.+)\n   Country:        (?P<country>.+)\n", # Akky (.com.mx)
+	"BILLING ID:(?P<handle>.+)\nBILLING Name:(?P<name>.*)\n(?:BILLING Organization:(?P<organization>.*)\n)?BILLING Street1:(?P<street1>.+?)\n(?:BILLING Street2:(?P<street2>.+?)\n(?:BILLING Street2:(?P<street3>.+?)\n)?)?BILLING City:(?P<city>.+)\nBILLING State:(?P<state>.*)\nBILLING Postal Code:(?P<postalcode>.+)\nBILLING Country:(?P<country>[A-Z]+)\nBILLING Phone:(?P<phone>.*?)\nBILLING Fax:(?P<fax>.*)\nBILLING Email:(?P<email>.+)\n", # Realtime Register
 ]
 
 # Some registries use NIC handle references instead of directly listing contacts...
@@ -426,7 +430,8 @@ def is_string(data):
 		return isinstance(data, str)
 
 
-def parse_raw_whois(raw_data, normalized=[], never_query_handles=True, handle_server=""):
+def parse_raw_whois(raw_data, normalized=None, never_query_handles=True, handle_server=""):
+	normalized = normalized or []
 	data = {}
 
 	raw_data = [segment.replace("\r", "") for segment in raw_data] # Carriage returns are the devil
@@ -995,4 +1000,4 @@ def parse_nic_contact(data):
 			for match in matches:
 				handle_contacts.append(match.groupdict())
 
-	return handle_contacts
+	return handle_contacts

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup
 
 setup(name='pythonwhois',
-      version='2.4.1',
+      version='2.4.2',
       description='Module for retrieving and parsing the WHOIS data for a domain. Supports most domains. No dependencies.',
       author='Sven Slootweg',
       author_email='[email protected]',

test/data/0007games.com

@@ -0,0 +1,66 @@
+Domain Name:0007games.com
+Name Server:ns159.mihanwebhost.com
+Name Server:ns160.mihanwebhost.com
+Created On:2013-10-14 08:59:57.0
+Last Updated On:2013-11-13 02:09:37.0
+Expiration Date:2014-10-14 08:59:57.0
+Sponsoring Registrar:REALTIME REGISTER B.V.
+Reseller:Hostcontrol
+Status:CLIENT_TRANSFER_PROHIBITED
+Status:OK
+Registrant ID:RC_30314652
+Registrant Name:yashar ayubi
+Registrant Organization:N/A
+Registrant Street1:karaj
+Registrant City:karaj
+Registrant State:alborz
+Registrant Postal Code:1234
+Registrant Country:IR
+Registrant Phone:+98.09128601236
+Registrant Fax:
+Registrant Email:[email protected]
+TECH ID:RC_30314652
+TECH Name:yashar ayubi
+TECH Organization:N/A
+TECH Street1:karaj
+TECH City:karaj
+TECH State:alborz
+TECH Postal Code:1234
+TECH Country:IR
+TECH Phone:+98.09128601236
+TECH Fax:
+TECH Email:[email protected]
+ADMIN ID:RC_30314652
+ADMIN Name:yashar ayubi
+ADMIN Organization:N/A
+ADMIN Street1:karaj
+ADMIN City:karaj
+ADMIN State:alborz
+ADMIN Postal Code:1234
+ADMIN Country:IR
+ADMIN Phone:+98.09128601236
+ADMIN Fax:
+ADMIN Email:[email protected]
+BILLING ID:RC_30314652
+BILLING Name:yashar ayubi
+BILLING Organization:N/A
+BILLING Street1:karaj
+BILLING City:karaj
+BILLING State:alborz
+BILLING Postal Code:1234
+BILLING Country:IR
+BILLING Phone:+98.09128601236
+BILLING Fax:
+BILLING Email:[email protected]
+
+--
+   Domain Name: 0007GAMES.COM
+   Registrar: REALTIME REGISTER BV
+   Whois Server: whois.yoursrs.com
+   Referral URL: http://www.realtimeregister.com
+   Name Server: NS159.MIHANWEBHOST.COM
+   Name Server: NS160.MIHANWEBHOST.COM
+   Status: clientTransferProhibited
+   Updated Date: 12-nov-2013
+   Creation Date: 14-oct-2013
+   Expiration Date: 14-oct-2014

test/data/0031fashion.com

@@ -0,0 +1,67 @@
+Domain Name:0031fashion.com
+Name Server:ns3.firstfind.nl
+Name Server:ns4.firstfind.nl
+Name Server:ns5.firstfind.net
+Created On:2013-03-25 11:48:37.0
+Last Updated On:2014-03-27 00:00:25.0
+Expiration Date:2015-03-25 10:48:37.0
+Sponsoring Registrar:REALTIME REGISTER B.V.
+Reseller:Your Hosting B.V.
+Status:OK
+Registrant ID:ULYdHkU6vYELLiJqKUmu
+Registrant Name:A. Blom
+Registrant Organization:Hotshopper
+Registrant Street1:Blankenheymstraat 13
+Registrant City:NUMANSDORP
+Registrant State:
+Registrant Postal Code:3281 SB
+Registrant Country:NL
+Registrant Phone:+31.648265085
+Registrant Fax:
+Registrant Email:[email protected]
+BILLING ID:[email protected]
+BILLING Name:Valentijn Borstlap
+BILLING Organization:YourHosting BV
+BILLING Street1:Schrevenweg 5
+BILLING City:Zwolle
+BILLING State:Overijssel
+BILLING Postal Code:8024 HB
+BILLING Country:NL
+BILLING Phone:+31.384530752
+BILLING Fax:+31.384524734
+BILLING Email:[email protected]
+TECH ID:[email protected]
+TECH Name:Valentijn Borstlap
+TECH Organization:YourHosting BV
+TECH Street1:Schrevenweg 5
+TECH City:Zwolle
+TECH State:Overijssel
+TECH Postal Code:8024 HB
+TECH Country:NL
+TECH Phone:+31.384530752
+TECH Fax:+31.384524734
+TECH Email:[email protected]
+ADMIN ID:[email protected]
+ADMIN Name:Valentijn Borstlap
+ADMIN Organization:YourHosting BV
+ADMIN Street1:Schrevenweg 5
+ADMIN City:Zwolle
+ADMIN State:Overijssel
+ADMIN Postal Code:8024 HB
+ADMIN Country:NL
+ADMIN Phone:+31.384530752
+ADMIN Fax:+31.384524734
+ADMIN Email:[email protected]
+
+--
+   Domain Name: 0031FASHION.COM
+   Registrar: REALTIME REGISTER BV
+   Whois Server: whois.yoursrs.com
+   Referral URL: http://www.realtimeregister.com
+   Name Server: NS3.FIRSTFIND.NL
+   Name Server: NS4.FIRSTFIND.NL
+   Name Server: NS5.FIRSTFIND.NET
+   Status: ok
+   Updated Date: 26-mar-2014
+   Creation Date: 25-mar-2013
+   Expiration Date: 25-mar-2015

test/data/arkeysolutions.com

@@ -0,0 +1,67 @@
+Domain Name:arkeysolutions.com
+Name Server:ns.axfone.sk
+Name Server:ns.axfone.eu
+Name Server:ns.axfone.cz
+Created On:2013-01-21 16:11:03.0
+Last Updated On:2014-04-09 14:53:04.0
+Expiration Date:2015-01-21 16:11:03.0
+Sponsoring Registrar:REALTIME REGISTER B.V.
+Reseller:Axfone s.r.o.
+Status:OK
+Registrant ID:AXC432303721
+Registrant Name:Róbert Kriško
+Registrant Organization:Arkey, s.r.o.
+Registrant Street1:Tr. SNP 74
+Registrant City:Košice
+Registrant State:
+Registrant Postal Code:04011
+Registrant Country:SK
+Registrant Phone:+421.902110378
+Registrant Fax:
+Registrant Email:[email protected]
+ADMIN ID:REG_AXFONE
+ADMIN Name:Jakub Vlach
+ADMIN Organization:Axfone s.r.o.
+ADMIN Street1:Pripotocni 1519/10c
+ADMIN City:Praha 10
+ADMIN State:Praha
+ADMIN Postal Code:10100
+ADMIN Country:CZ
+ADMIN Phone:+420.277277272
+ADMIN Fax:+420.241410071
+ADMIN Email:[email protected]
+TECH ID:REG_AXFONE
+TECH Name:Jakub Vlach
+TECH Organization:Axfone s.r.o.
+TECH Street1:Pripotocni 1519/10c
+TECH City:Praha 10
+TECH State:Praha
+TECH Postal Code:10100
+TECH Country:CZ
+TECH Phone:+420.277277272
+TECH Fax:+420.241410071
+TECH Email:[email protected]
+BILLING ID:REG_AXFONE
+BILLING Name:Jakub Vlach
+BILLING Organization:Axfone s.r.o.
+BILLING Street1:Pripotocni 1519/10c
+BILLING City:Praha 10
+BILLING State:Praha
+BILLING Postal Code:10100
+BILLING Country:CZ
+BILLING Phone:+420.277277272
+BILLING Fax:+420.241410071
+BILLING Email:[email protected]
+
+--
+   Domain Name: ARKEYSOLUTIONS.COM
+   Registrar: REALTIME REGISTER BV
+   Whois Server: whois.yoursrs.com
+   Referral URL: http://www.realtimeregister.com
+   Name Server: NS.AXFONE.CZ
+   Name Server: NS.AXFONE.EU
+   Name Server: NS.AXFONE.SK
+   Status: ok
+   Updated Date: 09-apr-2014
+   Creation Date: 21-jan-2013
+   Expiration Date: 21-jan-2015

test/data/simpardaz.com

@@ -0,0 +1,66 @@
+Domain Name:simpardaz.com
+Name Server:ns1.winent.aryanic.org
+Name Server:ns2.winent.aryanic.org
+Created On:2013-04-30 10:44:30.0
+Last Updated On:2014-06-14 10:44:30.0
+Expiration Date:2015-04-30 10:44:30.0
+Sponsoring Registrar:REALTIME REGISTER B.V.
+Reseller:Hostcontrol
+Status:CLIENT_TRANSFER_PROHIBITED
+Status:OK
+Registrant ID:RC_27661353
+Registrant Name:ahmad lotfi
+Registrant Organization:ahmad lotfi
+Registrant Street1:No. 238
+Registrant City:Tehran
+Registrant State:Tehran
+Registrant Postal Code:98970
+Registrant Country:IN
+Registrant Phone:+98.2166424812
+Registrant Fax:
+Registrant Email:[email protected]
+BILLING ID:RC_27661353
+BILLING Name:ahmad lotfi
+BILLING Organization:ahmad lotfi
+BILLING Street1:No. 238
+BILLING City:Tehran
+BILLING State:Tehran
+BILLING Postal Code:98970
+BILLING Country:IN
+BILLING Phone:+98.2166424812
+BILLING Fax:
+BILLING Email:[email protected]
+TECH ID:RC_27661353
+TECH Name:ahmad lotfi
+TECH Organization:ahmad lotfi
+TECH Street1:No. 238
+TECH City:Tehran
+TECH State:Tehran
+TECH Postal Code:98970
+TECH Country:IN
+TECH Phone:+98.2166424812
+TECH Fax:
+TECH Email:[email protected]
+ADMIN ID:RC_27661353
+ADMIN Name:ahmad lotfi
+ADMIN Organization:ahmad lotfi
+ADMIN Street1:No. 238
+ADMIN City:Tehran
+ADMIN State:Tehran
+ADMIN Postal Code:98970
+ADMIN Country:IN
+ADMIN Phone:+98.2166424812
+ADMIN Fax:
+ADMIN Email:[email protected]
+
+--
+   Domain Name: SIMPARDAZ.COM
+   Registrar: REALTIME REGISTER BV
+   Whois Server: whois.yoursrs.com
+   Referral URL: http://www.realtimeregister.com
+   Name Server: NS1.WINENT.ARYANIC.ORG
+   Name Server: NS2.WINENT.ARYANIC.ORG
+   Status: clientTransferProhibited
+   Updated Date: 06-may-2014
+   Creation Date: 30-apr-2013
+   Expiration Date: 30-apr-2015