|
29 | 29 | from itertools import groupby, islice
|
30 | 30 | from markupsafe import escape
|
31 | 31 | from markupsafe import Markup
|
32 |
| - |
33 | 32 | from onegov.core import log
|
34 | 33 | from onegov.core.custom import json
|
35 | 34 | from onegov.core.errors import AlreadyLockedError
|
36 |
| -from phonenumbers import ( |
37 |
| - PhoneNumberFormat, |
38 |
| - format_number as format_phone_number, |
39 |
| - NumberParseException, |
40 |
| - parse, |
41 |
| -) |
| 35 | +from phonenumbers import (PhoneNumberFormat, format_number, |
| 36 | + NumberParseException, parse) |
42 | 37 | from purl import URL
|
43 | 38 | from threading import Thread
|
44 | 39 | from time import perf_counter
|
|
49 | 44 | from yubico_client.yubico_exceptions import ( # type:ignore[import-untyped]
|
50 | 45 | SignatureVerificationError, StatusCodeError)
|
51 | 46 |
|
52 |
| -from typing import overload, Any, TypeVar, TYPE_CHECKING |
53 | 47 |
|
| 48 | +from typing import overload, Any, TypeVar, TYPE_CHECKING |
54 | 49 | if TYPE_CHECKING:
|
55 | 50 | from _typeshed import SupportsRichComparison
|
56 | 51 | from collections.abc import Callable, Collection, Iterator
|
@@ -1255,10 +1250,10 @@ def generate_fts_phonenumbers(numbers: Iterable[str | None]) -> list[str]:
|
1255 | 1250 | result.append(number.replace(' ', ''))
|
1256 | 1251 | continue
|
1257 | 1252 |
|
1258 |
| - result.append(format_phone_number( |
| 1253 | + result.append(format_number( |
1259 | 1254 | parsed, PhoneNumberFormat.E164))
|
1260 | 1255 |
|
1261 |
| - national = format_phone_number( |
| 1256 | + national = format_number( |
1262 | 1257 | parsed, PhoneNumberFormat.NATIONAL)
|
1263 | 1258 | groups = national.split()
|
1264 | 1259 | for idx in range(len(groups)):
|
|
0 commit comments