diff --git a/servefile b/servefile index b409f65..bb8bb35 100755 --- a/servefile +++ b/servefile @@ -14,7 +14,6 @@ import base64 import cgi import datetime import mimetypes -import urllib import os import re import select @@ -27,10 +26,12 @@ import time try: import BaseHTTPServer import SocketServer + from urllib import quote, unquote except ImportError: # both have different names in python3 import http.server as BaseHTTPServer import socketserver as SocketServer + from urllib.parse import quote, unquote # only activate SSL if available HAVE_SSL = False @@ -56,7 +57,7 @@ class FileBaseHandler(BaseHTTPServer.BaseHTTPRequestHandler): Returns True if a redirect was issued. """ if not fileName: fileName = self.fileName - if urllib.unquote(self.path) != "/" + fileName: + if unquote(self.path) != "/" + fileName: self.send_response(302) self.send_header('Location', '/' + fileName) self.end_headers() @@ -346,12 +347,12 @@ class DirListingHandler(FileBaseHandler):
The requestet URL %s was not found on this server