[Python-modules-commits] r12669 - in packages/django-countries/trunk/debian (5 files)
fladi-guest at users.alioth.debian.org
fladi-guest at users.alioth.debian.org
Tue Apr 20 10:10:22 UTC 2010
Date: Tuesday, April 20, 2010 @ 10:10:15
Author: fladi-guest
Revision: 12669
Rework & split patches to make them more human-readable.
Fix lintian warning about long lines.
Added:
packages/django-countries/trunk/debian/patches/dont_include_flag_icons
packages/django-countries/trunk/debian/patches/use_iso_codes_package
Modified:
packages/django-countries/trunk/debian/control
packages/django-countries/trunk/debian/patches/series
Deleted:
packages/django-countries/trunk/debian/patches/debian-changes-1.0.3-1
Modified: packages/django-countries/trunk/debian/control
===================================================================
--- packages/django-countries/trunk/debian/control 2010-04-20 01:53:08 UTC (rev 12668)
+++ packages/django-countries/trunk/debian/control 2010-04-20 10:10:15 UTC (rev 12669)
@@ -17,6 +17,6 @@
Description: Provides a country field for Django models
A Django application which provides all ISO 3166-1 countries as choices for
use with forms, and a country field for models.
- It also includes a small template filter for getting country flags by ISO 3166-1
- alpha-2 country code.
+ It also includes a small template filter for getting country flags by
+ ISO 3166-1 alpha-2 country code.
Deleted: packages/django-countries/trunk/debian/patches/debian-changes-1.0.3-1
===================================================================
--- packages/django-countries/trunk/debian/patches/debian-changes-1.0.3-1 2010-04-20 01:53:08 UTC (rev 12668)
+++ packages/django-countries/trunk/debian/patches/debian-changes-1.0.3-1 2010-04-20 10:10:15 UTC (rev 12669)
@@ -1,838 +0,0 @@
-Description: Upstream changes introduced in version 1.0.2-1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- django-countries (1.0.2-1) unstable; urgency=low
- .
- * Initial release (Closes: #576262)
- .
- The person named in the Author field signed this changelog entry.
-Author: Fladischer Michael <FladischerMichael at fladi.at>
-Bug-Debian: http://bugs.debian.org/576262
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- django-countries-1.0.2.orig/setup.py
-+++ django-countries-1.0.2/setup.py
-@@ -25,7 +25,6 @@ setup(name='django-countries',
- author_email='smileychris at gmail.com',
- url='http://bitbucket.org/smileychris/django-countries/',
- packages=find_packages(),
-- package_data={'django_countries': ['bin/*.py', 'media/flags/*.gif']},
- # titlecase PYPI is broken, copied the module directly for now (in /bin)
- # requires=['titlecase'],
- classifiers=[
---- django-countries-1.0.2.orig/django_countries/countries.py
-+++ django-countries-1.0.2/django_countries/countries.py
-@@ -1,766 +1,18 @@
--from django.utils.translation import ugettext_lazy as _
-+from gettext import dgettext as _
-
--# Nicely titled (and translatable) country names.
--COUNTRIES = (
-- ('AF', _(u'Afghanistan')),
-- ('AX', _(u'\xc5land Islands')),
-- ('AL', _(u'Albania')),
-- ('DZ', _(u'Algeria')),
-- ('AS', _(u'American Samoa')),
-- ('AD', _(u'Andorra')),
-- ('AO', _(u'Angola')),
-- ('AI', _(u'Anguilla')),
-- ('AQ', _(u'Antarctica')),
-- ('AG', _(u'Antigua and Barbuda')),
-- ('AR', _(u'Argentina')),
-- ('AM', _(u'Armenia')),
-- ('AW', _(u'Aruba')),
-- ('AU', _(u'Australia')),
-- ('AT', _(u'Austria')),
-- ('AZ', _(u'Azerbaijan')),
-- ('BS', _(u'Bahamas')),
-- ('BH', _(u'Bahrain')),
-- ('BD', _(u'Bangladesh')),
-- ('BB', _(u'Barbados')),
-- ('BY', _(u'Belarus')),
-- ('BE', _(u'Belgium')),
-- ('BZ', _(u'Belize')),
-- ('BJ', _(u'Benin')),
-- ('BM', _(u'Bermuda')),
-- ('BT', _(u'Bhutan')),
-- ('BO', _(u'Bolivia, Plurinational State of')),
-- ('BA', _(u'Bosnia and Herzegovina')),
-- ('BW', _(u'Botswana')),
-- ('BV', _(u'Bouvet Island')),
-- ('BR', _(u'Brazil')),
-- ('IO', _(u'British Indian Ocean Territory')),
-- ('BN', _(u'Brunei Darussalam')),
-- ('BG', _(u'Bulgaria')),
-- ('BF', _(u'Burkina Faso')),
-- ('BI', _(u'Burundi')),
-- ('KH', _(u'Cambodia')),
-- ('CM', _(u'Cameroon')),
-- ('CA', _(u'Canada')),
-- ('CV', _(u'Cape Verde')),
-- ('KY', _(u'Cayman Islands')),
-- ('CF', _(u'Central African Republic')),
-- ('TD', _(u'Chad')),
-- ('CL', _(u'Chile')),
-- ('CN', _(u'China')),
-- ('CX', _(u'Christmas Island')),
-- ('CC', _(u'Cocos (Keeling) Islands')),
-- ('CO', _(u'Colombia')),
-- ('KM', _(u'Comoros')),
-- ('CG', _(u'Congo')),
-- ('CD', _(u'Congo, The Democratic Republic of the')),
-- ('CK', _(u'Cook Islands')),
-- ('CR', _(u'Costa Rica')),
-- ('CI', _(u"C\xf4te D'ivoire")),
-- ('HR', _(u'Croatia')),
-- ('CU', _(u'Cuba')),
-- ('CY', _(u'Cyprus')),
-- ('CZ', _(u'Czech Republic')),
-- ('DK', _(u'Denmark')),
-- ('DJ', _(u'Djibouti')),
-- ('DM', _(u'Dominica')),
-- ('DO', _(u'Dominican Republic')),
-- ('EC', _(u'Ecuador')),
-- ('EG', _(u'Egypt')),
-- ('SV', _(u'El Salvador')),
-- ('GQ', _(u'Equatorial Guinea')),
-- ('ER', _(u'Eritrea')),
-- ('EE', _(u'Estonia')),
-- ('ET', _(u'Ethiopia')),
-- ('FK', _(u'Falkland Islands (Malvinas)')),
-- ('FO', _(u'Faroe Islands')),
-- ('FJ', _(u'Fiji')),
-- ('FI', _(u'Finland')),
-- ('FR', _(u'France')),
-- ('GF', _(u'French Guiana')),
-- ('PF', _(u'French Polynesia')),
-- ('TF', _(u'French Southern Territories')),
-- ('GA', _(u'Gabon')),
-- ('GM', _(u'Gambia')),
-- ('GE', _(u'Georgia')),
-- ('DE', _(u'Germany')),
-- ('GH', _(u'Ghana')),
-- ('GI', _(u'Gibraltar')),
-- ('GR', _(u'Greece')),
-- ('GL', _(u'Greenland')),
-- ('GD', _(u'Grenada')),
-- ('GP', _(u'Guadeloupe')),
-- ('GU', _(u'Guam')),
-- ('GT', _(u'Guatemala')),
-- ('GG', _(u'Guernsey')),
-- ('GN', _(u'Guinea')),
-- ('GW', _(u'Guinea-bissau')),
-- ('GY', _(u'Guyana')),
-- ('HT', _(u'Haiti')),
-- ('HM', _(u'Heard Island and McDonald Islands')),
-- ('VA', _(u'Holy See (Vatican City State)')),
-- ('HN', _(u'Honduras')),
-- ('HK', _(u'Hong Kong')),
-- ('HU', _(u'Hungary')),
-- ('IS', _(u'Iceland')),
-- ('IN', _(u'India')),
-- ('ID', _(u'Indonesia')),
-- ('IR', _(u'Iran, Islamic Republic of')),
-- ('IQ', _(u'Iraq')),
-- ('IE', _(u'Ireland')),
-- ('IM', _(u'Isle of Man')),
-- ('IL', _(u'Israel')),
-- ('IT', _(u'Italy')),
-- ('JM', _(u'Jamaica')),
-- ('JP', _(u'Japan')),
-- ('JE', _(u'Jersey')),
-- ('JO', _(u'Jordan')),
-- ('KZ', _(u'Kazakhstan')),
-- ('KE', _(u'Kenya')),
-- ('KI', _(u'Kiribati')),
-- ('KP', _(u"Korea, Democratic People's Republic of")),
-- ('KR', _(u'Korea, Republic of')),
-- ('KW', _(u'Kuwait')),
-- ('KG', _(u'Kyrgyzstan')),
-- ('LA', _(u"Lao People's Democratic Republic")),
-- ('LV', _(u'Latvia')),
-- ('LB', _(u'Lebanon')),
-- ('LS', _(u'Lesotho')),
-- ('LR', _(u'Liberia')),
-- ('LY', _(u'Libyan Arab Jamahiriya')),
-- ('LI', _(u'Liechtenstein')),
-- ('LT', _(u'Lithuania')),
-- ('LU', _(u'Luxembourg')),
-- ('MO', _(u'Macao')),
-- ('MK', _(u'Macedonia, The Former Yugoslav Republic of')),
-- ('MG', _(u'Madagascar')),
-- ('MW', _(u'Malawi')),
-- ('MY', _(u'Malaysia')),
-- ('MV', _(u'Maldives')),
-- ('ML', _(u'Mali')),
-- ('MT', _(u'Malta')),
-- ('MH', _(u'Marshall Islands')),
-- ('MQ', _(u'Martinique')),
-- ('MR', _(u'Mauritania')),
-- ('MU', _(u'Mauritius')),
-- ('YT', _(u'Mayotte')),
-- ('MX', _(u'Mexico')),
-- ('FM', _(u'Micronesia, Federated States of')),
-- ('MD', _(u'Moldova, Republic of')),
-- ('MC', _(u'Monaco')),
-- ('MN', _(u'Mongolia')),
-- ('ME', _(u'Montenegro')),
-- ('MS', _(u'Montserrat')),
-- ('MA', _(u'Morocco')),
-- ('MZ', _(u'Mozambique')),
-- ('MM', _(u'Myanmar')),
-- ('NA', _(u'Namibia')),
-- ('NR', _(u'Nauru')),
-- ('NP', _(u'Nepal')),
-- ('NL', _(u'Netherlands')),
-- ('AN', _(u'Netherlands Antilles')),
-- ('NC', _(u'New Caledonia')),
-- ('NZ', _(u'New Zealand')),
-- ('NI', _(u'Nicaragua')),
-- ('NE', _(u'Niger')),
-- ('NG', _(u'Nigeria')),
-- ('NU', _(u'Niue')),
-- ('NF', _(u'Norfolk Island')),
-- ('MP', _(u'Northern Mariana Islands')),
-- ('NO', _(u'Norway')),
-- ('OM', _(u'Oman')),
-- ('PK', _(u'Pakistan')),
-- ('PW', _(u'Palau')),
-- ('PS', _(u'Palestinian Territory, Occupied')),
-- ('PA', _(u'Panama')),
-- ('PG', _(u'Papua New Guinea')),
-- ('PY', _(u'Paraguay')),
-- ('PE', _(u'Peru')),
-- ('PH', _(u'Philippines')),
-- ('PN', _(u'Pitcairn')),
-- ('PL', _(u'Poland')),
-- ('PT', _(u'Portugal')),
-- ('PR', _(u'Puerto Rico')),
-- ('QA', _(u'Qatar')),
-- ('RE', _(u'R\xe9union')),
-- ('RO', _(u'Romania')),
-- ('RU', _(u'Russian Federation')),
-- ('RW', _(u'Rwanda')),
-- ('BL', _(u'Saint Barth\xe9lemy')),
-- ('SH', _(u'Saint Helena')),
-- ('KN', _(u'Saint Kitts and Nevis')),
-- ('LC', _(u'Saint Lucia')),
-- ('MF', _(u'Saint Martin')),
-- ('PM', _(u'Saint Pierre and Miquelon')),
-- ('VC', _(u'Saint Vincent and the Grenadines')),
-- ('WS', _(u'Samoa')),
-- ('SM', _(u'San Marino')),
-- ('ST', _(u'Sao Tome and Principe')),
-- ('SA', _(u'Saudi Arabia')),
-- ('SN', _(u'Senegal')),
-- ('RS', _(u'Serbia')),
-- ('SC', _(u'Seychelles')),
-- ('SL', _(u'Sierra Leone')),
-- ('SG', _(u'Singapore')),
-- ('SK', _(u'Slovakia')),
-- ('SI', _(u'Slovenia')),
-- ('SB', _(u'Solomon Islands')),
-- ('SO', _(u'Somalia')),
-- ('ZA', _(u'South Africa')),
-- ('GS', _(u'South Georgia and the South Sandwich Islands')),
-- ('ES', _(u'Spain')),
-- ('LK', _(u'Sri Lanka')),
-- ('SD', _(u'Sudan')),
-- ('SR', _(u'Suriname')),
-- ('SJ', _(u'Svalbard and Jan Mayen')),
-- ('SZ', _(u'Swaziland')),
-- ('SE', _(u'Sweden')),
-- ('CH', _(u'Switzerland')),
-- ('SY', _(u'Syrian Arab Republic')),
-- ('TW', _(u'Taiwan, Province of China')),
-- ('TJ', _(u'Tajikistan')),
-- ('TZ', _(u'Tanzania, United Republic of')),
-- ('TH', _(u'Thailand')),
-- ('TL', _(u'Timor-leste')),
-- ('TG', _(u'Togo')),
-- ('TK', _(u'Tokelau')),
-- ('TO', _(u'Tonga')),
-- ('TT', _(u'Trinidad and Tobago')),
-- ('TN', _(u'Tunisia')),
-- ('TR', _(u'Turkey')),
-- ('TM', _(u'Turkmenistan')),
-- ('TC', _(u'Turks and Caicos Islands')),
-- ('TV', _(u'Tuvalu')),
-- ('UG', _(u'Uganda')),
-- ('UA', _(u'Ukraine')),
-- ('AE', _(u'United Arab Emirates')),
-- ('GB', _(u'United Kingdom')),
-- ('US', _(u'United States')),
-- ('UM', _(u'United States Minor Outlying Islands')),
-- ('UY', _(u'Uruguay')),
-- ('UZ', _(u'Uzbekistan')),
-- ('VU', _(u'Vanuatu')),
-- ('VE', _(u'Venezuela, Bolivarian Republic of')),
-- ('VN', _(u'Viet Nam')),
-- ('VG', _(u'Virgin Islands, British')),
-- ('VI', _(u'Virgin Islands, U.s.')),
-- ('WF', _(u'Wallis and Futuna')),
-- ('EH', _(u'Western Sahara')),
-- ('YE', _(u'Yemen')),
-- ('ZM', _(u'Zambia')),
-- ('ZW', _(u'Zimbabwe')),
--)
-+from xml.dom.minidom import parse
-
--# Nicely titled country names with duplicates for those which contain a comma
--# (containing the non-comma'd version).
--COUNTRIES_PLUS = (
-- ('AF', _(u'Afghanistan')),
-- ('AX', _(u'\xc5land Islands')),
-- ('AL', _(u'Albania')),
-- ('DZ', _(u'Algeria')),
-- ('AS', _(u'American Samoa')),
-- ('AD', _(u'Andorra')),
-- ('AO', _(u'Angola')),
-- ('AI', _(u'Anguilla')),
-- ('AQ', _(u'Antarctica')),
-- ('AG', _(u'Antigua and Barbuda')),
-- ('AR', _(u'Argentina')),
-- ('AM', _(u'Armenia')),
-- ('AW', _(u'Aruba')),
-- ('AU', _(u'Australia')),
-- ('AT', _(u'Austria')),
-- ('AZ', _(u'Azerbaijan')),
-- ('BS', _(u'Bahamas')),
-- ('BH', _(u'Bahrain')),
-- ('BD', _(u'Bangladesh')),
-- ('BB', _(u'Barbados')),
-- ('BY', _(u'Belarus')),
-- ('BE', _(u'Belgium')),
-- ('BZ', _(u'Belize')),
-- ('BJ', _(u'Benin')),
-- ('BM', _(u'Bermuda')),
-- ('BT', _(u'Bhutan')),
-- ('VE', _(u'Bolivarian Republic of Venezuela')),
-- ('BO', _(u'Bolivia, Plurinational State of')),
-- ('BA', _(u'Bosnia and Herzegovina')),
-- ('BW', _(u'Botswana')),
-- ('BV', _(u'Bouvet Island')),
-- ('BR', _(u'Brazil')),
-- ('IO', _(u'British Indian Ocean Territory')),
-- ('VG', _(u'British Virgin Islands')),
-- ('BN', _(u'Brunei Darussalam')),
-- ('BG', _(u'Bulgaria')),
-- ('BF', _(u'Burkina Faso')),
-- ('BI', _(u'Burundi')),
-- ('KH', _(u'Cambodia')),
-- ('CM', _(u'Cameroon')),
-- ('CA', _(u'Canada')),
-- ('CV', _(u'Cape Verde')),
-- ('KY', _(u'Cayman Islands')),
-- ('CF', _(u'Central African Republic')),
-- ('TD', _(u'Chad')),
-- ('CL', _(u'Chile')),
-- ('CN', _(u'China')),
-- ('CX', _(u'Christmas Island')),
-- ('CC', _(u'Cocos (Keeling) Islands')),
-- ('CO', _(u'Colombia')),
-- ('KM', _(u'Comoros')),
-- ('CG', _(u'Congo')),
-- ('CD', _(u'Congo, The Democratic Republic of the')),
-- ('CK', _(u'Cook Islands')),
-- ('CR', _(u'Costa Rica')),
-- ('CI', _(u"C\xf4te D'ivoire")),
-- ('HR', _(u'Croatia')),
-- ('CU', _(u'Cuba')),
-- ('CY', _(u'Cyprus')),
-- ('CZ', _(u'Czech Republic')),
-- ('KP', _(u"Democratic People's Republic of Korea")),
-- ('DK', _(u'Denmark')),
-- ('DJ', _(u'Djibouti')),
-- ('DM', _(u'Dominica')),
-- ('DO', _(u'Dominican Republic')),
-- ('EC', _(u'Ecuador')),
-- ('EG', _(u'Egypt')),
-- ('SV', _(u'El Salvador')),
-- ('GQ', _(u'Equatorial Guinea')),
-- ('ER', _(u'Eritrea')),
-- ('EE', _(u'Estonia')),
-- ('ET', _(u'Ethiopia')),
-- ('FK', _(u'Falkland Islands (Malvinas)')),
-- ('FO', _(u'Faroe Islands')),
-- ('FM', _(u'Federated States of Micronesia')),
-- ('FJ', _(u'Fiji')),
-- ('FI', _(u'Finland')),
-- ('FR', _(u'France')),
-- ('GF', _(u'French Guiana')),
-- ('PF', _(u'French Polynesia')),
-- ('TF', _(u'French Southern Territories')),
-- ('GA', _(u'Gabon')),
-- ('GM', _(u'Gambia')),
-- ('GE', _(u'Georgia')),
-- ('DE', _(u'Germany')),
-- ('GH', _(u'Ghana')),
-- ('GI', _(u'Gibraltar')),
-- ('GR', _(u'Greece')),
-- ('GL', _(u'Greenland')),
-- ('GD', _(u'Grenada')),
-- ('GP', _(u'Guadeloupe')),
-- ('GU', _(u'Guam')),
-- ('GT', _(u'Guatemala')),
-- ('GG', _(u'Guernsey')),
-- ('GN', _(u'Guinea')),
-- ('GW', _(u'Guinea-bissau')),
-- ('GY', _(u'Guyana')),
-- ('HT', _(u'Haiti')),
-- ('HM', _(u'Heard Island and McDonald Islands')),
-- ('VA', _(u'Holy See (Vatican City State)')),
-- ('HN', _(u'Honduras')),
-- ('HK', _(u'Hong Kong')),
-- ('HU', _(u'Hungary')),
-- ('IS', _(u'Iceland')),
-- ('IN', _(u'India')),
-- ('ID', _(u'Indonesia')),
-- ('IR', _(u'Iran, Islamic Republic of')),
-- ('IQ', _(u'Iraq')),
-- ('IE', _(u'Ireland')),
-- ('IR', _(u'Islamic Republic of Iran')),
-- ('IM', _(u'Isle of Man')),
-- ('IL', _(u'Israel')),
-- ('IT', _(u'Italy')),
-- ('JM', _(u'Jamaica')),
-- ('JP', _(u'Japan')),
-- ('JE', _(u'Jersey')),
-- ('JO', _(u'Jordan')),
-- ('KZ', _(u'Kazakhstan')),
-- ('KE', _(u'Kenya')),
-- ('KI', _(u'Kiribati')),
-- ('KP', _(u"Korea, Democratic People's Republic of")),
-- ('KR', _(u'Korea, Republic of')),
-- ('KW', _(u'Kuwait')),
-- ('KG', _(u'Kyrgyzstan')),
-- ('LA', _(u"Lao People's Democratic Republic")),
-- ('LV', _(u'Latvia')),
-- ('LB', _(u'Lebanon')),
-- ('LS', _(u'Lesotho')),
-- ('LR', _(u'Liberia')),
-- ('LY', _(u'Libyan Arab Jamahiriya')),
-- ('LI', _(u'Liechtenstein')),
-- ('LT', _(u'Lithuania')),
-- ('LU', _(u'Luxembourg')),
-- ('MO', _(u'Macao')),
-- ('MK', _(u'Macedonia, The Former Yugoslav Republic of')),
-- ('MG', _(u'Madagascar')),
-- ('MW', _(u'Malawi')),
-- ('MY', _(u'Malaysia')),
-- ('MV', _(u'Maldives')),
-- ('ML', _(u'Mali')),
-- ('MT', _(u'Malta')),
-- ('MH', _(u'Marshall Islands')),
-- ('MQ', _(u'Martinique')),
-- ('MR', _(u'Mauritania')),
-- ('MU', _(u'Mauritius')),
-- ('YT', _(u'Mayotte')),
-- ('MX', _(u'Mexico')),
-- ('FM', _(u'Micronesia, Federated States of')),
-- ('MD', _(u'Moldova, Republic of')),
-- ('MC', _(u'Monaco')),
-- ('MN', _(u'Mongolia')),
-- ('ME', _(u'Montenegro')),
-- ('MS', _(u'Montserrat')),
-- ('MA', _(u'Morocco')),
-- ('MZ', _(u'Mozambique')),
-- ('MM', _(u'Myanmar')),
-- ('NA', _(u'Namibia')),
-- ('NR', _(u'Nauru')),
-- ('NP', _(u'Nepal')),
-- ('NL', _(u'Netherlands')),
-- ('AN', _(u'Netherlands Antilles')),
-- ('NC', _(u'New Caledonia')),
-- ('NZ', _(u'New Zealand')),
-- ('NI', _(u'Nicaragua')),
-- ('NE', _(u'Niger')),
-- ('NG', _(u'Nigeria')),
-- ('NU', _(u'Niue')),
-- ('NF', _(u'Norfolk Island')),
-- ('MP', _(u'Northern Mariana Islands')),
-- ('NO', _(u'Norway')),
-- ('PS', _(u'Occupied Palestinian Territory')),
-- ('OM', _(u'Oman')),
-- ('PK', _(u'Pakistan')),
-- ('PW', _(u'Palau')),
-- ('PS', _(u'Palestinian Territory, Occupied')),
-- ('PA', _(u'Panama')),
-- ('PG', _(u'Papua New Guinea')),
-- ('PY', _(u'Paraguay')),
-- ('PE', _(u'Peru')),
-- ('PH', _(u'Philippines')),
-- ('PN', _(u'Pitcairn')),
-- ('BO', _(u'Plurinational State of Bolivia')),
-- ('PL', _(u'Poland')),
-- ('PT', _(u'Portugal')),
-- ('TW', _(u'Province of China Taiwan')),
-- ('PR', _(u'Puerto Rico')),
-- ('QA', _(u'Qatar')),
-- ('KR', _(u'Republic of Korea')),
-- ('MD', _(u'Republic of Moldova')),
-- ('RE', _(u'R\xe9union')),
-- ('RO', _(u'Romania')),
-- ('RU', _(u'Russian Federation')),
-- ('RW', _(u'Rwanda')),
-- ('BL', _(u'Saint Barth\xe9lemy')),
-- ('SH', _(u'Saint Helena')),
-- ('KN', _(u'Saint Kitts and Nevis')),
-- ('LC', _(u'Saint Lucia')),
-- ('MF', _(u'Saint Martin')),
-- ('PM', _(u'Saint Pierre and Miquelon')),
-- ('VC', _(u'Saint Vincent and the Grenadines')),
-- ('WS', _(u'Samoa')),
-- ('SM', _(u'San Marino')),
-- ('ST', _(u'Sao Tome and Principe')),
-- ('SA', _(u'Saudi Arabia')),
-- ('SN', _(u'Senegal')),
-- ('RS', _(u'Serbia')),
-- ('SC', _(u'Seychelles')),
-- ('SL', _(u'Sierra Leone')),
-- ('SG', _(u'Singapore')),
-- ('SK', _(u'Slovakia')),
-- ('SI', _(u'Slovenia')),
-- ('SB', _(u'Solomon Islands')),
-- ('SO', _(u'Somalia')),
-- ('ZA', _(u'South Africa')),
-- ('GS', _(u'South Georgia and the South Sandwich Islands')),
-- ('ES', _(u'Spain')),
-- ('LK', _(u'Sri Lanka')),
-- ('SD', _(u'Sudan')),
-- ('SR', _(u'Suriname')),
-- ('SJ', _(u'Svalbard and Jan Mayen')),
-- ('SZ', _(u'Swaziland')),
-- ('SE', _(u'Sweden')),
-- ('CH', _(u'Switzerland')),
-- ('SY', _(u'Syrian Arab Republic')),
-- ('TW', _(u'Taiwan, Province of China')),
-- ('TJ', _(u'Tajikistan')),
-- ('TZ', _(u'Tanzania, United Republic of')),
-- ('TH', _(u'Thailand')),
-- ('CD', _(u'The Democratic Republic of the Congo')),
-- ('MK', _(u'The Former Yugoslav Republic of Macedonia')),
-- ('TL', _(u'Timor-leste')),
-- ('TG', _(u'Togo')),
-- ('TK', _(u'Tokelau')),
-- ('TO', _(u'Tonga')),
-- ('TT', _(u'Trinidad and Tobago')),
-- ('TN', _(u'Tunisia')),
-- ('TR', _(u'Turkey')),
-- ('TM', _(u'Turkmenistan')),
-- ('TC', _(u'Turks and Caicos Islands')),
-- ('TV', _(u'Tuvalu')),
-- ('VI', _(u'U.s. Virgin Islands')),
-- ('UG', _(u'Uganda')),
-- ('UA', _(u'Ukraine')),
-- ('AE', _(u'United Arab Emirates')),
-- ('GB', _(u'United Kingdom')),
-- ('TZ', _(u'United Republic of Tanzania')),
-- ('US', _(u'United States')),
-- ('UM', _(u'United States Minor Outlying Islands')),
-- ('UY', _(u'Uruguay')),
-- ('UZ', _(u'Uzbekistan')),
-- ('VU', _(u'Vanuatu')),
-- ('VE', _(u'Venezuela, Bolivarian Republic of')),
-- ('VN', _(u'Viet Nam')),
-- ('VG', _(u'Virgin Islands, British')),
-- ('VI', _(u'Virgin Islands, U.s.')),
-- ('WF', _(u'Wallis and Futuna')),
-- ('EH', _(u'Western Sahara')),
-- ('YE', _(u'Yemen')),
-- ('ZM', _(u'Zambia')),
-- ('ZW', _(u'Zimbabwe')),
--)
-+from django_countries import settings
-+
-+# Nicely titled (and translated) country names.
-+COUNTRIES = []
-+COUNTRIES_PLUS = []
-+OFFICIAL_COUNTRIES = {}
-+
-+for node in parse(settings.ISO_XML).getElementsByTagName('iso_3166_entry'):
-+ _code = node.getAttribute('alpha_2_code')
-+ _name = _('iso_3166', node.getAttribute('name'))
-+ COUNTRIES.append((_code, _name))
-+ COUNTRIES_PLUS.append((_code, _name))
-+ OFFICIAL_COUNTRIES[_code.upper()] = _name.upper()
-
--# Official capitalized country names.
--OFFICIAL_COUNTRIES = {
-- 'AF': u'AFGHANISTAN',
-- 'AX': u'\xc5LAND ISLANDS',
-- 'AL': u'ALBANIA',
-- 'DZ': u'ALGERIA',
-- 'AS': u'AMERICAN SAMOA',
-- 'AD': u'ANDORRA',
-- 'AO': u'ANGOLA',
-- 'AI': u'ANGUILLA',
-- 'AQ': u'ANTARCTICA',
-- 'AG': u'ANTIGUA AND BARBUDA',
-- 'AR': u'ARGENTINA',
-- 'AM': u'ARMENIA',
-- 'AW': u'ARUBA',
-- 'AU': u'AUSTRALIA',
-- 'AT': u'AUSTRIA',
-- 'AZ': u'AZERBAIJAN',
-- 'BS': u'BAHAMAS',
-- 'BH': u'BAHRAIN',
-- 'BD': u'BANGLADESH',
-- 'BB': u'BARBADOS',
-- 'BY': u'BELARUS',
-- 'BE': u'BELGIUM',
-- 'BZ': u'BELIZE',
-- 'BJ': u'BENIN',
-- 'BM': u'BERMUDA',
-- 'BT': u'BHUTAN',
-- 'BO': u'BOLIVIA, PLURINATIONAL STATE OF',
-- 'BA': u'BOSNIA AND HERZEGOVINA',
-- 'BW': u'BOTSWANA',
-- 'BV': u'BOUVET ISLAND',
-- 'BR': u'BRAZIL',
-- 'IO': u'BRITISH INDIAN OCEAN TERRITORY',
-- 'BN': u'BRUNEI DARUSSALAM',
-- 'BG': u'BULGARIA',
-- 'BF': u'BURKINA FASO',
-- 'BI': u'BURUNDI',
-- 'KH': u'CAMBODIA',
-- 'CM': u'CAMEROON',
-- 'CA': u'CANADA',
-- 'CV': u'CAPE VERDE',
-- 'KY': u'CAYMAN ISLANDS',
-- 'CF': u'CENTRAL AFRICAN REPUBLIC',
-- 'TD': u'CHAD',
-- 'CL': u'CHILE',
-- 'CN': u'CHINA',
-- 'CX': u'CHRISTMAS ISLAND',
-- 'CC': u'COCOS (KEELING) ISLANDS',
-- 'CO': u'COLOMBIA',
-- 'KM': u'COMOROS',
-- 'CG': u'CONGO',
-- 'CD': u'CONGO, THE DEMOCRATIC REPUBLIC OF THE',
-- 'CK': u'COOK ISLANDS',
-- 'CR': u'COSTA RICA',
-- 'CI': u"C\xd4TE D'IVOIRE",
-- 'HR': u'CROATIA',
-- 'CU': u'CUBA',
-- 'CY': u'CYPRUS',
-- 'CZ': u'CZECH REPUBLIC',
-- 'DK': u'DENMARK',
-- 'DJ': u'DJIBOUTI',
-- 'DM': u'DOMINICA',
-- 'DO': u'DOMINICAN REPUBLIC',
-- 'EC': u'ECUADOR',
-- 'EG': u'EGYPT',
-- 'SV': u'EL SALVADOR',
-- 'GQ': u'EQUATORIAL GUINEA',
-- 'ER': u'ERITREA',
-- 'EE': u'ESTONIA',
-- 'ET': u'ETHIOPIA',
-- 'FK': u'FALKLAND ISLANDS (MALVINAS)',
-- 'FO': u'FAROE ISLANDS',
-- 'FJ': u'FIJI',
-- 'FI': u'FINLAND',
-- 'FR': u'FRANCE',
-- 'GF': u'FRENCH GUIANA',
-- 'PF': u'FRENCH POLYNESIA',
-- 'TF': u'FRENCH SOUTHERN TERRITORIES',
-- 'GA': u'GABON',
-- 'GM': u'GAMBIA',
-- 'GE': u'GEORGIA',
-- 'DE': u'GERMANY',
-- 'GH': u'GHANA',
-- 'GI': u'GIBRALTAR',
-- 'GR': u'GREECE',
-- 'GL': u'GREENLAND',
-- 'GD': u'GRENADA',
-- 'GP': u'GUADELOUPE',
-- 'GU': u'GUAM',
-- 'GT': u'GUATEMALA',
-- 'GG': u'GUERNSEY',
-- 'GN': u'GUINEA',
-- 'GW': u'GUINEA-BISSAU',
-- 'GY': u'GUYANA',
-- 'HT': u'HAITI',
-- 'HM': u'HEARD ISLAND AND MCDONALD ISLANDS',
-- 'VA': u'HOLY SEE (VATICAN CITY STATE)',
-- 'HN': u'HONDURAS',
-- 'HK': u'HONG KONG',
-- 'HU': u'HUNGARY',
-- 'IS': u'ICELAND',
-- 'IN': u'INDIA',
-- 'ID': u'INDONESIA',
-- 'IR': u'IRAN, ISLAMIC REPUBLIC OF',
-- 'IQ': u'IRAQ',
-- 'IE': u'IRELAND',
-- 'IM': u'ISLE OF MAN',
-- 'IL': u'ISRAEL',
-- 'IT': u'ITALY',
-- 'JM': u'JAMAICA',
-- 'JP': u'JAPAN',
-- 'JE': u'JERSEY',
-- 'JO': u'JORDAN',
-- 'KZ': u'KAZAKHSTAN',
-- 'KE': u'KENYA',
-- 'KI': u'KIRIBATI',
-- 'KP': u"KOREA, DEMOCRATIC PEOPLE'S REPUBLIC OF",
-- 'KR': u'KOREA, REPUBLIC OF',
-- 'KW': u'KUWAIT',
-- 'KG': u'KYRGYZSTAN',
-- 'LA': u"LAO PEOPLE'S DEMOCRATIC REPUBLIC",
-- 'LV': u'LATVIA',
-- 'LB': u'LEBANON',
-- 'LS': u'LESOTHO',
-- 'LR': u'LIBERIA',
-- 'LY': u'LIBYAN ARAB JAMAHIRIYA',
-- 'LI': u'LIECHTENSTEIN',
-- 'LT': u'LITHUANIA',
-- 'LU': u'LUXEMBOURG',
-- 'MO': u'MACAO',
-- 'MK': u'MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF',
-- 'MG': u'MADAGASCAR',
-- 'MW': u'MALAWI',
-- 'MY': u'MALAYSIA',
-- 'MV': u'MALDIVES',
-- 'ML': u'MALI',
-- 'MT': u'MALTA',
-- 'MH': u'MARSHALL ISLANDS',
-- 'MQ': u'MARTINIQUE',
-- 'MR': u'MAURITANIA',
-- 'MU': u'MAURITIUS',
-- 'YT': u'MAYOTTE',
-- 'MX': u'MEXICO',
-- 'FM': u'MICRONESIA, FEDERATED STATES OF',
-- 'MD': u'MOLDOVA, REPUBLIC OF',
-- 'MC': u'MONACO',
-- 'MN': u'MONGOLIA',
-- 'ME': u'MONTENEGRO',
-- 'MS': u'MONTSERRAT',
-- 'MA': u'MOROCCO',
-- 'MZ': u'MOZAMBIQUE',
-- 'MM': u'MYANMAR',
-- 'NA': u'NAMIBIA',
-- 'NR': u'NAURU',
-- 'NP': u'NEPAL',
-- 'NL': u'NETHERLANDS',
-- 'AN': u'NETHERLANDS ANTILLES',
-- 'NC': u'NEW CALEDONIA',
-- 'NZ': u'NEW ZEALAND',
-- 'NI': u'NICARAGUA',
-- 'NE': u'NIGER',
-- 'NG': u'NIGERIA',
-- 'NU': u'NIUE',
-- 'NF': u'NORFOLK ISLAND',
-- 'MP': u'NORTHERN MARIANA ISLANDS',
-- 'NO': u'NORWAY',
-- 'OM': u'OMAN',
-- 'PK': u'PAKISTAN',
-- 'PW': u'PALAU',
-- 'PS': u'PALESTINIAN TERRITORY, OCCUPIED',
-- 'PA': u'PANAMA',
-- 'PG': u'PAPUA NEW GUINEA',
-- 'PY': u'PARAGUAY',
-- 'PE': u'PERU',
-- 'PH': u'PHILIPPINES',
-- 'PN': u'PITCAIRN',
-- 'PL': u'POLAND',
-- 'PT': u'PORTUGAL',
-- 'PR': u'PUERTO RICO',
-- 'QA': u'QATAR',
-- 'RE': u'R\xc9UNION',
-- 'RO': u'ROMANIA',
-- 'RU': u'RUSSIAN FEDERATION',
-- 'RW': u'RWANDA',
-- 'BL': u'SAINT BARTH\xc9LEMY',
-- 'SH': u'SAINT HELENA',
-- 'KN': u'SAINT KITTS AND NEVIS',
-- 'LC': u'SAINT LUCIA',
-- 'MF': u'SAINT MARTIN',
-- 'PM': u'SAINT PIERRE AND MIQUELON',
-- 'VC': u'SAINT VINCENT AND THE GRENADINES',
-- 'WS': u'SAMOA',
-- 'SM': u'SAN MARINO',
-- 'ST': u'SAO TOME AND PRINCIPE',
-- 'SA': u'SAUDI ARABIA',
-- 'SN': u'SENEGAL',
-- 'RS': u'SERBIA',
-- 'SC': u'SEYCHELLES',
-- 'SL': u'SIERRA LEONE',
-- 'SG': u'SINGAPORE',
-- 'SK': u'SLOVAKIA',
-- 'SI': u'SLOVENIA',
-- 'SB': u'SOLOMON ISLANDS',
-- 'SO': u'SOMALIA',
-- 'ZA': u'SOUTH AFRICA',
-- 'GS': u'SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS',
-- 'ES': u'SPAIN',
-- 'LK': u'SRI LANKA',
-- 'SD': u'SUDAN',
-- 'SR': u'SURINAME',
-- 'SJ': u'SVALBARD AND JAN MAYEN',
-- 'SZ': u'SWAZILAND',
-- 'SE': u'SWEDEN',
-- 'CH': u'SWITZERLAND',
-- 'SY': u'SYRIAN ARAB REPUBLIC',
-- 'TW': u'TAIWAN, PROVINCE OF CHINA',
-- 'TJ': u'TAJIKISTAN',
-- 'TZ': u'TANZANIA, UNITED REPUBLIC OF',
-- 'TH': u'THAILAND',
-- 'TL': u'TIMOR-LESTE',
-- 'TG': u'TOGO',
-- 'TK': u'TOKELAU',
-- 'TO': u'TONGA',
-- 'TT': u'TRINIDAD AND TOBAGO',
-- 'TN': u'TUNISIA',
-- 'TR': u'TURKEY',
-- 'TM': u'TURKMENISTAN',
-- 'TC': u'TURKS AND CAICOS ISLANDS',
-- 'TV': u'TUVALU',
-- 'UG': u'UGANDA',
-- 'UA': u'UKRAINE',
-- 'AE': u'UNITED ARAB EMIRATES',
-- 'GB': u'UNITED KINGDOM',
-- 'US': u'UNITED STATES',
-- 'UM': u'UNITED STATES MINOR OUTLYING ISLANDS',
-- 'UY': u'URUGUAY',
-- 'UZ': u'UZBEKISTAN',
-- 'VU': u'VANUATU',
-- 'VE': u'VENEZUELA, BOLIVARIAN REPUBLIC OF',
-- 'VN': u'VIET NAM',
-- 'VG': u'VIRGIN ISLANDS, BRITISH',
-- 'VI': u'VIRGIN ISLANDS, U.S.',
-- 'WF': u'WALLIS AND FUTUNA',
-- 'EH': u'WESTERN SAHARA',
-- 'YE': u'YEMEN',
-- 'ZM': u'ZAMBIA',
-- 'ZW': u'ZIMBABWE',
--}
---- django-countries-1.0.2.orig/django_countries/settings.py
-+++ django-countries-1.0.2/django_countries/settings.py
-@@ -1,3 +1,4 @@
-+import os
- from django.conf import settings
-
-
-@@ -11,5 +12,11 @@ def _build_flag_url():
- prefix = '%s/' % prefix
- return '%s%s' % (prefix, url)
-
-+def _build_iso_xml():
-+ if hasattr(settings, 'COUNTRIES_ISO_XML'):
-+ return settings.COUNTRIES_ISO_XML
-+ else:
-+ return '/usr/share/xml/iso-codes/iso_3166.xml'
-
- FLAG_URL = _build_flag_url()
-+ISO_XML = _build_iso_xml()
Added: packages/django-countries/trunk/debian/patches/dont_include_flag_icons
===================================================================
--- packages/django-countries/trunk/debian/patches/dont_include_flag_icons (rev 0)
+++ packages/django-countries/trunk/debian/patches/dont_include_flag_icons 2010-04-20 10:10:15 UTC (rev 12669)
@@ -0,0 +1,18 @@
+Description: Don't install the included flag icons as this package should use
+ the ones from famfamfam-flag-(png|gif).
+Author: Fladischer Michael <FladischerMichael at fladi.at>
+Forwarded: not-needed
+Last-Update: 2010-04-20
+
+Index: django-countries/setup.py
+===================================================================
+--- django-countries.orig/setup.py 2010-04-20 11:40:34.357763942 +0200
++++ django-countries/setup.py 2010-04-20 11:40:39.870263830 +0200
+@@ -25,7 +25,6 @@
+ author_email='smileychris at gmail.com',
+ url='http://bitbucket.org/smileychris/django-countries/',
+ packages=find_packages(),
+- package_data={'django_countries': ['bin/*.py', 'media/flags/*.gif']},
+ # titlecase PYPI is broken, copied the module directly for now (in /bin)
+ # requires=['titlecase'],
+ classifiers=[
Modified: packages/django-countries/trunk/debian/patches/series
===================================================================
--- packages/django-countries/trunk/debian/patches/series 2010-04-20 01:53:08 UTC (rev 12668)
+++ packages/django-countries/trunk/debian/patches/series 2010-04-20 10:10:15 UTC (rev 12669)
@@ -1 +1,2 @@
-debian-changes-1.0.3-1
+dont_include_flag_icons
+use_iso_codes_package
Added: packages/django-countries/trunk/debian/patches/use_iso_codes_package
===================================================================
--- packages/django-countries/trunk/debian/patches/use_iso_codes_package (rev 0)
+++ packages/django-countries/trunk/debian/patches/use_iso_codes_package 2010-04-20 10:10:15 UTC (rev 12669)
@@ -0,0 +1,63 @@
+Description: Don't use the shipped static lists for the country-codes, instead
+ gather the data at runtime by parsing the XML files shipped with the
+ iso-codes package.
+ Translations for the countries names are also taken from iso-codes.
+Author: Fladischer Michael <FladischerMichael at fladi.at>
+Forwarded: not-needed
+Last-Update: 2010-04-20
+
+Index: django-countries/django_countries/settings.py
+===================================================================
+--- django-countries.orig/django_countries/settings.py 2010-04-20 11:36:57.513764350 +0200
++++ django-countries/django_countries/settings.py 2010-04-20 11:37:14.377763439 +0200
+@@ -1,3 +1,4 @@
++import os
+ from django.conf import settings
+
+
+@@ -11,5 +12,11 @@
+ prefix = '%s/' % prefix
+ return '%s%s' % (prefix, url)
+
++def _build_iso_xml():
++ if hasattr(settings, 'COUNTRIES_ISO_XML'):
++ return settings.COUNTRIES_ISO_XML
++ else:
++ return '/usr/share/xml/iso-codes/iso_3166.xml'
+
+ FLAG_URL = _build_flag_url()
++ISO_XML = _build_iso_xml()
+Index: django-countries/django_countries/countries.py
+===================================================================
+--- django-countries.orig/django_countries/countries.py 2010-04-20 11:37:25.497767986 +0200
++++ django-countries/django_countries/countries.py 2010-04-20 11:39:15.877763941 +0200
+@@ -1,3 +1,23 @@
++from gettext import dgettext as _
++
++from xml.dom.minidom import parse
++
++from django_countries import settings
++
++# Nicely titled (and translated) country names.
++COUNTRIES = []
++COUNTRIES_PLUS = []
++OFFICIAL_COUNTRIES = {}
++
++for node in parse(settings.ISO_XML).getElementsByTagName('iso_3166_entry'):
++ _code = node.getAttribute('alpha_2_code')
++ _name = _('iso_3166', node.getAttribute('name'))
++ COUNTRIES.append((_code, _name))
++ COUNTRIES_PLUS.append((_code, _name))
++ OFFICIAL_COUNTRIES[_code.upper()] = _name.upper()
++
++'''
++# Upstream shipped static lists of countries.
+ from django.utils.translation import ugettext_lazy as _
+
+ # Nicely titled (and translatable) country names.
+@@ -764,3 +784,5 @@
+ 'ZM': u'ZAMBIA',
+ 'ZW': u'ZIMBABWE',
+ }
++'''
++
More information about the Python-modules-commits
mailing list