Skip to content

Commit aaf099d

Browse files
daviddrysdaledaviddrysdale
committed
Update merged code to Python version-neutral form
1 parent bcb2f8d commit aaf099d

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

‎python/phonenumbers/geocoder.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@
5959
if (os.path.basename(sys.argv[0]) == "buildmetadatafromxml.py" or
6060
os.path.basename(sys.argv[0]) == "buildgeocodingdata.py"):
6161
prnt("Failed to import generated data (but OK as during autogeneration)", file=sys.stderr)
62-
GEOCODE_DATA = {'1': {'en': u'United States'}}
62+
GEOCODE_DATA = {'1': {'en': u('United States')}}
6363
GEOCODE_LONGEST_PREFIX = 1
64-
LOCALE_DATA = {'US': {'en': u'United States'}}
64+
LOCALE_DATA = {'US': {'en': u('United States')}}
6565
else:
6666
raise
6767

‎python/tests/phonenumberutiltest.py‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1546,7 +1546,7 @@ def testParseNationalNumber(self):
15461546
# the number.
15471547
self.assertEqual(JP_STAR_NUMBER, phonenumbers.parse("+81 *2345", "JP"))
15481548

1549-
shortNumber = PhoneNumber(country_code=64, national_number=12L)
1549+
shortNumber = PhoneNumber(country_code=64, national_number=12)
15501550
self.assertEqual(shortNumber, phonenumbers.parse("12", "NZ"))
15511551

15521552
def testParseNumberWithAlphaCharacters(self):
@@ -1706,26 +1706,29 @@ def testFailedParseOnInvalidNumbers(self):
17061706
sentencePhoneNumber = "1 Still not a number"
17071707
phonenumbers.parse(sentencePhoneNumber, "NZ")
17081708
self.fail("This should not parse without throwing an exception " + sentencePhoneNumber)
1709-
except NumberParseException, e:
1709+
except NumberParseException:
17101710
# Expected this exception.
1711+
e = sys.exc_info()[1]
17111712
self.assertEqual(NumberParseException.NOT_A_NUMBER,
17121713
e.error_type,
17131714
msg="Wrong error type stored in exception.")
17141715
try:
17151716
sentencePhoneNumber = "1 MICROSOFT"
17161717
phonenumbers.parse(sentencePhoneNumber, "NZ")
17171718
self.fail("This should not parse without throwing an exception " + sentencePhoneNumber)
1718-
except NumberParseException, e:
1719+
except NumberParseException:
17191720
# Expected this exception.
1721+
e = sys.exc_info()[1]
17201722
self.assertEqual(NumberParseException.NOT_A_NUMBER,
17211723
e.error_type,
17221724
msg="Wrong error type stored in exception.")
17231725
try:
17241726
sentencePhoneNumber = "12 MICROSOFT"
17251727
phonenumbers.parse(sentencePhoneNumber, "NZ")
17261728
self.fail("This should not parse without throwing an exception " + sentencePhoneNumber)
1727-
except NumberParseException, e:
1729+
except NumberParseException:
17281730
# Expected this exception.
1731+
e = sys.exc_info()[1]
17291732
self.assertEqual(NumberParseException.NOT_A_NUMBER,
17301733
e.error_type,
17311734
msg="Wrong error type stored in exception.")

0 commit comments

Comments
 (0)