fixup! PLAT-1861 Upgrade to pyfilesystem2

common/lib/capa/capa/capa_problem.py

@@ -611,7 +611,7 @@ class LoncapaProblem(object):
         """
         includes = self.tree.findall('.//include')
         for inc in includes:
-            filename = inc.get('file')
+            filename = inc.get('file').decode('utf-8')
             if filename is not None:
                 try:
                     # open using LoncapaSystem OSFS filestore

common/lib/capa/capa/tests/test_html_render.py

@@ -44,7 +44,7 @@ class CapaHtmlRenderTest(unittest.TestCase):
         # Create a test file to include
         self._create_test_file(
             u'test_include.xml',
-            '<test>Test include</test>'
+            u'<test>Test include</test>'
         )
 
         # Generate some XML with an <include>

common/lib/xmodule/xmodule/backcompat_module.py

@@ -24,7 +24,7 @@ def process_includes(fn):
         next_include = xml_object.find('include')
         while next_include is not None:
             system.error_tracker("WARNING: the <include> tag is deprecated, and will go away.")
-            file = next_include.get('file')
+            file = next_include.get('file').decode('utf-8')
             parent = next_include.getparent()
 
             if file is None: