Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17406 from edx/yro/EDUCATOR-2230_code

Browse Source 
Swap out exception class
This commit is contained in:
Gregory Martin
2018-02-07 15:14:35 -05:00
committed by GitHub
parent a19bc8c30d c1a4184acd
commit 4e7a602e67
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cms/djangoapps/contentstore/views/videos.py
View File

@@ -506,11 +506,8 @@ def convert_video_status(video):
* `YouTube Duplicate` if status is `invalid_token`
* user-friendly video status
"""
try:
# Protect against legacy incomplete edx-val edx_video_id records.
now = datetime.now(video['created'].tzinfo)
except AttributeError:
now = datetime.now().replace(tzinfo=UTC)
now = datetime.now(video.get('created', datetime.now().replace(tzinfo=UTC)).tzinfo)
if video['status'] == 'upload' and (now - video['created']) > timedelta(hours=MAX_UPLOAD_HOURS):
new_status = 'upload_failed'
status = StatusDisplayStrings.get(new_status)