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
00ae4889
Commit
00ae4889
authored
Nov 08, 2014
by
stv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix PEP8: E225 missing whitespace around operator
parent
41390f02
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
9 deletions
+9
-9
cms/envs/test.py
+2
-2
common/djangoapps/terrain/stubs/ora.py
+1
-1
common/lib/capa/capa/safe_exec/safe_exec.py
+1
-1
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_rubric.py
+2
-2
common/lib/xmodule/xmodule/tests/test_video.py
+2
-2
lms/djangoapps/courseware/masquerade.py
+1
-1
No files found.
cms/envs/test.py
View file @
00ae4889
...
...
@@ -69,9 +69,9 @@ STATICFILES_DIRS += [
# If we don't add these settings, then Django templates that can't
# find pipelined assets will raise a ValueError.
# http://stackoverflow.com/questions/12816941/unit-testing-with-django-pipeline
STATICFILES_STORAGE
=
'pipeline.storage.NonPackagingPipelineStorage'
STATICFILES_STORAGE
=
'pipeline.storage.NonPackagingPipelineStorage'
STATIC_URL
=
"/static/"
PIPELINE_ENABLED
=
False
PIPELINE_ENABLED
=
False
# Update module store settings per defaults for tests
update_module_store_settings
(
...
...
common/djangoapps/terrain/stubs/ora.py
View file @
00ae4889
...
...
@@ -45,7 +45,7 @@ class StudentState(object):
@property
def
num_pending
(
self
):
return
max
(
self
.
INITIAL_ESSAYS_AVAILABLE
-
self
.
num_graded
,
0
)
return
max
(
self
.
INITIAL_ESSAYS_AVAILABLE
-
self
.
num_graded
,
0
)
@property
def
num_required
(
self
):
...
...
common/lib/capa/capa/safe_exec/safe_exec.py
View file @
00ae4889
...
...
@@ -21,7 +21,7 @@ random.Random = random_module.Random
sys.modules['random'] = random
"""
ASSUMED_IMPORTS
=
[
ASSUMED_IMPORTS
=
[
(
"numpy"
,
"numpy"
),
(
"math"
,
"math"
),
(
"scipy"
,
"scipy"
),
...
...
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_rubric.py
View file @
00ae4889
...
...
@@ -236,7 +236,7 @@ class CombinedOpenEndedRubric(object):
rubric_categories
[
i
][
'options'
][
j
][
'grader_types'
]
.
append
(
grader_type
)
#Grab the score and add it to the actual scores. J will be the score for the selected
#grader type
if
len
(
actual_scores
)
<=
i
:
if
len
(
actual_scores
)
<=
i
:
#Initialize a new list in the list of lists
actual_scores
.
append
([
j
])
else
:
...
...
@@ -249,7 +249,7 @@ class CombinedOpenEndedRubric(object):
for
(
i
,
a
)
in
enumerate
(
actual_scores
):
if
int
(
a
)
==
max_scores
[
i
]:
correct
.
append
(
1
)
elif
int
(
a
)
==
0
:
elif
int
(
a
)
==
0
:
correct
.
append
(
0
)
else
:
correct
.
append
(
.
5
)
...
...
common/lib/xmodule/xmodule/tests/test_video.py
View file @
00ae4889
...
...
@@ -566,7 +566,7 @@ class VideoCdnTest(unittest.TestCase):
original_video_url
=
"http://www.original_video.com/original_video.mp4"
cdn_response_video_url
=
"http://www.cdn_video.com/cdn_video.mp4"
cdn_response_content
=
'{{"sources":["{cdn_url}"]}}'
.
format
(
cdn_url
=
cdn_response_video_url
)
cdn_response
.
return_value
=
Mock
(
status_code
=
200
,
content
=
cdn_response_content
)
cdn_response
.
return_value
=
Mock
(
status_code
=
200
,
content
=
cdn_response_content
)
fake_cdn_url
=
'http://fake_cdn.com/'
self
.
assertEqual
(
get_video_from_cdn
(
fake_cdn_url
,
original_video_url
),
...
...
@@ -579,6 +579,6 @@ class VideoCdnTest(unittest.TestCase):
Test if no alternative video in CDN exists.
"""
original_video_url
=
"http://www.original_video.com/original_video.mp4"
cdn_response
.
return_value
=
Mock
(
status_code
=
404
)
cdn_response
.
return_value
=
Mock
(
status_code
=
404
)
fake_cdn_url
=
'http://fake_cdn.com/'
self
.
assertIsNone
(
get_video_from_cdn
(
fake_cdn_url
,
original_video_url
))
lms/djangoapps/courseware/masquerade.py
View file @
00ae4889
...
...
@@ -62,4 +62,4 @@ def is_masquerading_as_student(user):
Return True if user is masquerading as a student, False otherwise
'''
masq
=
getattr
(
user
,
'masquerade_as_student'
,
False
)
return
masq
==
True
return
masq
is
True
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