Attachment 7281 Details for Bug 39146 – patch

[patch] patch

39146.patch (text/plain), 19.18 KB, created by Florian Best on 2015-11-11 11:42:57 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2015-11-11 11:42:57 CET

Size: 19.18 KB

patch

obsolete

>diff --git a/management/univention-directory-manager-modules/modules/univention/admin/syntax.py b/management/univention-directory-manager-modules/modules/univention/admin/syntax.py
>index 9408dc2..0e7fd0d 100644
>--- a/management/univention-directory-manager-modules/modules/univention/admin/syntax.py
>+++ b/management/univention-directory-manager-modules/modules/univention/admin/syntax.py
>@@ -3043,131 +3043,134 @@ class ObjectFlag( select ):
> class Country(select):
> 	empty_value = True
> 
>-	try:
>-		locale.setlocale(locale.LC_ALL, "")
>-	except locale.Error:
>-		# unsupported locale setting: a locale was not installed (probably de_DE.UTF-8)
>-		pass
>-	translation = univention.admin.localization.translation('iso_3166')
>-	_iso_3166 = translation.translate
>-
>-	choices = [('AF', _iso_3166(u'Afghanistan')), ('AX', _iso_3166(u'\xc5land Islands')),
>-		('AL', _iso_3166(u'Albania')), ('DZ', _iso_3166(u'Algeria')),
>-		('AS', _iso_3166(u'American Samoa')), ('AD', _iso_3166(u'Andorra')),
>-		('AO', _iso_3166(u'Angola')), ('AI', _iso_3166(u'Anguilla')), ('AQ', _iso_3166(u'Antarctica')),
>-		('AG', _iso_3166(u'Antigua and Barbuda')), ('AR', _iso_3166(u'Argentina')),
>-		('AM', _iso_3166(u'Armenia')), ('AW', _iso_3166(u'Aruba')), ('AU', _iso_3166(u'Australia')),
>-		('AT', _iso_3166(u'Austria')), ('AZ', _iso_3166(u'Azerbaijan')), ('BS', _iso_3166(u'Bahamas')),
>-		('BH', _iso_3166(u'Bahrain')), ('BD', _iso_3166(u'Bangladesh')), ('BB', _iso_3166(u'Barbados')),
>-		('BY', _iso_3166(u'Belarus')), ('BE', _iso_3166(u'Belgium')), ('BZ', _iso_3166(u'Belize')),
>-		('BJ', _iso_3166(u'Benin')), ('BM', _iso_3166(u'Bermuda')), ('BT', _iso_3166(u'Bhutan')),
>-		('BO', _iso_3166(u'Bolivia, Plurinational State of')),
>-		('BQ', _iso_3166(u'Bonaire, Sint Eustatius and Saba')),
>-		('BA', _iso_3166(u'Bosnia and Herzegovina')), ('BW', _iso_3166(u'Botswana')),
>-		('BV', _iso_3166(u'Bouvet Island')), ('BR', _iso_3166(u'Brazil')),
>-		('IO', _iso_3166(u'British Indian Ocean Territory')),
>-		('BN', _iso_3166(u'Brunei Darussalam')), ('BG', _iso_3166(u'Bulgaria')),
>-		('BF', _iso_3166(u'Burkina Faso')), ('BI', _iso_3166(u'Burundi')),
>-		('KH', _iso_3166(u'Cambodia')), ('CM', _iso_3166(u'Cameroon')), ('CA', _iso_3166(u'Canada')),
>-		('CV', _iso_3166(u'Cape Verde')), ('KY', _iso_3166(u'Cayman Islands')),
>-		('CF', _iso_3166(u'Central African Republic')), ('TD', _iso_3166(u'Chad')),
>-		('CL', _iso_3166(u'Chile')), ('CN', _iso_3166(u'China')),
>-		('CX', _iso_3166(u'Christmas Island')), ('CC', _iso_3166(u'Cocos (Keeling) Islands')),
>-		('CO', _iso_3166(u'Colombia')), ('KM', _iso_3166(u'Comoros')), ('CG', _iso_3166(u'Congo')),
>-		('CD', _iso_3166(u'Congo, The Democratic Republic of the')),
>-		('CK', _iso_3166(u'Cook Islands')), ('CR', _iso_3166(u'Costa Rica')),
>-		('CI', _iso_3166(u"C\xf4te d'Ivoire")), ('HR', _iso_3166(u'Croatia')),
>-		('CU', _iso_3166(u'Cuba')), ('CW', _iso_3166(u'Cura\xe7ao')), ('CY', _iso_3166(u'Cyprus')),
>-		('CZ', _iso_3166(u'Czech Republic')), ('DK', _iso_3166(u'Denmark')),
>-		('DJ', _iso_3166(u'Djibouti')), ('DM', _iso_3166(u'Dominica')),
>-		('DO', _iso_3166(u'Dominican Republic')), ('EC', _iso_3166(u'Ecuador')),
>-		('EG', _iso_3166(u'Egypt')), ('SV', _iso_3166(u'El Salvador')),
>-		('GQ', _iso_3166(u'Equatorial Guinea')), ('ER', _iso_3166(u'Eritrea')),
>-		('EE', _iso_3166(u'Estonia')), ('ET', _iso_3166(u'Ethiopia')),
>-		('FK', _iso_3166(u'Falkland Islands (Malvinas)')), ('FO', _iso_3166(u'Faroe Islands')),
>-		('FJ', _iso_3166(u'Fiji')), ('FI', _iso_3166(u'Finland')), ('FR', _iso_3166(u'France')),
>-		('GF', _iso_3166(u'French Guiana')), ('PF', _iso_3166(u'French Polynesia')),
>-		('TF', _iso_3166(u'French Southern Territories')), ('GA', _iso_3166(u'Gabon')),
>-		('GM', _iso_3166(u'Gambia')), ('GE', _iso_3166(u'Georgia')), ('DE', _iso_3166(u'Germany')),
>-		('GH', _iso_3166(u'Ghana')), ('GI', _iso_3166(u'Gibraltar')), ('GR', _iso_3166(u'Greece')),
>-		('GL', _iso_3166(u'Greenland')), ('GD', _iso_3166(u'Grenada')),
>-		('GP', _iso_3166(u'Guadeloupe')), ('GU', _iso_3166(u'Guam')), ('GT', _iso_3166(u'Guatemala')),
>-		('GG', _iso_3166(u'Guernsey')), ('GN', _iso_3166(u'Guinea')),
>-		('GW', _iso_3166(u'Guinea-Bissau')), ('GY', _iso_3166(u'Guyana')), ('HT', _iso_3166(u'Haiti')),
>-		('HM', _iso_3166(u'Heard Island and McDonald Islands')),
>-		('VA', _iso_3166(u'Holy See (Vatican City State)')), ('HN', _iso_3166(u'Honduras')),
>-		('HK', _iso_3166(u'Hong Kong')), ('HU', _iso_3166(u'Hungary')), ('IS', _iso_3166(u'Iceland')),
>-		('IN', _iso_3166(u'India')), ('ID', _iso_3166(u'Indonesia')),
>-		('IR', _iso_3166(u'Iran, Islamic Republic of')), ('IQ', _iso_3166(u'Iraq')),
>-		('IE', _iso_3166(u'Ireland')), ('IM', _iso_3166(u'Isle of Man')), ('IL', _iso_3166(u'Israel')),
>-		('IT', _iso_3166(u'Italy')), ('JM', _iso_3166(u'Jamaica')), ('JP', _iso_3166(u'Japan')),
>-		('JE', _iso_3166(u'Jersey')), ('JO', _iso_3166(u'Jordan')), ('KZ', _iso_3166(u'Kazakhstan')),
>-		('KE', _iso_3166(u'Kenya')), ('KI', _iso_3166(u'Kiribati')),
>-		('KP', _iso_3166(u"Korea, Democratic People's Republic of")),
>-		('KR', _iso_3166(u'Korea, Republic of')), ('KW', _iso_3166(u'Kuwait')),
>-		('KG', _iso_3166(u'Kyrgyzstan')),
>-		('LA', _iso_3166(u"Lao People's Democratic Republic")), ('LV', _iso_3166(u'Latvia')),
>-		('LB', _iso_3166(u'Lebanon')), ('LS', _iso_3166(u'Lesotho')), ('LR', _iso_3166(u'Liberia')),
>-		('LY', _iso_3166(u'Libya')), ('LI', _iso_3166(u'Liechtenstein')),
>-		('LT', _iso_3166(u'Lithuania')), ('LU', _iso_3166(u'Luxembourg')), ('MO', _iso_3166(u'Macao')),
>-		('MK', _iso_3166(u'Macedonia, Republic of')), ('MG', _iso_3166(u'Madagascar')),
>-		('MW', _iso_3166(u'Malawi')), ('MY', _iso_3166(u'Malaysia')), ('MV', _iso_3166(u'Maldives')),
>-		('ML', _iso_3166(u'Mali')), ('MT', _iso_3166(u'Malta')), ('MH', _iso_3166(u'Marshall Islands')),
>-		('MQ', _iso_3166(u'Martinique')), ('MR', _iso_3166(u'Mauritania')),
>-		('MU', _iso_3166(u'Mauritius')), ('YT', _iso_3166(u'Mayotte')), ('MX', _iso_3166(u'Mexico')),
>-		('FM', _iso_3166(u'Micronesia, Federated States of')),
>-		('MD', _iso_3166(u'Moldova, Republic of')), ('MC', _iso_3166(u'Monaco')),
>-		('MN', _iso_3166(u'Mongolia')), ('ME', _iso_3166(u'Montenegro')),
>-		('MS', _iso_3166(u'Montserrat')), ('MA', _iso_3166(u'Morocco')),
>-		('MZ', _iso_3166(u'Mozambique')), ('MM', _iso_3166(u'Myanmar')), ('NA', _iso_3166(u'Namibia')),
>-		('NR', _iso_3166(u'Nauru')), ('NP', _iso_3166(u'Nepal')), ('NL', _iso_3166(u'Netherlands')),
>-		('NC', _iso_3166(u'New Caledonia')), ('NZ', _iso_3166(u'New Zealand')),
>-		('NI', _iso_3166(u'Nicaragua')), ('NE', _iso_3166(u'Niger')), ('NG', _iso_3166(u'Nigeria')),
>-		('NU', _iso_3166(u'Niue')), ('NF', _iso_3166(u'Norfolk Island')),
>-		('MP', _iso_3166(u'Northern Mariana Islands')), ('NO', _iso_3166(u'Norway')),
>-		('OM', _iso_3166(u'Oman')), ('PK', _iso_3166(u'Pakistan')), ('PW', _iso_3166(u'Palau')),
>-		('PS', _iso_3166(u'Palestine, State of')), ('PA', _iso_3166(u'Panama')),
>-		('PG', _iso_3166(u'Papua New Guinea')), ('PY', _iso_3166(u'Paraguay')),
>-		('PE', _iso_3166(u'Peru')), ('PH', _iso_3166(u'Philippines')), ('PN', _iso_3166(u'Pitcairn')),
>-		('PL', _iso_3166(u'Poland')), ('PT', _iso_3166(u'Portugal')), ('PR', _iso_3166(u'Puerto Rico')),
>-		('QA', _iso_3166(u'Qatar')), ('RE', _iso_3166(u'R\xe9union')), ('RO', _iso_3166(u'Romania')),
>-		('RU', _iso_3166(u'Russian Federation')), ('RW', _iso_3166(u'Rwanda')),
>-		('BL', _iso_3166(u'Saint Barth\xe9lemy')),
>-		('SH', _iso_3166(u'Saint Helena, Ascension and Tristan da Cunha')),
>-		('KN', _iso_3166(u'Saint Kitts and Nevis')), ('LC', _iso_3166(u'Saint Lucia')),
>-		('MF', _iso_3166(u'Saint Martin (French part)')),
>-		('PM', _iso_3166(u'Saint Pierre and Miquelon')),
>-		('VC', _iso_3166(u'Saint Vincent and the Grenadines')), ('WS', _iso_3166(u'Samoa')),
>-		('SM', _iso_3166(u'San Marino')), ('ST', _iso_3166(u'Sao Tome and Principe')),
>-		('SA', _iso_3166(u'Saudi Arabia')), ('SN', _iso_3166(u'Senegal')), ('RS', _iso_3166(u'Serbia')),
>-		('SC', _iso_3166(u'Seychelles')), ('SL', _iso_3166(u'Sierra Leone')),
>-		('SG', _iso_3166(u'Singapore')), ('SX', _iso_3166(u'Sint Maarten (Dutch part)')),
>-		('SK', _iso_3166(u'Slovakia')), ('SI', _iso_3166(u'Slovenia')),
>-		('SB', _iso_3166(u'Solomon Islands')), ('SO', _iso_3166(u'Somalia')),
>-		('ZA', _iso_3166(u'South Africa')),
>-		('GS', _iso_3166(u'South Georgia and the South Sandwich Islands')),
>-		('ES', _iso_3166(u'Spain')), ('LK', _iso_3166(u'Sri Lanka')), ('SD', _iso_3166(u'Sudan')),
>-		('SR', _iso_3166(u'Suriname')), ('SS', _iso_3166(u'South Sudan')),
>-		('SJ', _iso_3166(u'Svalbard and Jan Mayen')), ('SZ', _iso_3166(u'Swaziland')),
>-		('SE', _iso_3166(u'Sweden')), ('CH', _iso_3166(u'Switzerland')),
>-		('SY', _iso_3166(u'Syrian Arab Republic')),
>-		('TW', _iso_3166(u'Taiwan, Province of China')), ('TJ', _iso_3166(u'Tajikistan')),
>-		('TZ', _iso_3166(u'Tanzania, United Republic of')), ('TH', _iso_3166(u'Thailand')),
>-		('TL', _iso_3166(u'Timor-Leste')), ('TG', _iso_3166(u'Togo')), ('TK', _iso_3166(u'Tokelau')),
>-		('TO', _iso_3166(u'Tonga')), ('TT', _iso_3166(u'Trinidad and Tobago')),
>-		('TN', _iso_3166(u'Tunisia')), ('TR', _iso_3166(u'Turkey')), ('TM', _iso_3166(u'Turkmenistan')),
>-		('TC', _iso_3166(u'Turks and Caicos Islands')), ('TV', _iso_3166(u'Tuvalu')),
>-		('UG', _iso_3166(u'Uganda')), ('UA', _iso_3166(u'Ukraine')),
>-		('AE', _iso_3166(u'United Arab Emirates')), ('GB', _iso_3166(u'United Kingdom')),
>-		('US', _iso_3166(u'United States')),
>-		('UM', _iso_3166(u'United States Minor Outlying Islands')),
>-		('UY', _iso_3166(u'Uruguay')), ('UZ', _iso_3166(u'Uzbekistan')), ('VU', _iso_3166(u'Vanuatu')),
>-		('VE', _iso_3166(u'Venezuela, Bolivarian Republic of')), ('VN', _iso_3166(u'Viet Nam')),
>-		('VG', _iso_3166(u'Virgin Islands, British')),
>-		('VI', _iso_3166(u'Virgin Islands, U.S.')), ('WF', _iso_3166(u'Wallis and Futuna')),
>-		('EH', _iso_3166(u'Western Sahara')), ('YE', _iso_3166(u'Yemen')), ('ZM', _iso_3166(u'Zambia')),
>-		('ZW', _iso_3166(u'Zimbabwe'))]
>-	choices.sort(cmp=locale.strcoll, key=itemgetter(1))
>+	choices = []
>+
>+	@classmethod
>+	def update_choices(cls):
>+		iso_3166 = univention.admin.localization.translation('iso_3166')
>+		iso_3166.set_language(str(translation.locale))
>+		_iso_3166 = iso_3166.translate
>+
>+		cls.choices = [
>+			('AF', _iso_3166(u'Afghanistan')), ('AX', _iso_3166(u'\xc5land Islands')),
>+			('AL', _iso_3166(u'Albania')), ('DZ', _iso_3166(u'Algeria')),
>+			('AS', _iso_3166(u'American Samoa')), ('AD', _iso_3166(u'Andorra')),
>+			('AO', _iso_3166(u'Angola')), ('AI', _iso_3166(u'Anguilla')), ('AQ', _iso_3166(u'Antarctica')),
>+			('AG', _iso_3166(u'Antigua and Barbuda')), ('AR', _iso_3166(u'Argentina')),
>+			('AM', _iso_3166(u'Armenia')), ('AW', _iso_3166(u'Aruba')), ('AU', _iso_3166(u'Australia')),
>+			('AT', _iso_3166(u'Austria')), ('AZ', _iso_3166(u'Azerbaijan')), ('BS', _iso_3166(u'Bahamas')),
>+			('BH', _iso_3166(u'Bahrain')), ('BD', _iso_3166(u'Bangladesh')), ('BB', _iso_3166(u'Barbados')),
>+			('BY', _iso_3166(u'Belarus')), ('BE', _iso_3166(u'Belgium')), ('BZ', _iso_3166(u'Belize')),
>+			('BJ', _iso_3166(u'Benin')), ('BM', _iso_3166(u'Bermuda')), ('BT', _iso_3166(u'Bhutan')),
>+			('BO', _iso_3166(u'Bolivia, Plurinational State of')),
>+			('BQ', _iso_3166(u'Bonaire, Sint Eustatius and Saba')),
>+			('BA', _iso_3166(u'Bosnia and Herzegovina')), ('BW', _iso_3166(u'Botswana')),
>+			('BV', _iso_3166(u'Bouvet Island')), ('BR', _iso_3166(u'Brazil')),
>+			('IO', _iso_3166(u'British Indian Ocean Territory')),
>+			('BN', _iso_3166(u'Brunei Darussalam')), ('BG', _iso_3166(u'Bulgaria')),
>+			('BF', _iso_3166(u'Burkina Faso')), ('BI', _iso_3166(u'Burundi')),
>+			('KH', _iso_3166(u'Cambodia')), ('CM', _iso_3166(u'Cameroon')), ('CA', _iso_3166(u'Canada')),
>+			('CV', _iso_3166(u'Cape Verde')), ('KY', _iso_3166(u'Cayman Islands')),
>+			('CF', _iso_3166(u'Central African Republic')), ('TD', _iso_3166(u'Chad')),
>+			('CL', _iso_3166(u'Chile')), ('CN', _iso_3166(u'China')),
>+			('CX', _iso_3166(u'Christmas Island')), ('CC', _iso_3166(u'Cocos (Keeling) Islands')),
>+			('CO', _iso_3166(u'Colombia')), ('KM', _iso_3166(u'Comoros')), ('CG', _iso_3166(u'Congo')),
>+			('CD', _iso_3166(u'Congo, The Democratic Republic of the')),
>+			('CK', _iso_3166(u'Cook Islands')), ('CR', _iso_3166(u'Costa Rica')),
>+			('CI', _iso_3166(u"C\xf4te d'Ivoire")), ('HR', _iso_3166(u'Croatia')),
>+			('CU', _iso_3166(u'Cuba')), ('CW', _iso_3166(u'Cura\xe7ao')), ('CY', _iso_3166(u'Cyprus')),
>+			('CZ', _iso_3166(u'Czech Republic')), ('DK', _iso_3166(u'Denmark')),
>+			('DJ', _iso_3166(u'Djibouti')), ('DM', _iso_3166(u'Dominica')),
>+			('DO', _iso_3166(u'Dominican Republic')), ('EC', _iso_3166(u'Ecuador')),
>+			('EG', _iso_3166(u'Egypt')), ('SV', _iso_3166(u'El Salvador')),
>+			('GQ', _iso_3166(u'Equatorial Guinea')), ('ER', _iso_3166(u'Eritrea')),
>+			('EE', _iso_3166(u'Estonia')), ('ET', _iso_3166(u'Ethiopia')),
>+			('FK', _iso_3166(u'Falkland Islands (Malvinas)')), ('FO', _iso_3166(u'Faroe Islands')),
>+			('FJ', _iso_3166(u'Fiji')), ('FI', _iso_3166(u'Finland')), ('FR', _iso_3166(u'France')),
>+			('GF', _iso_3166(u'French Guiana')), ('PF', _iso_3166(u'French Polynesia')),
>+			('TF', _iso_3166(u'French Southern Territories')), ('GA', _iso_3166(u'Gabon')),
>+			('GM', _iso_3166(u'Gambia')), ('GE', _iso_3166(u'Georgia')), ('DE', _iso_3166(u'Germany')),
>+			('GH', _iso_3166(u'Ghana')), ('GI', _iso_3166(u'Gibraltar')), ('GR', _iso_3166(u'Greece')),
>+			('GL', _iso_3166(u'Greenland')), ('GD', _iso_3166(u'Grenada')),
>+			('GP', _iso_3166(u'Guadeloupe')), ('GU', _iso_3166(u'Guam')), ('GT', _iso_3166(u'Guatemala')),
>+			('GG', _iso_3166(u'Guernsey')), ('GN', _iso_3166(u'Guinea')),
>+			('GW', _iso_3166(u'Guinea-Bissau')), ('GY', _iso_3166(u'Guyana')), ('HT', _iso_3166(u'Haiti')),
>+			('HM', _iso_3166(u'Heard Island and McDonald Islands')),
>+			('VA', _iso_3166(u'Holy See (Vatican City State)')), ('HN', _iso_3166(u'Honduras')),
>+			('HK', _iso_3166(u'Hong Kong')), ('HU', _iso_3166(u'Hungary')), ('IS', _iso_3166(u'Iceland')),
>+			('IN', _iso_3166(u'India')), ('ID', _iso_3166(u'Indonesia')),
>+			('IR', _iso_3166(u'Iran, Islamic Republic of')), ('IQ', _iso_3166(u'Iraq')),
>+			('IE', _iso_3166(u'Ireland')), ('IM', _iso_3166(u'Isle of Man')), ('IL', _iso_3166(u'Israel')),
>+			('IT', _iso_3166(u'Italy')), ('JM', _iso_3166(u'Jamaica')), ('JP', _iso_3166(u'Japan')),
>+			('JE', _iso_3166(u'Jersey')), ('JO', _iso_3166(u'Jordan')), ('KZ', _iso_3166(u'Kazakhstan')),
>+			('KE', _iso_3166(u'Kenya')), ('KI', _iso_3166(u'Kiribati')),
>+			('KP', _iso_3166(u"Korea, Democratic People's Republic of")),
>+			('KR', _iso_3166(u'Korea, Republic of')), ('KW', _iso_3166(u'Kuwait')),
>+			('KG', _iso_3166(u'Kyrgyzstan')),
>+			('LA', _iso_3166(u"Lao People's Democratic Republic")), ('LV', _iso_3166(u'Latvia')),
>+			('LB', _iso_3166(u'Lebanon')), ('LS', _iso_3166(u'Lesotho')), ('LR', _iso_3166(u'Liberia')),
>+			('LY', _iso_3166(u'Libya')), ('LI', _iso_3166(u'Liechtenstein')),
>+			('LT', _iso_3166(u'Lithuania')), ('LU', _iso_3166(u'Luxembourg')), ('MO', _iso_3166(u'Macao')),
>+			('MK', _iso_3166(u'Macedonia, Republic of')), ('MG', _iso_3166(u'Madagascar')),
>+			('MW', _iso_3166(u'Malawi')), ('MY', _iso_3166(u'Malaysia')), ('MV', _iso_3166(u'Maldives')),
>+			('ML', _iso_3166(u'Mali')), ('MT', _iso_3166(u'Malta')), ('MH', _iso_3166(u'Marshall Islands')),
>+			('MQ', _iso_3166(u'Martinique')), ('MR', _iso_3166(u'Mauritania')),
>+			('MU', _iso_3166(u'Mauritius')), ('YT', _iso_3166(u'Mayotte')), ('MX', _iso_3166(u'Mexico')),
>+			('FM', _iso_3166(u'Micronesia, Federated States of')),
>+			('MD', _iso_3166(u'Moldova, Republic of')), ('MC', _iso_3166(u'Monaco')),
>+			('MN', _iso_3166(u'Mongolia')), ('ME', _iso_3166(u'Montenegro')),
>+			('MS', _iso_3166(u'Montserrat')), ('MA', _iso_3166(u'Morocco')),
>+			('MZ', _iso_3166(u'Mozambique')), ('MM', _iso_3166(u'Myanmar')), ('NA', _iso_3166(u'Namibia')),
>+			('NR', _iso_3166(u'Nauru')), ('NP', _iso_3166(u'Nepal')), ('NL', _iso_3166(u'Netherlands')),
>+			('NC', _iso_3166(u'New Caledonia')), ('NZ', _iso_3166(u'New Zealand')),
>+			('NI', _iso_3166(u'Nicaragua')), ('NE', _iso_3166(u'Niger')), ('NG', _iso_3166(u'Nigeria')),
>+			('NU', _iso_3166(u'Niue')), ('NF', _iso_3166(u'Norfolk Island')),
>+			('MP', _iso_3166(u'Northern Mariana Islands')), ('NO', _iso_3166(u'Norway')),
>+			('OM', _iso_3166(u'Oman')), ('PK', _iso_3166(u'Pakistan')), ('PW', _iso_3166(u'Palau')),
>+			('PS', _iso_3166(u'Palestine, State of')), ('PA', _iso_3166(u'Panama')),
>+			('PG', _iso_3166(u'Papua New Guinea')), ('PY', _iso_3166(u'Paraguay')),
>+			('PE', _iso_3166(u'Peru')), ('PH', _iso_3166(u'Philippines')), ('PN', _iso_3166(u'Pitcairn')),
>+			('PL', _iso_3166(u'Poland')), ('PT', _iso_3166(u'Portugal')), ('PR', _iso_3166(u'Puerto Rico')),
>+			('QA', _iso_3166(u'Qatar')), ('RE', _iso_3166(u'R\xe9union')), ('RO', _iso_3166(u'Romania')),
>+			('RU', _iso_3166(u'Russian Federation')), ('RW', _iso_3166(u'Rwanda')),
>+			('BL', _iso_3166(u'Saint Barth\xe9lemy')),
>+			('SH', _iso_3166(u'Saint Helena, Ascension and Tristan da Cunha')),
>+			('KN', _iso_3166(u'Saint Kitts and Nevis')), ('LC', _iso_3166(u'Saint Lucia')),
>+			('MF', _iso_3166(u'Saint Martin (French part)')),
>+			('PM', _iso_3166(u'Saint Pierre and Miquelon')),
>+			('VC', _iso_3166(u'Saint Vincent and the Grenadines')), ('WS', _iso_3166(u'Samoa')),
>+			('SM', _iso_3166(u'San Marino')), ('ST', _iso_3166(u'Sao Tome and Principe')),
>+			('SA', _iso_3166(u'Saudi Arabia')), ('SN', _iso_3166(u'Senegal')), ('RS', _iso_3166(u'Serbia')),
>+			('SC', _iso_3166(u'Seychelles')), ('SL', _iso_3166(u'Sierra Leone')),
>+			('SG', _iso_3166(u'Singapore')), ('SX', _iso_3166(u'Sint Maarten (Dutch part)')),
>+			('SK', _iso_3166(u'Slovakia')), ('SI', _iso_3166(u'Slovenia')),
>+			('SB', _iso_3166(u'Solomon Islands')), ('SO', _iso_3166(u'Somalia')),
>+			('ZA', _iso_3166(u'South Africa')),
>+			('GS', _iso_3166(u'South Georgia and the South Sandwich Islands')),
>+			('ES', _iso_3166(u'Spain')), ('LK', _iso_3166(u'Sri Lanka')), ('SD', _iso_3166(u'Sudan')),
>+			('SR', _iso_3166(u'Suriname')), ('SS', _iso_3166(u'South Sudan')),
>+			('SJ', _iso_3166(u'Svalbard and Jan Mayen')), ('SZ', _iso_3166(u'Swaziland')),
>+			('SE', _iso_3166(u'Sweden')), ('CH', _iso_3166(u'Switzerland')),
>+			('SY', _iso_3166(u'Syrian Arab Republic')),
>+			('TW', _iso_3166(u'Taiwan, Province of China')), ('TJ', _iso_3166(u'Tajikistan')),
>+			('TZ', _iso_3166(u'Tanzania, United Republic of')), ('TH', _iso_3166(u'Thailand')),
>+			('TL', _iso_3166(u'Timor-Leste')), ('TG', _iso_3166(u'Togo')), ('TK', _iso_3166(u'Tokelau')),
>+			('TO', _iso_3166(u'Tonga')), ('TT', _iso_3166(u'Trinidad and Tobago')),
>+			('TN', _iso_3166(u'Tunisia')), ('TR', _iso_3166(u'Turkey')), ('TM', _iso_3166(u'Turkmenistan')),
>+			('TC', _iso_3166(u'Turks and Caicos Islands')), ('TV', _iso_3166(u'Tuvalu')),
>+			('UG', _iso_3166(u'Uganda')), ('UA', _iso_3166(u'Ukraine')),
>+			('AE', _iso_3166(u'United Arab Emirates')), ('GB', _iso_3166(u'United Kingdom')),
>+			('US', _iso_3166(u'United States')),
>+			('UM', _iso_3166(u'United States Minor Outlying Islands')),
>+			('UY', _iso_3166(u'Uruguay')), ('UZ', _iso_3166(u'Uzbekistan')), ('VU', _iso_3166(u'Vanuatu')),
>+			('VE', _iso_3166(u'Venezuela, Bolivarian Republic of')), ('VN', _iso_3166(u'Viet Nam')),
>+			('VG', _iso_3166(u'Virgin Islands, British')),
>+			('VI', _iso_3166(u'Virgin Islands, U.S.')), ('WF', _iso_3166(u'Wallis and Futuna')),
>+			('EH', _iso_3166(u'Western Sahara')), ('YE', _iso_3166(u'Yemen')), ('ZM', _iso_3166(u'Zambia')),
>+			('ZW', _iso_3166(u'Zimbabwe'))]
>+		cls.choices.sort(cmp=locale.strcoll, key=itemgetter(1))
>+__register_choice_update_function(Country.update_choices)
>+Country.update_choices()
> 
> 
> if __name__ == '__main__':

Actions: View | Diff

Attachments on bug 39146: 7271 | 7281