Commit Graph

7928 Commits

Author SHA1 Message Date
Ayub khan
8a95a8e520 BOM-95
assertItemsEqual with six.assertCountEqual
2019-08-21 17:01:40 +05:00
Bill DeRusha
aebdf77f8e Revert "PROD-145: Added validation to discussion topic input in studio, testing 2" 2019-08-20 20:31:15 -04:00
Feanil Patel
fde27196f9 Fix quality issues. 2019-08-20 18:02:30 -04:00
Feanil Patel
73a146fbbe Revert "assertItemsEqual() moved to assertCountEqual()"
This reverts commit 3d2617983b.

The change was not quite right because the method six provides needs to
have `self` be passed in as well.  See the docs here:
https://six.readthedocs.io/#unittest-assertions

Reverting for now and we can fix it in smaller chunks later.
2019-08-20 15:31:20 -04:00
Dave St.Germain
3d2617983b assertItemsEqual() moved to assertCountEqual() 2019-08-19 17:00:17 -04:00
Dave St.Germain
aaf7ddd3f3 Correctly encode and decode 2019-08-19 16:08:38 -04:00
Dave St.Germain
e64c61160e Iterating dictionaries 2019-08-19 14:54:03 -04:00
Jeremy Bowman
97c0684755 Cleaner fix for byte conversion in from_xml 2019-08-19 14:26:08 -04:00
Ned Batchelder
f17f9d3862 All of the fall 2012 courses have been imported by now. 2019-08-19 12:43:09 -04:00
David Ormsbee
95a4e9ba3c Fix BlockTransformer Py3 issues (#21376)
Django's reverse can handle Unicode for arguments.
2019-08-19 12:16:39 -04:00
Feanil Patel
085b6b9468 Fix runtime error where dict is modified during iteration. 2019-08-19 11:16:29 -04:00
Dave St.Germain
bc2e87db5c Update edx-val 2019-08-19 11:15:10 -04:00
adeelehsan
76a13fae73 Merge pull request #156 from edx/aehsan/prod-349/remove_google_api_key_from_github
Removed google api key from github
2019-08-19 14:32:26 +05:00
edx-pipeline-bot
e585e0bdf2 Merge pull request #21348 from edx/private_to_public_c74331e
Mergeback PR from private to public.
2019-08-16 14:43:47 +05:00
Awais Jibran
c74331e16e Merge pull request #158 from edx/ormsbee/sec_609_customtag_fix
Make CustomTagModule safe (remove Mako) [SEC-609]
2019-08-16 13:52:51 +05:00
Manjinder Singh
65b858e3e7 Merge pull request #21209 from edx/msingh/discussion_topic_validation2
PROD-145: Added validation to discussion topic input in studio, testing 2
2019-08-15 19:53:17 -04:00
jinder1s
e7fb13a74f Added validation to discussion topic input in studio 2019-08-15 16:13:37 -04:00
Feanil Patel
602970ed90 Fix test collection for CMS in python 3. (#21338) 2019-08-13 13:54:49 -04:00
Feanil Patel
9753eae441 Convert to using ExitStack instead of nested. (#21329)
* Convert to using ExitStack instead of nested.

nested is not available in Python3.

* Use ExitStack from contextlib2.

ExitStack has not been backported to the Python 2.7 standard library and
contextlib.nested is no longer available in Python 3.5.  We need to be
able to use something in both 2 and 3 as we transition so we'll pull in
contextlib2 which has backports of the full python3 contextlib.
2019-08-12 16:55:05 -04:00
Feanil Patel
890e119951 Remove import of nested.
We stopped using it but forgot to remove it from the import.
2019-08-12 14:34:48 -04:00
Feanil Patel
083d1b4ce7 Merge pull request #21313 from edx/BOM-85
BOM-85
2019-08-12 10:01:07 -04:00
aarif
4da4749f84 removed bulk_assertions context manager
removed usages of bulk_assertion

changes made to comply quality failure

removing test-bulk assertions.
2019-08-10 12:27:23 +05:00
arbisoft
9b87cb0172 BOM-85
he builtin basestring abstract type was removed. Use str instead.
2019-08-09 22:08:57 +05:00
adeelehsan
3136b3ecd3 Removed google api key from github
Prod-349
2019-08-08 02:12:21 +05:00
Feanil Patel
18e988b747 Fix some minor issues that prevent some tests from being collected. 2019-08-06 15:19:55 -04:00
David Ormsbee
483e654fcf Make CustomTagModule safe (remove Mako) [SEC-609]
Prior to this commit, it was possible for course authoring teams
to import and execute Mako templates using the obscure "customtag"
tag (CustomTagModule). Since Mako templates can run Python code
(e.g. imports, database queries, etc.), this would give a course
team the ability to execute arbitrary, unsandboxed code on the
server.

This commit converts CustomTagModule to use the Python library's
string.Template instead. This should be broadly compatible with
the most basic and common usage of customtag, which is simple
variable substitution in the style of ${var_name}.
2019-08-06 13:54:58 -04:00
Nimisha Asthagiri
c1a5d2fa06 DEPR-15: Remove usage of firebase-token-generator
The old Notes Django app is the only caller of this no longer
supported library. I have verified that this old app is no
longer functional and is already slated to be removed as part
of DEPR-18.

So this commit simply removes the call to firebase-token-generator
and leaves removal of the Notes app to DEPR-18.
2019-08-01 18:56:04 -04:00
David Ormsbee
b3614f3a00 Merge pull request #20954 from open-craft/symbolist/html-block
HtmlModule to HtmlBlock [SE-1089]
2019-08-01 11:36:23 -04:00
Feanil Patel
b495a6babe NoneType not in types module in python3.
Change our tests to use type(None) instead which works in both python2 and python3.
2019-07-31 11:45:31 -04:00
Feanil Patel
bb8420bb51 Rmove the extra configurabilty logic for reset buttons.
The `DEFAULT_SHOW_RESET_BUTTON` is not actually referenced anywhere
other than in these two places where it's read.  As far as I can tell,
nothing sets this value so it's always going to fallback to false.

Since this mixin is imported during startup, removing this unblocks
testing on python3 where it can fail to start up if the settings haven't
fully loaded before you try to access them.
2019-07-29 13:55:22 -04:00
David Ormsbee
b1f3d2cef2 Revert "Fix the unpredictable order randomization issue with randomized content blocks" 2019-07-25 13:42:20 -04:00
Ayub
2a22ff3890 Merge pull request #21080 from edx/INCR-419
INCR-419 python3 compatibility
2019-07-25 14:50:06 +05:00
Guruprasad Lakshmi Narayanan
df4aee23b9 Fix the order randomization behaviour of Randomized Content Block
The Randomized Content Block XBlock only randomizes the selection of
the children blocks and has unpredictable randomization of
the order of the selected child blocks due to the usage of sets, which
are unordered, for storing the selected blocks. This becomes apparent
when all the available child blocks in a library are chosen for a
Randomized Content Block, to randomize just the order of the child
blocks and not just the selection of the blocks. The order of the
selected blocks ends up being similar for multiple learners.

This change modifies the XBlock to store the selected child blocks in
a list, instead of a set, after randomly shuffling them.
2019-07-25 00:58:11 +05:30
Usman Khalid
8dfc8e5fda Convert AboutModule, CourseInfoModule, HtmlModule and StaticTabModule to XBlocks. 2019-07-24 20:19:44 +05:00
Ayub
78f9a0d19c Merge pull request #21079 from edx/INCR-418
INCR-418 python3 compatibility
2019-07-24 09:48:27 +05:00
Ayub
a5f9cb5227 Merge pull request #21078 from edx/INCR-417
INCR-417 python3 compatibility
2019-07-24 09:47:23 +05:00
Ayub
6b034760e0 Merge pull request #21077 from edx/INCR-416
INCR-416 python3 compatibility
2019-07-24 09:46:03 +05:00
Ayub
bf47019e4c Merge pull request #21076 from edx/INCR-414
INCR-414 python3 compatibility
2019-07-24 09:44:48 +05:00
Kshitij Sobti
61bb9bc6e2 Add support for using an authentication database for MongoDB.
A popular convention is to have user accounts stored in a separate authentication
database. This change add support for configuring edx-platform to work with
such a setup.
2019-07-24 01:16:33 +05:30
Ayub khan
0698c10d29 INCR-412 python3 compatibility 2019-07-23 12:57:16 +05:00
Aarif
d77b2fe9cc Merge pull request #21082 from edx/INCR-415
INCR-415 Python 3 compatibility
2019-07-22 13:53:15 +05:00
Feanil Patel
d9c9d7bab9 Deal with NoneType access.
The `NoneType` object is not available from the `types` module in
python 3. This is a workaronud to deal with that.
2019-07-19 09:48:10 -04:00
DawoudSheraz
7131809fec add submission deadline methods in InheritanceMixin 2019-07-19 16:06:06 +05:00
Ayub khan
0069d7db33 INCR-419 python3 compatibility 2019-07-16 16:11:02 +05:00
aarif
46fe6fdcea ran python-modernize and isort on files mentioned in INCR-415
changes made to comply with quality

changes made to comply with quality

changes made to comply with quality
2019-07-16 10:06:16 +00:00
Alan Zarembok
95616d7d11 PROD-448: Gracefully handle exceptions from user-supplied code in
advanced problems so that they do not become uneditable.
2019-07-11 14:45:58 -04:00
Ayub khan
1521f5fce0 INCR-418 2019-07-11 16:00:23 +05:00
Ayub khan
811356b002 INCR-417 python3 compatibility 2019-07-11 15:54:47 +05:00
Ayub khan
a13321cc76 INCR-416 python3 compatibility 2019-07-11 15:45:22 +05:00
Ayub khan
e40e18ab32 INCR-414 python3 compatibility 2019-07-11 15:38:18 +05:00