Remove unnecessary imports.

splash/qtrender_lua.py

@@ -9,6 +9,7 @@
 import sys
 
 import lupa
+import six
 
 from splash.browser_tab import JsError
 from splash.lua_runner import (
@@ -29,9 +30,8 @@
     create_proxy
 )
 from splash.lua_runtime import SplashLuaRuntime
-from splash.compat import _PY3
 
-if _PY3:
+if six.PY3:
     basestring = (str, bytes)
 
 

splash/resources.py

@@ -352,7 +352,6 @@ def render_GET(self, request):
         url = params['url']
         if not url.lower().startswith('http'):
             url = 'http://' + url
-        url = url.encode('utf8')
         params = {k:v for k,v in params.items() if v is not None}
 
         request.addCookie('phaseInterval', 120000)  # disable "phases" HAR Viewer feature

splash/tests/mockserver.py

@@ -14,9 +14,6 @@
 from twisted.internet import reactor, ssl
 from twisted.internet.task import deferLater
 
-from splash.compat import _PY3
-from splash.utils import bytes_to_unicode
-
 
 _REQUIRED = object()
 

splash/tests/test_jsonpost.py

@@ -7,10 +7,9 @@
 import six
 
 from . import test_render, test_har, test_request_filters, test_runjs
-from ..compat import _PY3
 from ..utils import bytes_to_unicode
 
-if _PY3:
+if six.PY3:
     basestring = (str, bytes)
 
 

splash/utils.py

@@ -10,10 +10,9 @@
 import resource
 from collections import defaultdict
 import psutil
+import six
 
-from splash.compat import _PY3
-
-if _PY3:
+if six.PY3:
     basestring = (str, bytes)