Merge branch 'master' of https://github.com/FOSSEE/online_test into edit_questionpaper

Resolved
Conflicts:
	yaksh/views.py

1 files changed, 12 insertions, 3 deletions

diff --git a/yaksh/xmlrpc_clients.py b/yaksh/xmlrpc_clients.py
index 6bfe0d6..4da70dd 100644
--- a/yaksh/xmlrpc_clients.py
+++ b/yaksh/xmlrpc_clients.py
@@ -1,11 +1,19 @@
-from xmlrpclib import ServerProxy
+from __future__ import unicode_literals
 import time
 import random
 import socket
 import json
 import urllib
+from six.moves import urllib
 
-from settings import SERVER_PORTS, SERVER_POOL_PORT
+try:
+    from xmlrpclib import ServerProxy
+except ImportError:
+    # The above import will not work on Python-3.x.
+    from xmlrpc.client import ServerProxy
+
+# Local imports
+from .settings import SERVER_PORTS, SERVER_POOL_PORT
 
 
 class ConnectionError(Exception):
@@ -58,7 +66,8 @@ class CodeServerProxy(object):
         return result
 
     def _get_server(self):
-        port = json.loads(urllib.urlopen(self.pool_url).read())
+        response = urllib.request.urlopen(self.pool_url)
+        port = json.loads(response.read().decode('utf-8'))
         proxy = ServerProxy('http://localhost:%d' % port)
         return proxy