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

ran python-modernize and isort on files mentioned in INCR-410

Browse Source 
Updated the file as suggested

ran python-modernize and isort on files mentioned in INCR-410

Updated the file as suggested

changes made to comply with quality

ran python-modernize and isort on files mentioned in INCR-410

Updated the file as suggested

changes made to comply with quality
This commit is contained in:
aarif
2019-07-11 15:33:32 +05:00
committed by root
parent 0544c6d826
commit 86b810a23a
4 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/lib/capa/capa/xqueue_interface.py
View File

@@ -1,12 +1,14 @@
#
# LMS Interface to external queueing system (xqueue)
#
from __future__ import absolute_import
import hashlib
import json
import logging
import requests
import six
log = logging.getLogger(__name__)
dateformat = '%Y%m%d%H%M%S'
@@ -70,7 +72,7 @@ class XQueueInterface(object):
"""
def __init__(self, url, django_auth, requests_auth=None):
self.url = unicode(url)
self.url = six.text_type(url)
self.auth = django_auth
self.session = requests.Session()
self.session.auth = requests_auth
@@ -111,7 +113,7 @@ class XQueueInterface(object):
f.seek(0)
(error, msg) = self._send_to_queue(header, body, files_to_upload)
return (error, msg)
return error, msg
def _login(self):
payload = {
@@ -139,13 +141,13 @@ class XQueueInterface(object):
)
except requests.exceptions.ConnectionError as err:
log.error(err)
return (1, 'cannot connect to server')
return 1, 'cannot connect to server'
except requests.exceptions.ReadTimeout as err:
log.error(err)
return (1, 'failed to read from the server')
return 1, 'failed to read from the server'
if response.status_code not in [200]:
return (1, 'unexpected HTTP status code [%d]' % response.status_code)
return 1, 'unexpected HTTP status code [%d]' % response.status_code
return parse_xreply(response.text)