From f384e089715f05ab7eb50cf76a95a85bb19eb1dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sun, 14 Apr 2019 17:53:01 +0200
Subject: [PATCH] Update data with pycountry-18.12.8

---
 data.xml             | 29 ++++++++++++++++++-----------
 scripts/countries.py |  4 ++--
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/data.xml b/data.xml
index 87a21b5cd9..a5c083bac3 100644
--- a/data.xml
+++ b/data.xml
@@ -9847,7 +9847,7 @@
         </record>
 
         <record model="country.subdivision" id="in-dd">
-            <field name="name">Damen and Diu</field>
+            <field name="name">Daman and Diu</field>
             <field name="code">IN-DD</field>
             <field name="type">union territory</field>
             <field name="country" ref="in"/>
@@ -9973,7 +9973,7 @@
         </record>
 
         <record model="country.subdivision" id="in-or">
-            <field name="name">Orissa</field>
+            <field name="name">Odisha</field>
             <field name="code">IN-OR</field>
             <field name="type">state</field>
             <field name="country" ref="in"/>
@@ -10007,6 +10007,13 @@
             <field name="country" ref="in"/>
         </record>
 
+        <record model="country.subdivision" id="in-tg">
+            <field name="name">Telangana</field>
+            <field name="code">IN-TG</field>
+            <field name="type">state</field>
+            <field name="country" ref="in"/>
+        </record>
+
         <record model="country.subdivision" id="in-tn">
             <field name="name">Tamil Nadu</field>
             <field name="code">IN-TN</field>
@@ -26289,9 +26296,9 @@
             <field name="country" ref="za"/>
         </record>
 
-        <record model="country.subdivision" id="za-gp">
+        <record model="country.subdivision" id="za-gt">
             <field name="name">Gauteng</field>
-            <field name="code">ZA-GP</field>
+            <field name="code">ZA-GT</field>
             <field name="type">province</field>
             <field name="country" ref="za"/>
         </record>
@@ -26317,6 +26324,13 @@
             <field name="country" ref="za"/>
         </record>
 
+        <record model="country.subdivision" id="za-nl">
+            <field name="name">Kwazulu-Natal</field>
+            <field name="code">ZA-NL</field>
+            <field name="type">province</field>
+            <field name="country" ref="za"/>
+        </record>
+
         <record model="country.subdivision" id="za-nw">
             <field name="name">North-West (South Africa)</field>
             <field name="code">ZA-NW</field>
@@ -26331,13 +26345,6 @@
             <field name="country" ref="za"/>
         </record>
 
-        <record model="country.subdivision" id="za-zn">
-            <field name="name">Kwazulu-Natal</field>
-            <field name="code">ZA-ZN</field>
-            <field name="type">province</field>
-            <field name="country" ref="za"/>
-        </record>
-
         <record model="country.subdivision" id="zm-01">
             <field name="name">Western</field>
             <field name="code">ZM-01</field>
diff --git a/scripts/countries.py b/scripts/countries.py
index 4765ff74da..1f9b3d137d 100755
--- a/scripts/countries.py
+++ b/scripts/countries.py
@@ -18,7 +18,7 @@ for country in pycountry.countries:
             <field name="code_numeric">%s</field>
         </record>\n''' % (country.alpha_2.lower(), country.name,
                 country.alpha_2, country.alpha_3, country.numeric)
-    sys.stdout.write(record.encode('utf-8'))
+    sys.stdout.write(record)
 sys.stdout.write('    </data>\n')
 
 subdivision_codes = {s.code.lower() for s in pycountry.subdivisions}
@@ -48,7 +48,7 @@ while existing_parents < subdivision_codes:
             <field name="country" ref="%s"/>
         </record>\n''' % subdivision.country.alpha_2.lower()
 
-        sys.stdout.write(record.encode('utf-8'))
+        sys.stdout.write(record)
     sys.stdout.write('    </data>\n')
     existing_parents |= new_parents