version 2.20260522.1

Author: mboot-github

README.md

@@ -3,20 +3,22 @@
 - A Python package for retrieving WHOIS information of DOMAIN'S ONLY.
 - Python >=3.10
 - requirements:
-    - whodap>=0.1.16 [![Spectra Assure Community Badge](https://secure.software/pypi/badge/whodap)](https://secure.software/pypi/packages/whodap)
-    - tld>=0.13.2 [![Spectra Assure Community Badge](https://secure.software/pypi/badge/tld)](https://secure.software/pypi/packages/tld/0.13.2/tld-0.13.2-py2.py3-none-any.whl)
-    - redis (optional) [![Spectra Assure Community Badge](https://secure.software/pypi/badge/redis)](https://secure.software/pypi/packages/redis)
-
+    - whodap>=0.1.16 [![Spectra Assure Community Badge](https://secure.software/pypi/badge/whodap)](https://secure.software/pypi/packages/whodap).
+    - tld>=0.13.2 [![Spectra Assure Community Badge](https://secure.software/pypi/badge/tld)](https://secure.software/pypi/packages/tld/0.13.2/tld-0.13.2-py2.py3-none-any.whl).
+    - redis (optional) [![Spectra Assure Community Badge](https://secure.software/pypi/badge/redis)](https://secure.software/pypi/packages/redis).
 - v1 uses only whois and has been be moved to maintenance only
-- v2 will use whodap to first retrieve info with rdap and if no data is available try the classic whois approach
-
+- v2 will use whodap to first retrieve info with rdap, if no data is available try the classic whois approach.
   * This package will not support querying ip CIDR ranges or AS information.
   * This was a copy of the original DanyCork 'whois'.
       * Significantly refactored in 2023 (v1).
       * RDAP adding in 2026 (v2).
       * The v1 output is still compatible with DanyCork 'whois'.
       * the v2 will move away from strict compatibility.
 
+Notes:
+
+ - Rdap servers only know about the real IANA domain, the concept of first level domains is not supported when using rdap requests.
+
 ---
 
 ## Notes
@@ -42,7 +44,7 @@ you should be aware that each query will increase its memory use.
 
 Versions `1.x.x` will keep the output compatible with Danny Cork.
 
-Versions `2.x.x` will add a dependency on whodap and use rdab based whois data before consulting historical whois.
+Versions `2.x.x` will add a dependency on whodap and use rdap based whois data before consulting historical whois.
 
 ### Releases
 
@@ -100,3 +102,5 @@ and `make suggest`.
 - switch to minimal version 3.10
 - update gitgub-action lint (mypy) to use `setup-python@v6` and `checkout@v6`
 - start working on v2 with rdap first
+
+## 2.20260522.1

bin/build.sh

@@ -7,6 +7,7 @@ VERSION_FILE="work/version"
 setupVersionNumberToday()
 {
     VERSION="1" # we start with version 1, only breaking changes will increment the first digit
+    VERSION="2" # we start with version 1, only breaking changes will increment the first digit
 
     # while preparing the test.pypi we increment the day sequence if needed,
     # only a last version actually later will get published to the actual pypi (non test)

whoisdomain/version.py

@@ -1,3 +1,2 @@
-"""Make the version available for dynamic versioning."""
-
-VERSION = "1.20260326.1"
+'''This module only makes the version available for dynamic versioning'''
+VERSION = '2.20260522.1'

whoisdomain/whois_rdap.py

@@ -1,9 +1,11 @@
 import logging
 from typing import Any
 
-import tld
+# import tld
 import whodap
 
+# as rdap has no concept of second level domains we will drop the import tld
+# and just take the last item of the domain: domain.split('.')[-1]
 from .data_response import DataResponse
 
 logger = logging.getLogger(__name__)
@@ -15,7 +17,8 @@ def __init__(self) -> None:
 
     @classmethod
     def fld(cls, domain: str) -> str | None:
-        return tld.get_fld(domain, fix_protocol=True, fail_silently=True)
+        return str(domain).split(".")[-1]
+        # return tld.get_fld(domain, fix_protocol=True, fail_silently=True)
 
     def do_one_domain(self, domain: str) -> DataResponse:
         try:

work/version

@@ -1 +1 @@
-1.20260326.1
+2.20260522.1