From 4ddee4199cfff3c28478e81a1649d514622ae02a Mon Sep 17 00:00:00 2001 From: Christian Koepp Date: Fri, 28 Feb 2014 19:39:42 +0100 Subject: [PATCH] phone + fax can contain spaces (even if they shouldn't according to docu) --- pythonwhois/parse.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pythonwhois/parse.py b/pythonwhois/parse.py index 9a0c51f..cd26919 100644 --- a/pythonwhois/parse.py +++ b/pythonwhois/parse.py @@ -492,7 +492,7 @@ def parse_registrants(data): "Technical contact:\n(?: (?P.+)\n)? (?P.+)\n (?P.+)\n (?P.+)\n (?P.+), (?P.+) (?P.+) (?P.+)\n Phone: (?P.*)\n Fax: (?P.*)\n", # Fabulous.com "Admin Contact Information :[ ]*\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n\n", # GAL Communication " Technical contact:\n (?P.+)\n (?P.*)\n (?P.+)\n (?P.+) (?P\S+),[ ]+(?P.+)\n (?P.+)\n (?P.+)\n (?P.*)\n (?P.*)", # .am - "\[Zone-C\]\nType: (?P.+)\nName: (?P.+)\n(Organisation: (?P.+)\n){0,1}Address: (?P.+)\nPostalCode: (?P.+)\nCity: (?P.+)\nCountryCode: (?P[A-Za-z]{2})\nPhone: (?P[0-9\+.]+)\nFax: (?P[0-9\+.]+)\nEmail: (?P.+)\nChanged: (?P.+)", # DeNIC + "\[Zone-C\]\nType: (?P.+)\nName: (?P.+)\n(Organisation: (?P.+)\n){0,1}Address: (?P.+)\nPostalCode: (?P.+)\nCity: (?P.+)\nCountryCode: (?P[A-Za-z]{2})\nPhone: (?P[0-9\s\+.]+)\nFax: (?P[0-9\s\+.]+)\nEmail: (?P.+)\nChanged: (?P.+)", # DeNIC ] admin_contact_regexes = [ @@ -512,7 +512,7 @@ def parse_registrants(data): "Administrative contact:\n(?: (?P.+)\n)? (?P.+)\n (?P.+)\n (?P.+)\n (?P.+), (?P.+) (?P.+) (?P.+)\n Phone: (?P.*)\n Fax: (?P.*)\n", # Fabulous.com "Tech Contact Information :[ ]*\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n\n", # GAL Communication " Administrative contact:\n (?P.+)\n (?P.*)\n (?P.+)\n (?P.+) (?P\S+),[ ]+(?P.+)\n (?P.+)\n (?P.+)\n (?P.*)\n (?P.*)", # .am - "\[Tech-C\]\nType: (?P.+)\nName: (?P.+)\n(Organisation: (?P.+)\n){0,1}Address: (?P.+)\nPostalCode: (?P.+)\nCity: (?P.+)\nCountryCode: (?P[A-Za-z]{2})\nPhone: (?P[0-9\+.]+)\nFax: (?P[0-9\+.]+)\nEmail: (?P.+)\nChanged: (?P.+)", # DeNIC + "\[Tech-C\]\nType: (?P.+)\nName: (?P.+)\n(Organisation: (?P.+)\n){0,1}Address: (?P.+)\nPostalCode: (?P.+)\nCity: (?P.+)\nCountryCode: (?P[A-Za-z]{2})\nPhone: (?P[0-9\s\+.]+)\nFax: (?P[0-9\s\+.]+)\nEmail: (?P.+)\nChanged: (?P.+)", # DeNIC ] billing_contact_regexes = [