diff --git a/pythonwhois/parse.py b/pythonwhois/parse.py index 66217d6..c492a62 100644 --- a/pythonwhois/parse.py +++ b/pythonwhois/parse.py @@ -105,6 +105,7 @@ def precompile_regexes(source, flags=0): 'expiration_date:\s*(?P.+)', 'expire-date:\s*(?P.+)', 'renewal:\s*(?P.+)', + 'validity:\s*(?P.+)', 'expire:\s*(?P.+)'], 'updated_date': ['\[Last Updated\]\s*(?P.+)', 'Record modified on[.]*: (?P.+) [a-zA-Z]+', @@ -202,7 +203,7 @@ def precompile_regexes(source, flags=0): def preprocess_regex(regex): # Fix for #2; prevents a ridiculous amount of varying size permutations. - regex = re.sub(r"\\s\*\(\?P<([^>]+)>\.\+\)", r"\s*(?P<\1>\S.*)", regex) + regex = re.sub(r"\\s\*\(\?P<([^>]+)>\.\+\)", r"\\s*(?P<\1>\\S.*)", regex) # Experimental fix for #18; removes unnecessary variable-size whitespace # matching, since we're stripping results anyway. regex = re.sub(r"\[ \]\*\(\?P<([^>]+)>\.\*\)", r"(?P<\1>.*)", regex)