Skip to content

Commit e599e28

Browse files
daviddrysdaledaviddrysdale
committed
Convert more string literals to use u("..")
1 parent 51de6f0 commit e599e28

3 files changed

Lines changed: 59 additions & 58 deletions

File tree

‎python/phonenumbers/geocoder.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
33
>>> import phonenumbers
44
>>> from phonenumbers.geocoder import area_description_for_number
5+
>>> from phonenumbers.util import u
56
>>> gb_number = phonenumbers.parse("+442083612345", "GB")
67
>>> de_number = phonenumbers.parse("0891234567", "DE")
78
>>> ch_number = phonenumbers.parse("0431234567", "CH")
@@ -15,9 +16,9 @@
1516
'London'
1617
>>> str(area_description_for_number(de_number, "en"))
1718
'Munich'
18-
>>> u'M\xfcnchen' == area_description_for_number(de_number, "de")
19+
>>> u('M\xfcnchen') == area_description_for_number(de_number, "de")
1920
True
20-
>>> u'Z\xfcrich' == area_description_for_number(ch_number, "de")
21+
>>> u('Z\xfcrich') == area_description_for_number(ch_number, "de")
2122
True
2223
>>> str(area_description_for_number(ch_number, "en"))
2324
'Zurich'

‎python/phonenumbers/phonenumbermatcher.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -259,19 +259,19 @@ def _get_national_number_groups(numobj):
259259
rfc3966_format = format_number(numobj, PhoneNumberFormat.RFC3966)
260260
# We remove the extension part from the formatted string before splitting
261261
# it into different groups.
262-
end_index = rfc3966_format.find(u';')
262+
end_index = rfc3966_format.find(u(";"))
263263
if end_index < 0:
264264
end_index = len(rfc3966_format)
265265

266266
# The country-code will have a '-' following it.
267-
start_index = rfc3966_format.find(u'-') + 1
268-
return rfc3966_format[start_index:end_index].split(u'-')
267+
start_index = rfc3966_format.find(u("-")) + 1
268+
return rfc3966_format[start_index:end_index].split(u("-"))
269269

270270

271271
def _contains_more_than_one_slash(candidate):
272-
first_slash_index = candidate.find(u'/')
272+
first_slash_index = candidate.find(u("/"))
273273
return (first_slash_index > 0 and
274-
(candidate.find(u'/', (first_slash_index + 1)) != -1))
274+
(candidate.find(u("/"), (first_slash_index + 1)) != -1))
275275

276276

277277
def _contains_only_valid_x_chars(numobj, candidate):

‎python/phonenumbers/phonenumberutil.py‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -79,72 +79,72 @@
7979
# when dialed from a mobile phone in Colombia.
8080
_COLOMBIA_MOBILE_TO_FIXED_LINE_PREFIX = "3"
8181
# The PLUS_SIGN signifies the international prefix.
82-
_PLUS_SIGN = u'+'
82+
_PLUS_SIGN = u("+")
8383
_RFC3966_EXTN_PREFIX = u(";ext=")
8484

8585
# Simple ASCII digits map used to populate _ALPHA_PHONE_MAPPINGS and
8686
# _ALL_PLUS_NUMBER_GROUPING_SYMBOLS.
87-
_ASCII_DIGITS_MAP = {u'0': u'0', u'1': u'1',
88-
u'2': u'2', u'3': u'3',
89-
u'4': u'4', u'5': u'5',
90-
u'6': u'6', u'7': u'7',
91-
u'8': u'8', u'9': u'9'}
87+
_ASCII_DIGITS_MAP = {u("0"): u("0"), u("1"): u("1"),
88+
u("2"): u("2"), u("3"): u("3"),
89+
u("4"): u("4"), u("5"): u("5"),
90+
u("6"): u("6"), u("7"): u("7"),
91+
u("8"): u("8"), u("9"): u("9")}
9292

9393
# Only upper-case variants of alpha characters are stored.
94-
_ALPHA_MAPPINGS = {u'A': u'2',
95-
u'B': u'2',
96-
u'C': u'2',
97-
u'D': u'3',
98-
u'E': u'3',
99-
u'F': u'3',
100-
u'G': u'4',
101-
u'H': u'4',
102-
u'I': u'4',
103-
u'J': u'5',
104-
u'K': u'5',
105-
u'L': u'5',
106-
u'M': u'6',
107-
u'N': u'6',
108-
u'O': u'6',
109-
u'P': u'7',
110-
u'Q': u'7',
111-
u'R': u'7',
112-
u'S': u'7',
113-
u'T': u'8',
114-
u'U': u'8',
115-
u'V': u'8',
116-
u'W': u'9',
117-
u'X': u'9',
118-
u'Y': u'9',
119-
u'Z': u'9', }
94+
_ALPHA_MAPPINGS = {u("A"): u("2"),
95+
u("B"): u("2"),
96+
u("C"): u("2"),
97+
u("D"): u("3"),
98+
u("E"): u("3"),
99+
u("F"): u("3"),
100+
u("G"): u("4"),
101+
u("H"): u("4"),
102+
u("I"): u("4"),
103+
u("J"): u("5"),
104+
u("K"): u("5"),
105+
u("L"): u("5"),
106+
u("M"): u("6"),
107+
u("N"): u("6"),
108+
u("O"): u("6"),
109+
u("P"): u("7"),
110+
u("Q"): u("7"),
111+
u("R"): u("7"),
112+
u("S"): u("7"),
113+
u("T"): u("8"),
114+
u("U"): u("8"),
115+
u("V"): u("8"),
116+
u("W"): u("9"),
117+
u("X"): u("9"),
118+
u("Y"): u("9"),
119+
u("Z"): u("9"), }
120120
# For performance reasons, amalgamate both into one map.
121121
_ALPHA_PHONE_MAPPINGS = dict(_ALPHA_MAPPINGS, **_ASCII_DIGITS_MAP)
122122

123123
# A map that contains characters that are essential when dialling. That means
124124
# any of the characters in this map must not be removed from a number when
125125
# dialing, otherwise the call will not reach the intended destination.
126-
_DIALLABLE_CHAR_MAPPINGS = dict({u'+': u'+', u'*': u'*'},
126+
_DIALLABLE_CHAR_MAPPINGS = dict({u("+"): u("+"), u("*"): u("*")},
127127
**_ASCII_DIGITS_MAP)
128128

129129
# Separate map of all symbols that we wish to retain when formatting alpha
130130
# numbers. This includes digits, ASCII letters and number grouping symbols
131131
# such as "-" and " ".
132-
_ALL_PLUS_NUMBER_GROUPING_SYMBOLS = dict({u'-': u'-', # Put grouping symbols.
133-
u'\uFF0D': u'-',
134-
u'\u2010': u'-',
135-
u'\u2011': u'-',
136-
u'\u2012': u'-',
137-
u'\u2013': u'-',
138-
u'\u2014': u'-',
139-
u'\u2015': u'-',
140-
u'\u2212': u'-',
141-
u'/': u'/',
142-
u'\uFF0F': u'/',
143-
u' ': u' ',
144-
u'\u3000': u' ',
145-
u'\u2060': u' ',
146-
u'.': u'.',
147-
u'\uFF0E': u'.'},
132+
_ALL_PLUS_NUMBER_GROUPING_SYMBOLS = dict({u("-"): u("-"), # Put grouping symbols.
133+
u("\uFF0D"): u("-"),
134+
u("\u2010"): u("-"),
135+
u("\u2011"): u("-"),
136+
u("\u2012"): u("-"),
137+
u("\u2013"): u("-"),
138+
u("\u2014"): u("-"),
139+
u("\u2015"): u("-"),
140+
u("\u2212"): u("-"),
141+
u("/"): u("/"),
142+
u("\uFF0F"): u("/"),
143+
u(" "): u(" "),
144+
u("\u3000"): u(" "),
145+
u("\u2060"): u(" "),
146+
u("."): u("."),
147+
u("\uFF0E"): u(".")},
148148
# Put (lower letter -> upper letter) and
149149
# (upper letter -> upper letter) mappings.
150150
**dict([(_c.lower(), _c) for _c in _ALPHA_MAPPINGS.keys()] +
@@ -648,7 +648,7 @@ def _normalize_helper(number, replacements, remove_non_matches):
648648
elif not remove_non_matches:
649649
normalized_number.append(char)
650650
# If neither of the above are true, we remove this character
651-
return u''.join(normalized_number)
651+
return u("").join(normalized_number)
652652

653653

654654
def _is_valid_region_code(region_code):
@@ -1772,7 +1772,7 @@ def _extract_country_code(number):
17721772
number) if number doesn't start with a valid country calling code.
17731773
"""
17741774

1775-
if len(number) == 0 or number[0] == u'0':
1775+
if len(number) == 0 or number[0] == u("0"):
17761776
# Country codes do not begin with a '0'.
17771777
return (0, number)
17781778
for ii in range(1, min(len(number), _MAX_LENGTH_COUNTRY_CODE) + 1):

0 commit comments

Comments
 (0)