Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
a6ff47f9
Commit
a6ff47f9
authored
Dec 20, 2017
by
Jeremy Bowman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixup! PLAT-1861 Upgrade to pyfilesystem2
parent
6893bb35
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
common/lib/capa/capa/capa_problem.py
+1
-1
common/lib/capa/capa/tests/test_html_render.py
+1
-1
common/lib/xmodule/xmodule/backcompat_module.py
+1
-1
No files found.
common/lib/capa/capa/capa_problem.py
View file @
a6ff47f9
...
...
@@ -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
View file @
a6ff47f9
...
...
@@ -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
View file @
a6ff47f9
...
...
@@ -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
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment