Explorar o código

Change urllib calls.

Bentley James Oakes %!s(int64=7) %!d(string=hai) anos
pai
achega
5ac35dd4f5
Modificáronse 1 ficheiros con 12 adicións e 3 borrados
  1. 12 3
      integration/utils.py

+ 12 - 3
integration/utils.py

@@ -5,8 +5,17 @@ import os
 import sys
 import time
 import json
-import urllib
-import urllib2
+
+
+if sys.version_info[0] < 3:
+    from urllib2 import urlopen as urlopen
+    from urllib2 import Request as Request
+    from urllib import urlencode as urlencode
+else:
+    from urllib.request.urlopen import urlopen as urlopen
+    from urllib.request.Request import Request as Request
+    from urllib.parse.urlencode import urlencode as urlencode
+
 import subprocess
 import signal
 import random
@@ -72,7 +81,7 @@ def kill(process):
 
 def flush_data(address, data):
     if data:
-        urllib2.urlopen(urllib2.Request(address, urllib.urlencode({"op": "set_input", "data": json.dumps(data), "taskname": taskname})), timeout=INIT_TIMEOUT).read()
+        urlopen(Request(address, urlencode({"op": "set_input", "data": json.dumps(data), "taskname": taskname})), timeout=INIT_TIMEOUT).read()
     return []
 
 def start_mvc():