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
d33e2e60
Commit
d33e2e60
authored
Sep 21, 2015
by
David Ormsbee
Committed by
Nimisha Asthagiri
Oct 05, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix PEP8 violations.
parent
830e55d3
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
9 additions
and
5 deletions
+9
-5
cms/startup.py
+1
-0
common/lib/xmodule/xmodule/html_module.py
+2
-1
common/lib/xmodule/xmodule/x_module.py
+1
-0
lms/djangoapps/course_api/blocks/transformers/student_view.py
+1
-1
lms/djangoapps/course_api/blocks/transformers/tests/test_student_view.py
+1
-1
lms/djangoapps/lms_xblock/runtime.py
+1
-0
lms/envs/devstack.py
+2
-2
No files found.
cms/startup.py
View file @
d33e2e60
...
...
@@ -13,6 +13,7 @@ from monkey_patch import django_utils_translation
import
xmodule.x_module
import
cms.lib.xblock.runtime
def
run
():
"""
Executed during django startup
...
...
common/lib/xmodule/xmodule/html_module.py
View file @
d33e2e60
...
...
@@ -71,7 +71,7 @@ class HtmlBlock(object):
"""
if
self
.
system
.
anonymous_student_id
:
return
self
.
data
.
replace
(
"
%%
USER_ID
%%
"
,
self
.
system
.
anonymous_student_id
)
return
self
.
data
return
self
.
data
class
HtmlModuleMixin
(
HtmlBlock
,
XModule
):
...
...
@@ -99,6 +99,7 @@ class HtmlModule(HtmlModuleMixin):
Module for putting raw html in a course
"""
class
HtmlDescriptor
(
HtmlBlock
,
XmlDescriptor
,
EditingDescriptor
):
# pylint: disable=abstract-method
"""
Module for putting raw html in a course
...
...
common/lib/xmodule/xmodule/x_module.py
View file @
d33e2e60
...
...
@@ -1216,6 +1216,7 @@ def descriptor_global_handler_url(block, handler_name, suffix='', query='', thir
"""
raise
NotImplementedError
(
"Applications must monkey-patch this function before using handler_url for studio_view"
)
# This function exists to give applications (LMS/CMS) a place to monkey-patch until
# we can refactor modulestore to split out the FieldData half of its interface from
# the Runtime part of its interface. This function matches the Runtime.local_resource_url interface
...
...
lms/djangoapps/course_api/blocks/transformers/student_view.py
View file @
d33e2e60
...
...
@@ -21,7 +21,7 @@ class StudentViewTransformer(BlockStructureTransformer):
block
=
block_structure
.
get_xblock
(
block_key
)
# We're iterating through descriptors (not bound to a user) that are
# given to us by the modulestore. The reason we look at
# given to us by the modulestore. The reason we look at
# block.__class__ is to avoid the XModuleDescriptor -> XModule
# proxying that would happen if we just examined block directly,
# since it's likely that student_view() is going to be defined on
...
...
lms/djangoapps/course_api/blocks/transformers/tests/test_student_view.py
View file @
d33e2e60
...
...
@@ -6,7 +6,7 @@ from ..student_view import StudentViewTransformer
class
TestStudentViewTransformer
(
ModuleStoreTestCase
):
def
setUp
(
self
):
super
(
TestStudentViewTransformer
,
self
)
.
setUp
()
self
.
course_key
=
self
.
create_toy_course
()
...
...
lms/djangoapps/lms_xblock/runtime.py
View file @
d33e2e60
...
...
@@ -118,6 +118,7 @@ def handler_url(block, handler_name, suffix='', query='', thirdparty=False):
return
url
def
local_resource_url
(
block
,
uri
):
"""
local_resource_url for Studio
...
...
lms/envs/devstack.py
View file @
d33e2e60
...
...
@@ -237,6 +237,6 @@ FEATURES['ENABLE_RENDER_XBLOCK_API'] = True
CACHES
[
'lms.course_blocks'
]
=
{
'BACKEND'
:
'django.core.cache.backends.locmem.LocMemCache'
,
'KEY_FUNCTION'
:
'util.memcache.safe_key'
,
'BACKEND'
:
'django.core.cache.backends.locmem.LocMemCache'
,
'KEY_FUNCTION'
:
'util.memcache.safe_key'
,
}
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