From bc2e87db5cc3e9a7cf7ee87b548bf6cb3fc328cf Mon Sep 17 00:00:00 2001
From: "Dave St.Germain" <dstgermain@edx.org>
Date: Mon, 19 Aug 2019 11:15:10 -0400
Subject: [PATCH] Update edx-val

---
 common/lib/xmodule/xmodule/video_module/video_module.py | 2 +-
 requirements/edx/base.txt                               | 2 +-
 requirements/edx/development.txt                        | 2 +-
 requirements/edx/testing.txt                            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/lib/xmodule/xmodule/video_module/video_module.py b/common/lib/xmodule/xmodule/video_module/video_module.py
index c6617d1a99..be50ca0944 100644
--- a/common/lib/xmodule/xmodule/video_module/video_module.py
+++ b/common/lib/xmodule/xmodule/video_module/video_module.py
@@ -852,7 +852,7 @@ class VideoBlock(
         Arguments:
             id_generator is used to generate course-specific urls and identifiers
         """
-        if isinstance(xml, str) or isinstance(xml, unicode):
+        if isinstance(xml, six.string_types):
             xml = etree.fromstring(xml)
 
         field_data = {}
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 3c3a3b3f05..25e165e3be 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -121,7 +121,7 @@ git+https://github.com/mitodl/edx-sga.git@3828ba9e413080a81b907a3381e5ffa05e063f
 edx-submissions==2.1.1
 edx-user-state-client==1.1.1
 edx-when==0.3
-edxval==1.1.25
+edxval==1.1.26
 elasticsearch==1.9.0      # via edx-search
 enum34==1.1.6
 event-tracking==0.2.9
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 2c458aee6f..5004735747 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -147,7 +147,7 @@ edx-sphinx-theme==1.5.0
 edx-submissions==2.1.1
 edx-user-state-client==1.1.1
 edx-when==0.3
-edxval==1.1.25
+edxval==1.1.26
 elasticsearch==1.9.0
 entrypoints==0.3
 enum34==1.1.6
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 7b6e9897a0..243a08f6be 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -142,7 +142,7 @@ git+https://github.com/mitodl/edx-sga.git@3828ba9e413080a81b907a3381e5ffa05e063f
 edx-submissions==2.1.1
 edx-user-state-client==1.1.1
 edx-when==0.3
-edxval==1.1.25
+edxval==1.1.26
 elasticsearch==1.9.0
 entrypoints==0.3          # via flake8
 enum34==1.1.6