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
3c3bbd11
Commit
3c3bbd11
authored
Jul 26, 2012
by
Victor Shnayder
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor formatting tweaks
parent
da29d88d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
6 deletions
+8
-6
cms/djangoapps/contentstore/tests/tests.py
+2
-2
common/lib/xmodule/xmodule/html_module.py
+4
-2
common/lib/xmodule/xmodule/x_module.py
+2
-2
No files found.
cms/djangoapps/contentstore/tests/tests.py
View file @
3c3bbd11
...
...
@@ -74,7 +74,7 @@ class ContentStoreTestCase(TestCase):
return
resp
def
_activate_user
(
self
,
email
):
'''
look up the user's activation key in the db
, then hit the activate view.
'''
Look up the activation key for the user
, then hit the activate view.
No error checking'''
activation_key
=
registration
(
email
)
.
activation_key
...
...
@@ -102,7 +102,7 @@ class AuthTestCase(ContentStoreTestCase):
resp
=
self
.
client
.
get
(
url
)
self
.
assertEqual
(
resp
.
status_code
,
expected
)
return
resp
def
test_public_pages_load
(
self
):
"""Make sure pages that don't require login load without error."""
pages
=
(
...
...
common/lib/xmodule/xmodule/html_module.py
View file @
3c3bbd11
...
...
@@ -12,8 +12,10 @@ class HtmlModule(XModule):
def
get_html
(
self
):
return
self
.
html
def
__init__
(
self
,
system
,
location
,
definition
,
instance_state
=
None
,
shared_state
=
None
,
**
kwargs
):
XModule
.
__init__
(
self
,
system
,
location
,
definition
,
instance_state
,
shared_state
,
**
kwargs
)
def
__init__
(
self
,
system
,
location
,
definition
,
instance_state
=
None
,
shared_state
=
None
,
**
kwargs
):
XModule
.
__init__
(
self
,
system
,
location
,
definition
,
instance_state
,
shared_state
,
**
kwargs
)
self
.
html
=
self
.
definition
[
'data'
]
...
...
common/lib/xmodule/xmodule/x_module.py
View file @
3c3bbd11
...
...
@@ -450,8 +450,8 @@ class XModuleDescriptor(Plugin, HTMLSnippet):
default_class
)
# leave next line, commented out - useful for low-level debugging
log
.
debug
(
'[XModuleDescriptor.load_from_xml] tag=
%
s, class_=
%
s'
%
(
etree
.
fromstring
(
xml_data
)
.
tag
,
class_
))
#
log.debug('[XModuleDescriptor.load_from_xml] tag=%s, class_=%s' % (
#
etree.fromstring(xml_data).tag,class_))
return
class_
.
from_xml
(
xml_data
,
system
,
org
,
course
)
@classmethod
...
...
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