diff --git a/Lesson_1/database_setup.py b/Lesson-1/database_setup.py similarity index 100% rename from Lesson_1/database_setup.py rename to Lesson-1/database_setup.py diff --git a/Lesson_1/lotsofmenus.py b/Lesson-1/lotsofmenus.py similarity index 100% rename from Lesson_1/lotsofmenus.py rename to Lesson-1/lotsofmenus.py diff --git a/Lesson-2/first-web-server/webserver.py b/Lesson-2/first-web-server/webserver.py index f870055..dbf594e 100644 --- a/Lesson-2/first-web-server/webserver.py +++ b/Lesson-2/first-web-server/webserver.py @@ -1,4 +1,8 @@ -from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer +from __future__ import print_function +try: + from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer #Python 2 +except ImportError: + from http.server import BaseHTTPRequestHandler, HTTPServer #Python 3 class WebServerHandler(BaseHTTPRequestHandler): @@ -8,10 +12,10 @@ def do_GET(self): self.send_response(200) self.send_header('Content-type', 'text/html') self.end_headers() - message = "" - message += "Hello!" + message = b"" + message += b"Hello!" self.wfile.write(message) - print message + print(message) return else: self.send_error(404, 'File Not Found: %s' % self.path) @@ -21,10 +25,10 @@ def main(): try: port = 8080 server = HTTPServer(('', port), WebServerHandler) - print "Web Server running on port %s" % port + print("Web Server running on port %s" % port) server.serve_forever() except KeyboardInterrupt: - print " ^C entered, stopping web server...." + print(" ^C entered, stopping web server....") server.socket.close() if __name__ == '__main__':