Skip to content

Commit

Permalink
Use attributes and methods from phonenumbers
Browse files Browse the repository at this point in the history
Instead of loading from the submodules, keep to the phonenumbers module.
That avoids prying into its implementation.
  • Loading branch information
francoisfreitag committed May 2, 2023
1 parent 6ab28cc commit c54f558
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 12 deletions.
7 changes: 2 additions & 5 deletions phonenumber_field/phonenumber.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,8 @@ def to_python(value, region=None):


def validate_region(region):
if (
region is not None
and region not in phonenumbers.phonenumberutil.SUPPORTED_REGIONS
):
if region is not None and region not in phonenumbers.SUPPORTED_REGIONS:
raise ValueError(
"“%s” is not a valid region code. Choices are %r"
% (region, phonenumbers.phonenumberutil.SUPPORTED_REGIONS)
% (region, phonenumbers.SUPPORTED_REGIONS)
)
2 changes: 1 addition & 1 deletion phonenumber_field/widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from django.forms import Select, TextInput
from django.forms.widgets import MultiWidget
from django.utils import translation
from phonenumbers.phonenumberutil import (
from phonenumbers import (
COUNTRY_CODE_TO_REGION_CODE,
national_significant_number,
region_code_for_number,
Expand Down
9 changes: 3 additions & 6 deletions tests/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
from django.db.models import Model
from django.test import SimpleTestCase, TestCase, override_settings
from django.utils.encoding import force_str
from phonenumbers import phonenumberutil

from phonenumber_field import formfields, modelfields
from phonenumber_field.phonenumber import PhoneNumber, to_python
Expand Down Expand Up @@ -129,9 +128,7 @@ def test_null_field_returns_none(self):
self.assertIsNone(model.phone_number)
model.phone_number = self.test_number_1
self.assertIsInstance(model.phone_number, PhoneNumber)
model.phone_number = phonenumberutil.parse(
self.test_number_1, keep_raw_input=True
)
model.phone_number = phonenumbers.parse(self.test_number_1, keep_raw_input=True)
self.assertIsInstance(model.phone_number, PhoneNumber)

def test_can_assign_string_phone_number(self):
Expand All @@ -149,10 +146,10 @@ def test_can_assign_string_phone_number(self):

def test_can_assign_phonenumber(self):
"""
Tests assignment phonenumberutil.PhoneNumber to field
Tests assignment phonenumbers.PhoneNumber to field
"""
opt_phone = models.OptionalPhoneNumber()
opt_phone.phone_number = phonenumberutil.parse(
opt_phone.phone_number = phonenumbers.parse(
self.test_number_1, keep_raw_input=True
)
self.assertIsInstance(opt_phone.phone_number, PhoneNumber)
Expand Down

0 comments on commit c54f558

Please sign in to comment.