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
17aa898a
Commit
17aa898a
authored
Nov 27, 2014
by
Sarina Canelake
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6063 from stvstnfrd/pep8/newline
Fix recently added PEP8 violations
parents
b8c5b984
edb6c161
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
3 deletions
+5
-3
common/djangoapps/third_party_auth/pipeline.py
+1
-0
common/djangoapps/user_api/api/profile.py
+1
-0
common/djangoapps/user_api/tests/test_profile_api.py
+0
-2
common/test/acceptance/pages/lms/instructor_dashboard.py
+2
-0
scripts/all-tests.sh
+1
-1
No files found.
common/djangoapps/third_party_auth/pipeline.py
View file @
17aa898a
...
...
@@ -452,6 +452,7 @@ def parse_query_params(strategy, response, *args, **kwargs):
'is_register_2'
:
auth_entry
==
AUTH_ENTRY_REGISTER_2
,
}
# TODO (ECOM-369): Once the A/B test of the combined login/registration
# form completes, we will be able to remove the extra login/registration
# end-points. HOWEVER, users who used the new forms during the A/B
...
...
common/djangoapps/user_api/api/profile.py
View file @
17aa898a
...
...
@@ -16,6 +16,7 @@ from user_api.helpers import intercept_errors
log
=
logging
.
getLogger
(
__name__
)
class
ProfileRequestError
(
Exception
):
""" The request to the API was not valid. """
pass
...
...
common/djangoapps/user_api/tests/test_profile_api.py
View file @
17aa898a
...
...
@@ -174,8 +174,6 @@ class ProfileApiTest(TestCase):
result_obj
=
UserOrgTag
.
objects
.
get
(
user
=
user
,
org
=
course
.
id
.
org
,
key
=
'email-optin'
)
self
.
assertEqual
(
result_obj
.
value
,
expected_result
)
@raises
(
profile_api
.
ProfileUserNotFound
)
def
test_retrieve_and_update_preference_info_no_user
(
self
):
preferences
=
profile_api
.
preference_info
(
self
.
USERNAME
)
...
...
common/test/acceptance/pages/lms/instructor_dashboard.py
View file @
17aa898a
...
...
@@ -13,6 +13,7 @@ class InstructorDashboardPage(CoursePage):
Instructor dashboard, where course staff can manage a course.
"""
url_path
=
"instructor"
def
is_browser_on_page
(
self
):
return
self
.
q
(
css
=
'div.instructor-dashboard-wrapper-2'
)
.
present
...
...
@@ -31,6 +32,7 @@ class MembershipPage(PageObject):
Membership section of the Instructor dashboard.
"""
url
=
None
def
is_browser_on_page
(
self
):
return
self
.
q
(
css
=
'a[data-section=membership].active-section'
)
.
present
...
...
scripts/all-tests.sh
View file @
17aa898a
...
...
@@ -57,7 +57,7 @@ set -e
# Violations thresholds for failing the build
PYLINT_THRESHOLD
=
4600
PEP8_THRESHOLD
=
5
PEP8_THRESHOLD
=
0
source
$HOME
/jenkins_env
...
...
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