Drop python2 support.

Update for PyTQt.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

1 files changed, 12 insertions, 13 deletions

diff --git a/amarok/src/scripts/webcontrol/RequestHandler.py b/amarok/src/scripts/webcontrol/RequestHandler.py
index 8519ef35..2d0b2cb3 100644
--- a/amarok/src/scripts/webcontrol/RequestHandler.py
+++ b/amarok/src/scripts/webcontrol/RequestHandler.py
@@ -11,8 +11,8 @@
  License: GPL
 
 """
-import SimpleHTTPServer
-import BaseHTTPServer
+import http.server
+import http.server
 from Playlist import Playlist
 import Globals
 
@@ -63,8 +63,7 @@ class AmarokStatus:
         if self.playState != -1:
             res = self.playState == self.EnginePlay
         else:
-            res = string.find(self.dcop_isplaying.result(), "true") >= 0
-            if res:
+            if "true" in self.dcop_isplaying.result():
                 self.playState = self.EnginePlay
             else:
                 self.playState = self.EnginePause
@@ -85,7 +84,7 @@ class AmarokStatus:
     def controlsEnabled(self):
         return self.allowControl
 
-class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
+class RequestHandler(http.server.SimpleHTTPRequestHandler):
     """We need our own 'RequestHandler, to handle the requests, that arrive at
     our server."""
     
@@ -144,10 +143,10 @@ class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
         
         # abort a request that has already been completed
         # probably a refresh from the users browser
-        if qmap.has_key("reqid") and req_id == int(qmap["reqid"]):
+        if "reqid" in qmap and req_id == int(qmap["reqid"]):
             return 0
 
-        if qmap.has_key("action"):
+        if "action" in qmap:
             a = qmap["action"]
             if a == "stop":
                 self._amarokStop()
@@ -193,9 +192,9 @@ class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
         # get the sessions last reqid
         last_req_id = 0
         session_id = None
-        if qmap.has_key("sesid"):
+        if "sesid" in qmap:
             session_id = qmap["sesid"]
-            if REQ_IDS.has_key(session_id):
+            if session_id in REQ_IDS:
                 last_req_id = REQ_IDS[session_id]
             else:
                 REQ_IDS[session_id] = last_req_id
@@ -229,15 +228,15 @@ class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
         # Surely there must be a better way that this:)
         #
         self.send_response(200)
-        if string.find(self.path, ".png") >= 0:
+        if ".png" in self.path:
             self.send_header("content-type","image/png")
             self.end_headers()
             self._sendFile(self.path)
-        elif string.find(self.path, ".js") >= 0:
+        elif ".js" in self.path:
             self.send_header("content-type","text/plain")
             self.end_headers()
             self._sendFile(self.path)
-        elif string.find(self.path, ".css") >= 0:
+        elif ".css" in self.path:
             self.send_header("content-type","text/css")
             self.end_headers()
             self._sendFile(self.path)
@@ -257,7 +256,7 @@ def main():
     """main is the starting-point for our script."""
     global PLIST
     PLIST = Playlist()
-    srv = BaseHTTPServer.HTTPServer(('',Globals.PORT),RequestHandler)
+    srv = http.server.HTTPServer(('',Globals.PORT),RequestHandler)
     srv.serve_forever()