Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
51,481 Commits 1 Branch 0 Tags
c0e0318f080ca43b441e63b1adbb9aba5abb4e51
Commit Graph

17319 Commits

Author SHA1 Message Date
Awais Jibran
c0e0318f08 Prevent unicode error 
This PR prevents `UnicodeDecodeError` when replacing unicode with bytes string.

Example:

PROD-680
 2019-09-24 13:12:40 +05:00
Awais Qureshi
d8e49fadab Merge pull request #21727 from edx/awais786/BOM-637 
BOM-637
 2019-09-21 17:59:58 +05:00
edX cache uploader bot
79836c3840 Updating Bokchoy testing database cache (#21724) 2019-09-20 09:18:54 -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
Ayub
39fed7c8fa Merge pull request #21706 from edx/BOM-723 
BOM-723
 2019-09-20 15:39:43 +05:00
Ayub
014954cab1 Merge pull request #21709 from edx/BOM-629 
BOM-629
 2019-09-20 15:34:05 +05:00
Ayub
04f3739fac Merge pull request #21713 from edx/BOM-647 
BOM-647
 2019-09-20 15:31:36 +05:00
Awais Qureshi
63ff4c147c BOM-637 
Fixing python3
 2019-09-20 15:19:05 +05:00
Feanil Patel
844acea50e Fix linting errors. 2019-09-19 17:05:02 -04:00
Feanil Patel
4eaf875741 BOM-621 Fix hashing in a bunch of places. 2019-09-19 15:53:39 -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
cbf35593ac BOM-618 Decode to utf-8 before loading as json in tests. 2019-09-19 11:15:11 -04:00
Jeremy Bowman
23870802c6 Replace usage of UUID.get_hex() - BOM-672 2019-09-19 10:32:23 -04:00
Jeremy Bowman
1b6e6634cb Fix edxnotes stub tests BOM-633 2019-09-19 10:32:23 -04:00
Ned Batchelder
835a84f33c Use bytestrings to create SimpleUploadedFiles. BOM-616 2019-09-19 10:32:23 -04:00
Feanil Patel
f259a911c7 BOM-618 Decode content we get from test requests. 2019-09-19 10:32:23 -04:00
Feanil Patel
dab38a5ef3 Merge pull request #21701 from edx/python3-swarm 
Python3 swarm
 2019-09-19 10:23:04 -04:00
Ayub khan
7d5f66853d BOM-647 
python3 compatibility
 2019-09-19 18:47:43 +05:00
Ayub khan
d1b5c51be2 BOM-629 
python3 compatibility
 2019-09-19 17:03:22 +05:00
Ayub khan
00a1db4109 BOM-723 
python3 compatibility
 2019-09-19 15:51:20 +05:00
Aarif
5801f00006 Merge pull request #21681 from edx/BOM-484 
BOM-484
 2019-09-19 14:11:33 +05:00
Jeremy Bowman
07ab555d05 Fix most common/djangoapps/util tests 2019-09-18 14:26:41 -04:00
Feanil Patel
cb64fed1af BOM-489 Studio tests with byte/str mismatch. 2019-09-18 14:21:16 -04:00
Jeremy Bowman
5f2a6430fe Fix YouTube stub responses 2019-09-18 13:56:11 -04:00
Jeremy Bowman
f68c7e87f7 Fix student.helpers logging tests 2019-09-18 12:59:32 -04:00
Jeremy Bowman
42cfb3ec8f Fix last common/djangoapps/track test 2019-09-18 12:08:36 -04:00
Jeremy Bowman
6f18383142 Fix bytes/string handling in tracking middleware 2019-09-18 11:59:24 -04:00
Feanil Patel
220759ee1d Remove unnecessary print statements. 2019-09-18 11:52:15 -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
edX cache uploader bot
742c254562 Updating Bokchoy testing database cache (#21692) 2019-09-18 10:15:22 -04:00
aarif
1c0b78c0b3 python 3 fixes 
minor fixes

minor changes
 2019-09-18 18:10:14 +05:00
Aarif
eaf3924b05 Merge pull request #21680 from edx/BOM-483 
BOM-483
 2019-09-18 18:01:00 +05:00
aarif
098bce230f python 3 fixes 2019-09-17 17:29:41 +05:00
edX cache uploader bot
4bdf59a0d1 Updating Bokchoy testing database cache (#21675) 2019-09-17 08:05:16 -04:00
Aarif
9370492005 Merge pull request #21652 from edx/BOM-474 
BOM-474
 2019-09-17 14:47:21 +05:00
Aarif
c4796b1269 Merge pull request #21661 from edx/BOM-481 
BOM-481
 2019-09-17 13:47:24 +05:00
Aarif
ba3a7e733d Merge pull request #21651 from edx/BOM-473 
BOM-473
 2019-09-17 13:45:07 +05:00
Ayub
eefa0092d0 Merge pull request #21669 from edx/BOM-450 
BOM-450
 2019-09-17 10:12:05 +05:00
aarif
18ac219171 python 3 fixes 
made changes as requested

minor fixes

quality fixes
 2019-09-16 22:09:49 +05:00
Feanil Patel
fb59752c75 Need to return a unicode string in the xml factory. 
The underlying data is put into json documents that expect unicode
strings not byte strings.  In python2 lxml provided strings that were
auto coerced but in python3 it provides byte strings.
 2019-09-16 11:30:05 -04:00
Feanil Patel
a3d39eaeb6 JSON takes unicode as input. 
In python2 there would be some auto coercion done so that the orginal
code here works but that's not the case in python 3.
 2019-09-16 11:30:05 -04:00
aarif
76706553bf python 3 fixes 
test fixes
 2019-09-16 17:19:18 +05:00
Ayub khan
89b48d3723 BOM-450 
python3 compatibility
 2019-09-16 17:06:39 +05:00
aarif
e791325f6c quality fixes 2019-09-16 17:02:33 +05:00
aarif
38ad965c2e test fixes 2019-09-16 16:36:12 +05:00
aarif
602b6d4607 minor fixes 2019-09-16 15:59:02 +05:00
Aarif
7012bcea94 Merge pull request #21653 from edx/BOM-475 
BOM-475
 2019-09-16 12:55:12 +05:00