From 8b5b1eba86d95f423d205a7d3b682860b2c6e945 Mon Sep 17 00:00:00 2001
From: John Eskew <jeskew@edx.org>
Date: Tue, 19 Sep 2017 17:50:39 -0400
Subject: [PATCH] Use Django 1.11 compatible version of django-countries.

---
 .../djangoapps/user_api/tests/test_constants.py    | 14 +++++++-------
 requirements/edx/base.txt                          |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/openedx/core/djangoapps/user_api/tests/test_constants.py b/openedx/core/djangoapps/user_api/tests/test_constants.py
index af3b113b763..332eb73117c 100644
--- a/openedx/core/djangoapps/user_api/tests/test_constants.py
+++ b/openedx/core/djangoapps/user_api/tests/test_constants.py
@@ -2,7 +2,7 @@
 """Constants used in the test suite. """
 SORTED_COUNTRIES = [
     (u"AF", u"Afghanistan"),
-    (u"AX", u"Ã…land Islands"),
+    (u"AX", u"\xc5land Islands"),
     (u"AL", u"Albania"),
     (u"DZ", u"Algeria"),
     (u"AS", u"American Samoa"),
@@ -55,12 +55,12 @@ SORTED_COUNTRIES = [
     (u"CD", u"Congo (the Democratic Republic of the)"),
     (u"CK", u"Cook Islands"),
     (u"CR", u"Costa Rica"),
-    (u"CI", u"Côte d'Ivoire"),
+    (u"CI", u"C\xf4te d'Ivoire"),
     (u"HR", u"Croatia"),
     (u"CU", u"Cuba"),
-    (u"CW", u"Curaçao"),
+    (u"CW", u"Cura\xe7ao"),
     (u"CY", u"Cyprus"),
-    (u"CZ", u"Czech Republic"),
+    (u"CZ", u"Czechia"),
     (u"DK", u"Denmark"),
     (u"DJ", u"Djibouti"),
     (u"DM", u"Dominica"),
@@ -181,11 +181,11 @@ SORTED_COUNTRIES = [
     (u"PT", u"Portugal"),
     (u"PR", u"Puerto Rico"),
     (u"QA", u"Qatar"),
-    (u"RE", u"Réunion"),
+    (u"RE", u"R\xe9union"),
     (u"RO", u"Romania"),
     (u"RU", u"Russia"),
     (u"RW", u"Rwanda"),
-    (u"BL", u"Saint Barthélemy"),
+    (u"BL", u"Saint Barth\xe9lemy"),
     (u"SH", u"Saint Helena, Ascension and Tristan da Cunha"),
     (u"KN", u"Saint Kitts and Nevis"),
     (u"LC", u"Saint Lucia"),
@@ -250,5 +250,5 @@ SORTED_COUNTRIES = [
     (u"EH", u"Western Sahara"),
     (u"YE", u"Yemen"),
     (u"ZM", u"Zambia"),
-    (u"ZW", u"Zimbabwe"),
+    (u"ZW", u"Zimbabwe")
 ]
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 40b875204ce..687a5637f9c 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -17,7 +17,7 @@ defusedxml==0.4.1
 django-babel-underscore==0.5.2
 markey==0.8  # From django-babel-underscore
 django-config-models==0.1.8
-django-countries==4.0
+django-countries==4.6.1
 django-extensions==1.5.9
 django-filter==1.0.4
 django-ipware==1.1.0
-- 
GitLab