moving _parse_address() down beneath fetch() so fetch() is at the top of the file

status-serialisers
Marnanel Thurman 2020-08-05 15:34:02 +01:00
rodzic da12b10a47
commit a26e26e946
1 zmienionych plików z 19 dodań i 19 usunięć

Wyświetl plik

@ -14,25 +14,6 @@ from urllib.parse import urlparse
from kepi.trilby_api.models import RemotePerson
from kepi.sombrero_sendpub.webfinger import get_webfinger
def _parse_address(address):
result = {
'is_atstyle': '@' in address,
}
if result['is_atstyle']:
fields = address.split('@')
result['username'] = fields[-2]
result['hostname'] = fields[-1]
else:
result['hostname'] = urlparse(address).netloc
result['is_local'] = result['hostname'] in settings.ALLOWED_HOSTS
logger.debug("%s: wanted: %s", address, result)
return result
def fetch(address,
expected_type = None,
expected_type_for_remote = None,
@ -60,6 +41,25 @@ def fetch(address,
return handler(address, wanted)
def _parse_address(address):
result = {
'is_atstyle': '@' in address,
}
if result['is_atstyle']:
fields = address.split('@')
result['username'] = fields[-2]
result['hostname'] = fields[-1]
else:
result['hostname'] = urlparse(address).netloc
result['is_local'] = result['hostname'] in settings.ALLOWED_HOSTS
logger.debug("%s: wanted: %s", address, result)
return result
def _fetch_local(address, wanted):
raise ValueError("Not yet implemented") # FIXME