Update to pycountry-0.14.7

issue2260

country.py

@@ -59,13 +59,16 @@ class Subdivision(ModelSQL, ModelView):
     type = fields.Selection([
         ('administration', 'Administration'),
         ('administrative area', 'Administrative area'),
+        ('administrative atoll', 'Administrative atoll'),
         ('administrative region', 'Administrative Region'),
         ('administrative territory', 'Administrative Territory'),
         ('area', 'Area'),
         ('atoll', 'Atoll'),
+        ('arctic region', 'Arctic Region'),
         ('autonomous city', 'Autonomous City'),
         ('autonomous commune', 'Autonomous Commune'),
         ('autonomous communities', 'Autonomous communities'),
+        ('autonomous community', 'Autonomous community'),
         ('autonomous district', 'Autonomous District'),
         ('autonomous island', 'Autonomous island'),
         ('autonomous monastic state', 'Autonomous monastic state'),
@@ -75,21 +78,27 @@ class Subdivision(ModelSQL, ModelView):
         ('autonomous republic', 'Autonomous republic'),
         ('autonomous sector', 'Autonomous sector'),
         ('autonomous territory', 'Autonomous territory'),
+        ('autonomous territorial unit', 'Autonomous territorial unit'),
         ('borough', 'Borough'),
         ('canton', 'Canton'),
         ('capital city', 'Capital city'),
         ('capital district', 'Capital District'),
         ('capital metropolitan city', 'Capital Metropolitan City'),
         ('capital territory', 'Capital Territory'),
+        ('chains (of islands)', 'Chains (of islands)'),
         ('city', 'City'),
         ('city corporation', 'City corporation'),
         ('city with county rights', 'City with county rights'),
         ('commune', 'Commune'),
+        ('constitutional province', 'Constitutional province'),
+        ('council area', 'Council area'),
         ('country', 'Country'),
         ('county', 'County'),
         ('department', 'Department'),
         ('dependency', 'Dependency'),
+        ('development region', 'Development region'),
         ('district', 'District'),
+        ('district council area', 'District council area'),
         ('division', 'Division'),
         ('economic prefecture', 'Economic Prefecture'),
         ('economic region', 'Economic region'),
@@ -98,10 +107,13 @@ class Subdivision(ModelSQL, ModelView):
         ('federal dependency', 'Federal Dependency'),
         ('federal district', 'Federal District'),
         ('federal territories', 'Federal Territories'),
+        ('geographical entity', 'Geographical entity'),
         ('geographical region', 'Geographical region'),
         ('geographical unit', 'Geographical unit'),
         ('governorate', 'Governorate'),
         ('included for completeness', 'Included for completeness'),
+        ('indigenous region', 'Indigenous region'),
+        ('island', 'Island'),
         ('island council', 'Island council'),
         ('island group', 'Island group'),
         ('local council', 'Local council'),
@@ -118,16 +130,21 @@ class Subdivision(ModelSQL, ModelView):
         ('overseas territorial collectivity',
             'Overseas territorial collectivity'),
         ('parish', 'Parish'),
+        ('popularates', 'Popularates'),
         ('prefecture', 'Prefecture'),
         ('principality', 'Principality'),
         ('province', 'Province'),
+        ('quarter', 'Quarter'),
         ('rayon', 'Rayon'),
         ('region', 'Region'),
         ('regional council', 'Regional council'),
         ('republic', 'Republic'),
+        ('republican city', 'Republican City'),
+        ('self-governed part', 'Self-governed part'),
         ('special administrative region', 'Special administrative region'),
         ('special city', 'Special city'),
         ('special district', 'Special District'),
+        ('special island authority', 'Special island authority'),
         ('special municipality', 'Special Municipality'),
         ('special region', 'Special Region'),
         ('special zone', 'Special zone'),
@@ -138,6 +155,9 @@ class Subdivision(ModelSQL, ModelView):
         ('two-tier county', 'Two-tier county'),
         ('union territory', 'Union territory'),
         ('unitary authority', 'Unitary authority'),
+        ('unitary authority (england)', 'Unitary authority (england)'),
+        ('unitary authority (wales)', 'Unitary authority (wales)'),
+        ('zone', 'zone'),
         ], 'Type', required=True)
     parent = fields.Many2One('country.subdivision', 'Parent')
 

scripts/countries.py

@@ -23,11 +23,11 @@ for subdivision in pycountry.subdivisions:
             <field name="code">%s</field>
             <field name="type">%s</field>\n''' % (subdivision.code.lower(),
                 subdivision.name, subdivision.code,
-                subdivision.type.lower())
+                subdivision.type)
     if subdivision.parent_code:
         record += u'''\
-                <field name="parent" ref="%s"/>\n''' % \
-                subdivision.parent.code.lower()
+            <field name="parent" ref="%s"/>\n''' % \
+            subdivision.parent.code.lower()
     record += u'''\
             <field name="country" ref="%s"/>
         </record>\n''' % subdivision.country.alpha2.lower()