Commit Graph

7608 Commits

Author SHA1 Message Date
Awais Qureshi
eee826ca4b BOM-814
String comparsion within in raw html were causing tests failures in python3.
The function parses the string and converts into dictionary.
2019-10-09 15:43:18 +05:00
Ayub
ea8a10e9d8 Merge pull request #21953 from edx/BOM-808
BOM-808 struct is not defined
2019-10-09 15:02:18 +05:00
Ayub khan
d1eb51bd71 BOM-808 struct is not defined
python3 list comprehension variables are not accessible after comprehension
2019-10-09 12:53:12 +05:00
Aarif
4c9aa43c2f Merge pull request #21924 from edx/BOM-813
Updated the comparison operation to fix None comparison with an integer - BOM-813
2019-10-09 12:07:13 +05:00
Feanil Patel
92e06d52a6 Delete items by their asset_key instead of _id.
The _id comes back as a dict and it's in the wrong order compared to the
dict stored in mongo.  This results in lookups for deletion failing when
we use the '_id' as the lookup key.

Luckily the delete function also takes the asset_key as a valid key to
delete by so we just use that instead.
2019-10-08 15:26:52 -04:00
Feanil Patel
9610aab0f8 Fix more cms contentstore tests. 2019-10-08 15:26:52 -04:00
Feanil Patel
5a9a5ba918 Catch another place where we were passing in byte data into transcript conversion module. 2019-10-07 13:49:25 -04:00
Feanil Patel
66382961a7 Fix all transcript related tests.
Treat transcript content as unicode strings and convert them at any edge
where we encounter them.  One decision made here was to not update
edx-val it treats transcripts as byte but is much closer to the actual
files so it makes more sense over there. But within the platform they
are generally passed around as serialized json and so it's much better
for them to be unicode.
2019-10-07 13:49:25 -04:00
aarif
af20d0f7d2 Updated the comparison operation to fix None comparison with integer 2019-10-03 15:52:52 +05:00
aarif
c7a05ecf77 Updated the comparison operation to properly calculate mongo connection version
minor changes made to fix quality issues

changes made as suggested

removed unused import statement
2019-10-02 13:41:19 +05:00
Ayub khan
c29b7520a1 BOM-850
python3 compatibility
2019-10-01 10:56:00 +05:00
Ayub
58b43cafd0 Merge pull request #21850 from edx/BOM-806
BOM-806
2019-10-01 10:38:53 +05:00
Ayub
c02678a2d0 Merge pull request #21851 from edx/BOM-812
BOM-812
2019-10-01 10:37:48 +05:00
Ayub
ac3718055a Merge pull request #21855 from edx/BOM-842
BOM-842
2019-10-01 10:37:15 +05:00
Ayub
42b6aa977c Merge pull request #21857 from edx/BOM-807
BOM-807
2019-10-01 10:36:39 +05:00
Ayub
cb926b65af Merge pull request #21858 from edx/BOM-823
BOM-823
2019-10-01 10:35:49 +05:00
Ayub khan
9dc5866464 BOM-823
python3 compatibility
2019-09-30 16:12:32 +05:00
Ayub khan
3ae2e44af4 BOM-807
python3 compatibility
2019-09-30 16:04:00 +05:00
Ayub khan
73a453d3c2 BOM-842 2019-09-30 15:59:36 +05:00
Ayub khan
b83d6adb5a BOM-812
python3 compatibility
2019-09-30 15:20:20 +05:00
Ayub khan
c56de3d37d BOM-806
python3 compatibility
2019-09-30 15:11:07 +05:00
Aarif
e7dadeb26c Merge pull request #21818 from edx/BOM-748
BOM-748
2019-09-30 13:00:43 +05:00
Feanil Patel
b26d1050a5 Merge pull request #21825 from edx/feanil/fix_error_validation
Explicitly set the test string to unicode.
2019-09-27 15:55:01 -04:00
Feanil Patel
07df64eb8c Fix the rest of these. 2019-09-27 14:36:40 -04:00
Feanil Patel
16cce5f389 BOM-843 Fix reraise call. 2019-09-27 14:19:40 -04:00
Feanil Patel
a4447da5e0 Explicitly set the test string to unicode. 2019-09-27 14:06:49 -04:00
aarif
4e0ca7c381 python 3 fixes 2019-09-27 18:43:46 +05:00
Feanil Patel
a847620e88 Merge pull request #21797 from edx/feanil/fix_xmodule_format_failure
Division changed in python3 to produce floats even when you divide tw…
2019-09-26 15:49:25 -04:00
Ned Batchelder
b3845b2b96 Merge pull request #21581 from edx/nedbat/fix-courseware-warning
Finally import courseware properly everywhere to get rid of a warning
2019-09-26 14:25:27 -04:00
Jeremy Bowman
4babc5ee1c Fix CorruptGridFile in Python 3 tests BOM-375 (#21794) 2019-09-26 13:43:26 -04:00
Feanil Patel
093e5a543a Division changed in python3 to produce floats even when you divide two ints. 2019-09-26 13:23:15 -04:00
Dave St.Germain
26026782b0 Merge pull request #21538 from edx/dcs/component-tweaks
Studio Component Editor Tweaks
2019-09-26 10:05:23 -04:00
Ned Batchelder
efba6e45e8 Finally import courseware properly everywhere to get rid of a warning 2019-09-26 09:40:15 -04:00
Dave St.Germain
ea3232feac TNL-6920 Component Editor Efficiency Improvements
* Enlarges component modal for easier editing
* Allows display name to be edited in place
* Improves markdown button labeling
* Moves markdown cheatsheet to the edit modal, for quick reference
2019-09-26 09:34:14 -04:00
Ayub
846a12939e Merge pull request #21735 from edx/BOM-update_str_method
BOM Project __unicode__ to __str__
2019-09-26 10:47:14 +05:00
Jeremy Bowman
dab59635a7 Fix some failing xmodule tests (#21775) 2019-09-25 12:01:27 -04:00
Jeremy Bowman
8828efc060 Fix test collection under py35 BOM-615 (#21774) 2019-09-25 11:20:21 -04:00
Ayub khan
5c47a3b425 BOM Project
Updated __unicode__ to __str__
2019-09-25 18:31:54 +05:00
Aarif
4e95024dc3 Merge pull request #21525 from edx/BOM-367
BOM-367 Python 3 fixes
2019-09-25 16:07:44 +05:00
Jeremy Bowman
553d35e53e Upgrade mock BOM-596 (#21717) 2019-09-24 10:14:17 -04:00
Feanil Patel
57af13ddc4 Merge pull request #21721 from edx/python3-swarm-2
Python3 swarm 2
2019-09-20 08:48:19 -04:00
Feanil Patel
9740e2e077 BOM-618 Don't decode string objects. 2019-09-19 14:14:23 -04:00
Jeremy Bowman
ae2c3b8edf Fix mocks of open() - BOM-597 2019-09-19 13:53:37 -04:00
Nicholas D'Alfonso
039b7aed29 DISCO-1342 hide fields
hide course card image, course about page image, and course
display name when publisher flag is turned on
2019-09-19 11:56:00 -04:00
Feanil Patel
dab38a5ef3 Merge pull request #21701 from edx/python3-swarm
Python3 swarm
2019-09-19 10:23:04 -04:00
Feanil Patel
cb64fed1af BOM-489 Studio tests with byte/str mismatch. 2019-09-18 14:21:16 -04:00
Feanil Patel
ea49975a73 BOM-617 Fix test_static_replace test failures.
Update the tests around static_file code to use byte streams instead of
string streams for generating static content.  This is a fix to get
these tests passing on python 3.
2019-09-18 11:51:49 -04:00
Braden MacDonald
1382bf8720 Save user state for Blockstore XBlocks in CSM, clean up CSM a bit (#21630)
This commit introduces the changes needed for XBlocks in Blockstore to save
their user state into CSM. Before this commit, all student state for Blockstore
blocks was ephemeral (in-process dict store).

Notes:

* The main risk factor of this PR is that it adds non-course keys to the
  course_id field in CSM. If any code (like analytics?) reads course keys
  directly out of CSM and doesn't have graceful handling for key types it
  doesn't recognize, it could cause an issue. With the included changes to
  opaque-keys, calling CourseKey.from_string(...) on these values will raise
  InvalidKeyError since they're not CourseKeys. (But calling
  LearningContextKey.from_string(...) will work for both course and library
  keys.)
* This commit introduces a slight regression for the Studio view of XBlocks in
  Blockstore content libraries: their state is now lost from request to request.
  I have a follow up PR to give them a proper studio-appropriate state store,
  but I want to review it separately so it doesn't hold up this PR and we can
  test this PR on its own.
2019-09-18 10:27:46 -04:00
aarif
8e7406493c python 3 fixes
test fixes

changes made as suggested

test fixes

test fixes for python 2

test fixes

python 3 fixes

test fixes

changes made as suggested

test fixes

test fixes for python 2

test fixes

minor fixes

python 3 fixes

minor changes
2019-09-18 16:42:37 +05:00
Ayub khan
89b48d3723 BOM-450
python3 compatibility
2019-09-16 17:06:39 +05:00