Merge pull request #28 from miaowware/valid-calls

all sources: ensure valid callsigns are ASCII, allow /s

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Issue where trustee or image from QRZ could be empty (#22).
 - Improve handling of malformed dates in received data (#24).
+- Issue where callsigns containing '/' were marked invalid (#20).
 
 
 ## [1.0.1] - 2021-09-27

callsignlookuptools/callook/callookasync.py

@@ -11,6 +11,7 @@
 import aiohttp
 
 from ..common import mixins, dataclasses, exceptions
+from ..common.functions import is_callsign
 from .callook import CallookClientAbc
 
 
@@ -35,7 +36,7 @@ async def new(cls, session: Optional[aiohttp.ClientSession] = None) -> 'CallookA
         return obj
 
     async def search(self, callsign: str) -> dataclasses.CallsignData:  # type: ignore[override]
-        if not callsign.isalnum():
+        if not is_callsign(callsign):
             raise exceptions.CallsignLookupError("Invalid Callsign")
 
         return self._process_search(

callsignlookuptools/callook/callooksync.py

@@ -11,6 +11,7 @@
 import requests
 
 from ..common import mixins, dataclasses, exceptions
+from ..common.functions import is_callsign
 from .callook import CallookClientAbc
 
 
@@ -27,7 +28,7 @@ def __init__(self, session: Optional[requests.Session] = None):
         super().__init__()
 
     def search(self, callsign: str) -> dataclasses.CallsignData:
-        if not callsign.isalnum():
+        if not is_callsign(callsign):
             raise exceptions.CallsignLookupError("Invalid Callsign")
 
         return self._process_search(

callsignlookuptools/common/functions.py

@@ -43,3 +43,8 @@ def xml2dict(xml: Union[bytes, etree._Element], to_lower: bool = True) -> Dict:
         else:
             result[key] = value
     return result
+
+
+def is_callsign(callsign: str) -> bool:
+    """Check if a callsign is valid"""
+    return callsign.isascii() and callsign.replace("/", "").isalnum()

callsignlookuptools/hamqth/hamqthasync.py

@@ -13,6 +13,7 @@
 
 from ..common import mixins, dataclasses, exceptions
 from ..common.constants import DEFAULT_USERAGENT
+from ..common.functions import is_callsign
 from .hamqth import HamQthClientAbc
 
 
@@ -49,7 +50,7 @@ async def new(cls, username: str, password: str, session_key: str = "",
         return obj
 
     async def search(self, callsign: str) -> dataclasses.CallsignData:  # type: ignore[override]
-        if not callsign.isalnum():
+        if not is_callsign(callsign):
             raise exceptions.CallsignLookupError("Invalid Callsign")
         try:
             await self._check_session(

callsignlookuptools/hamqth/hamqthsync.py

@@ -13,6 +13,7 @@
 
 from ..common import mixins, dataclasses, exceptions
 from ..common.constants import DEFAULT_USERAGENT
+from ..common.functions import is_callsign
 from .hamqth import HamQthClientAbc
 
 
@@ -35,7 +36,7 @@ def __init__(self, username: str, password: str, session_key: str = "",
         super().__init__(username, password, session_key=session_key, useragent=useragent)
 
     def search(self, callsign: str) -> dataclasses.CallsignData:
-        if not callsign.isalnum():
+        if not is_callsign(callsign):
             raise exceptions.CallsignLookupError("Invalid Callsign")
         try:
             self._check_session(

callsignlookuptools/qrz/qrzasync.py

@@ -13,6 +13,7 @@
 
 from ..common import mixins, dataclasses, exceptions
 from ..common.constants import DEFAULT_USERAGENT
+from ..common.functions import is_callsign
 from .qrz import QrzClientAbc
 
 
@@ -49,7 +50,7 @@ async def new(cls, username: str, password: str, session_key: str = "",
         return obj
 
     async def search(self, callsign: str) -> dataclasses.CallsignData:  # type: ignore[override]
-        if not callsign.isalnum():
+        if not is_callsign(callsign):
             raise exceptions.CallsignLookupError("Invalid Callsign")
         try:
             await self._check_session(

callsignlookuptools/qrz/qrzsync.py

@@ -13,6 +13,7 @@
 
 from ..common import mixins, dataclasses, exceptions
 from ..common.constants import DEFAULT_USERAGENT
+from ..common.functions import is_callsign
 from .qrz import QrzClientAbc
 
 
@@ -35,7 +36,7 @@ def __init__(self, username: str, password: str, session_key: str = "",
         super().__init__(username, password, session_key=session_key, useragent=useragent)
 
     def search(self, callsign: str) -> dataclasses.CallsignData:
-        if not callsign.isalnum():
+        if not is_callsign(callsign):
             raise exceptions.CallsignLookupError("Invalid Callsign")
         try:
             self._check_session(

callsignlookuptools/qrzcq/qrzcqasync.py

@@ -13,6 +13,7 @@
 
 from ..common import mixins, dataclasses, exceptions
 from ..common.constants import DEFAULT_USERAGENT
+from ..common.functions import is_callsign
 from .qrzcq import QrzCqClientAbc
 
 
@@ -49,7 +50,7 @@ async def new(cls, username: str, password: str, session_key: str = "",
         return obj
 
     async def search(self, callsign: str) -> dataclasses.CallsignData:  # type: ignore[override]
-        if not callsign.isalnum():
+        if not is_callsign(callsign):
             raise exceptions.CallsignLookupError("Invalid Callsign")
         try:
             await self._check_session(

callsignlookuptools/qrzcq/qrzcqsync.py

@@ -13,6 +13,7 @@
 
 from ..common import mixins, dataclasses, exceptions
 from ..common.constants import DEFAULT_USERAGENT
+from ..common.functions import is_callsign
 from .qrzcq import QrzCqClientAbc
 
 
@@ -35,7 +36,7 @@ def __init__(self, username: str, password: str, session_key: str = "",
         super().__init__(username, password, session_key=session_key, useragent=useragent)
 
     def search(self, callsign: str) -> dataclasses.CallsignData:
-        if not callsign.isalnum():
+        if not is_callsign(callsign):
             raise exceptions.CallsignLookupError("Invalid Callsign")
         try:
             self._check_session(