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
b81e5504
Commit
b81e5504
authored
Sep 05, 2013
by
Don Mitchell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix pylint and typos
parent
fc131fa8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
11 deletions
+11
-11
cms/djangoapps/contentstore/views/component.py
+6
-6
common/lib/xmodule/xmodule/modulestore/xml_importer.py
+1
-1
common/lib/xmodule/xmodule/tests/test_xblock_wrappers.py
+4
-4
No files found.
cms/djangoapps/contentstore/views/component.py
View file @
b81e5504
...
...
@@ -2,15 +2,15 @@ import json
import
logging
from
collections
import
defaultdict
from
django.http
import
(
HttpResponse
,
HttpResponseBadRequest
,
HttpResponseForbidden
)
from
django.http
import
(
HttpResponse
,
HttpResponseBadRequest
,
HttpResponseForbidden
)
from
django.contrib.auth.decorators
import
login_required
from
django.views.decorators.http
import
require_http_methods
from
django.core.exceptions
import
PermissionDenied
from
django_future.csrf
import
ensure_csrf_cookie
from
django.conf
import
settings
from
xmodule.modulestore.exceptions
import
(
ItemNotFoundError
,
InvalidLocationError
)
from
xmodule.modulestore.exceptions
import
(
ItemNotFoundError
,
InvalidLocationError
)
from
mitxmako.shortcuts
import
render_to_response
from
xmodule.modulestore
import
Location
...
...
@@ -21,8 +21,8 @@ from xblock.fields import Scope
from
util.json_request
import
expect_json
,
JsonResponse
from
contentstore.module_info_model
import
get_module_info
,
set_module_info
from
contentstore.utils
import
(
get_modulestore
,
get_lms_link_for_item
,
compute_unit_state
,
UnitState
,
get_course_for_item
)
from
contentstore.utils
import
(
get_modulestore
,
get_lms_link_for_item
,
compute_unit_state
,
UnitState
,
get_course_for_item
)
from
models.settings.course_grading
import
CourseGradingModel
...
...
common/lib/xmodule/xmodule/modulestore/xml_importer.py
View file @
b81e5504
...
...
@@ -25,7 +25,7 @@ def import_static_content(modules, course_loc, course_data_path, static_content_
verbose
=
True
for
dirname
,
dirnames
,
filenames
in
os
.
walk
(
static_dir
):
for
dirname
,
_
,
filenames
in
os
.
walk
(
static_dir
):
for
filename
in
filenames
:
try
:
...
...
common/lib/xmodule/xmodule/tests/test_xblock_wrappers.py
View file @
b81e5504
...
...
@@ -99,7 +99,7 @@ class TestXBlockWrapper(object):
if
depth
==
0
:
runtime
.
get_module
.
side_effect
=
lambda
x
:
self
.
leaf_module
(
HtmlDescriptor
)
else
:
runtime
.
get_module
.
side_effect
=
lambda
x
:
self
.
container_module
(
VerticalDescriptor
,
depth
-
1
)
runtime
.
get_module
.
side_effect
=
lambda
x
:
self
.
container_module
(
VerticalDescriptor
,
depth
-
1
)
runtime
.
position
=
2
return
runtime
...
...
@@ -188,9 +188,9 @@ class TestStudioView(TestXBlockWrapper):
# Test that for all of the Descriptors listed in CONTAINER_XMODULES
# render the same thing using studio_view as they do using get_html, under the following conditions:
# a) All of its descend
e
nts are xmodules
# b) Some of its descend
e
nts are xmodules and some are xblocks
# c) All of its descend
e
nts are xblocks
# a) All of its descend
a
nts are xmodules
# b) Some of its descend
a
nts are xmodules and some are xblocks
# c) All of its descend
a
nts are xblocks
def
test_studio_view_container_node
(
self
):
for
descriptor_cls
in
CONTAINER_XMODULES
:
yield
self
.
check_studio_view_container_node_xmodules_only
,
descriptor_cls
...
...
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