diff --git a/README.md b/README.md index 3a3c42a..9ac5143 100644 --- a/README.md +++ b/README.md @@ -76,5 +76,5 @@ class WhoisOrg(WhoisEntry): if text.strip() == 'NOT FOUND': raise WhoisDomainNotFoundError(text) else: - WhoisEntry.__init__(self, domain, text) + WhoisEntry.__init__(self, domain, text, self.regex) ``` diff --git a/test/test_main.py b/test/test_main.py index 97a1595..b0bdf6f 100644 --- a/test/test_main.py +++ b/test/test_main.py @@ -1,6 +1,7 @@ # coding=utf-8 import unittest + from whois import extract_domain diff --git a/test/test_nicclient.py b/test/test_nicclient.py index e08216d..d56593c 100644 --- a/test/test_nicclient.py +++ b/test/test_nicclient.py @@ -1,6 +1,7 @@ # coding=utf-8 import unittest + from whois.whois import NICClient diff --git a/test/test_parser.py b/test/test_parser.py index a58a4a0..16af0a4 100644 --- a/test/test_parser.py +++ b/test/test_parser.py @@ -1,14 +1,17 @@ # -*- coding: utf-8 -*- -import os import datetime import json -from glob import glob +import os import unittest +from glob import glob + +from whois.exceptions import WhoisUnknownDateFormatError from whois.parser import ( + WhoisCa, WhoisEntry, cast_date, - WhoisCa, + datetime_parse, ) @@ -32,6 +35,10 @@ def test_cast_date(self): r = cast_date(d).strftime("%Y-%m-%d") self.assertEqual(r, "2008-04-14") + def test_unknown_date_format(self): + with self.assertRaises(WhoisUnknownDateFormatError): + datetime_parse("UNKNOWN") + def test_com_allsamples(self): """ Iterate over all of the sample/whois/*.com files, read the data, diff --git a/test/test_query.py b/test/test_query.py index acb777e..7b2789d 100644 --- a/test/test_query.py +++ b/test/test_query.py @@ -1,6 +1,7 @@ # coding=utf-8 import unittest + from whois import whois diff --git a/whois/__init__.py b/whois/__init__.py index 21e0990..1e494e2 100644 --- a/whois/__init__.py +++ b/whois/__init__.py @@ -12,7 +12,6 @@ from .parser import WhoisEntry from .whois import NICClient - logger = logging.getLogger(__name__) logger.setLevel(logging.INFO) handler = logging.StreamHandler() diff --git a/whois/parser.py b/whois/parser.py index 168d7a3..b1b87c4 100644 --- a/whois/parser.py +++ b/whois/parser.py @@ -9,8 +9,9 @@ import json import re from datetime import datetime -import dateutil.parser as dp from typing import Any, Callable, Optional, Union + +import dateutil.parser as dp from dateutil.utils import default_tzinfo from .exceptions import WhoisDomainNotFoundError, WhoisUnknownDateFormatError diff --git a/whois/whois.py b/whois/whois.py index 4fdce43..f9718f0 100644 --- a/whois/whois.py +++ b/whois/whois.py @@ -28,8 +28,8 @@ """ import logging -import os import optparse +import os import re import socket import sys