Commit Graph

8823 Commits

Author SHA1 Message Date
Ayub khan
8e71206312 BOM-96
-fixes all issues
2019-09-02 13:30:33 +05:00
Aarif
40f4ab2b90 Merge pull request #21487 from edx/BOM-161
BOM-161 Python 3 fixes
2019-09-02 12:34:05 +05:00
Braden MacDonald
d3f6ed09d8 Learning Contexts, New XBlock Runtime, Blockstore API Client + Content Libraries
https://github.com/edx/edx-platform/pull/20645

This introduces:
* A new XBlock runtime that can read and write XBlocks that are persisted using
  Blockstore instead of Modulestore. The new runtime is currently isolated so
  that it can be tested without risk to the current courseware/runtime.
* Content Libraries v2, which store XBlocks in Blockstore not modulestore
* An API Client for Blockstore
* "Learning Context" plugin API. A learning context is a more abstract concept
  than a course; it's a collection of XBlocks that serves some learning purpose.
2019-08-30 10:31:15 -07:00
aarif
d4924d661e python 3 fixes 2019-08-29 17:32:49 +05:00
aarif
d355dbbef4 python 3 fixes 2019-08-28 16:34:48 +05:00
Farhanah Sheets
5fa3024a54 Merge pull request #21441 from edx/azarembok/youtube-disable-flag
PROD-202: Add per-course flag to block access to youtube videos.
2019-08-27 10:16:29 -04:00
Ayub khan
8c4848ae35 BOM-397
py3 compatibility and test fix
2019-08-26 16:53:27 +05:00
Alan Zarembok
b953841893 PROD-202: Add per-course flag to block access to youtube videos. Can be set
for courses that have lost access to their youtube channels.
2019-08-25 14:45:16 -04:00
Ayub khan
67224f401a BOM-90
Made all tests py3 compatible.
2019-08-22 13:04:05 +05:00
noraiz-anwar
1c4f9da92d improved quality of multiple files 2019-08-22 12:47:08 +05:00
Ayub
85be57b64a Merge pull request #21397 from edx/BOM-95
BOM-95
2019-08-22 12:41:08 +05:00
Feanil Patel
f332b81e4c Merge pull request #21384 from edx/bom/python-3-swarm
Bom/python 3 swarm
2019-08-21 09:27:59 -04:00
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
1eda18a317 Merge pull request #21367 from edx/private_to_public_76a13fa
Mergeback PR from private to public.
2019-08-19 15:06:30 +05: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
Feanil Patel
f5f875401a Fix some of the common test collection issues. (#21340)
* Remove old  performance tests that we haven't been running.

As far as I can tell, these tests to capture HAR files were created 5
years ago and not being run as a part of our suite?  They capture HAR
data that we do nothing with so even if they were running we should
remove them until we're ready to care about consuming this kind of
information.

* Update password test unicode string.
* Add ugettext translation helper function.
* Fix lambda syntax that is not valid in python 3.
* Fix ur raw strings which his not valid in python 3
* Use edx_six.get_gettext instead of ugettext.
* Fix a few other encoding issues.
* Don't use old form of sorted funciton.

This form which uses a 'cmp' method is not available in python 3.
2019-08-16 11:31:36 -04: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
Feanil Patel
b63d881462 Merge pull request #21303 from edx/BOM-80
BOM-80
2019-08-08 12:13:54 -04:00
Awais Qureshi
16b80f5165 Merge pull request #21302 from edx/awais786/BOM-82
BOM-82
2019-08-08 12:36:31 +05:00
adeelehsan
3136b3ecd3 Removed google api key from github
Prod-349
2019-08-08 02:12:21 +05:00
aarif
61800c619f replaced StringIO imports with import from six
replaced cStringIO and StringIO imports with import from six

fixed StringIO imports

fixed StringIO imports

fixed XSS python-wrap warning
2019-08-08 00:09:16 +05:00
arbisoft
9d87c3c83b python 2 and 3 compatible method. 2019-08-07 17:01:30 +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
Muhammad Zaid Bamber
ffc2d9729b Revert "Added logs for XQueue Information" 2019-07-30 14:14:04 +05: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