Skip to content

Commit a4edd15

Browse files
committed
More use of relative local imports
1 parent f1334c9 commit a4edd15

2 files changed

Lines changed: 15 additions & 18 deletions

File tree

python/phonenumbers/__init__.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,15 @@
7777
__version__ = "4.2b1"
7878

7979
# Data class definitions
80-
from phonenumber import PhoneNumber, CountryCodeSource, FrozenPhoneNumber
81-
from phonemetadata import NumberFormat, PhoneNumberDesc, PhoneMetadata
80+
from .phonenumber import PhoneNumber, CountryCodeSource, FrozenPhoneNumber
81+
from .phonemetadata import NumberFormat, PhoneNumberDesc, PhoneMetadata
8282
# Functionality
83-
from asyoutypeformatter import AsYouTypeFormatter
84-
from phonenumberutil import *
85-
from shortnumberutil import connects_to_emergency_number, is_emergency_number
86-
from phonenumbermatcher import PhoneNumberMatch, PhoneNumberMatcher, Leniency
87-
from geocoder import (area_description_for_number, country_name_for_number,
88-
description_for_number, description_for_valid_number)
83+
from .asyoutypeformatter import AsYouTypeFormatter
84+
from .phonenumberutil import *
85+
from .shortnumberutil import connects_to_emergency_number, is_emergency_number
86+
from .phonenumbermatcher import PhoneNumberMatch, PhoneNumberMatcher, Leniency
87+
from .geocoder import (area_description_for_number, country_name_for_number,
88+
description_for_number, description_for_valid_number)
8989

9090
__all__ = ['PhoneNumber', 'CountryCodeSource', 'FrozenPhoneNumber',
9191
'NumberFormat', 'PhoneNumberDesc', 'PhoneMetadata',

python/tests/__init__.py

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
#!/usr/bin/env python
22
import unittest
33

4-
import pathfix
5-
pathfix.fix()
6-
7-
from phonenumbertest import PhoneNumberTest
8-
from phonenumberutiltest import PhoneNumberUtilTest
9-
from shortnumberutiltest import ShortNumberUtilTest
10-
from asyoutypetest import AsYouTypeFormatterTest
11-
from examplenumberstest import ExampleNumbersTest
12-
from phonenumbermatchertest import PhoneNumberMatchTest, PhoneNumberMatcherTest
13-
from geocodertest import PhoneNumberGeocoderTest
4+
from .phonenumbertest import PhoneNumberTest
5+
from .phonenumberutiltest import PhoneNumberUtilTest
6+
from .shortnumberutiltest import ShortNumberUtilTest
7+
from .asyoutypetest import AsYouTypeFormatterTest
8+
from .examplenumberstest import ExampleNumbersTest
9+
from .phonenumbermatchertest import PhoneNumberMatchTest, PhoneNumberMatcherTest
10+
from .geocodertest import PhoneNumberGeocoderTest
1411

1512
if __name__ == '__main__':
1613
unittest.main()

0 commit comments

Comments
 (0)