Skip to content

Renamed Lesson 1 directory for consistency #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Renamed Lesson 1 directory for consistency #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a68b81
Renamed Lesson 1 directory for consistency
daniel-s-ingram Oct 21, 2018
b808df3
Updated for compatibility with Python 2 or Python 3
daniel-s-ingram Oct 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 Lesson_1/database_setup.py → Lesson-1/database_setup.py
View file
Open in desktop
File renamed without changes.
0 Lesson_1/lotsofmenus.py → Lesson-1/lotsofmenus.py
View file
Open in desktop
File renamed without changes.
16 changes: 10 additions & 6 deletions Lesson-2/first-web-server/webserver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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):
Expand All @@ -8,10 +12,10 @@ def do_GET(self):
self.send_response(200)
self.send_header('Content-type', 'text/html')
self.end_headers()
message = ""
message += "<html><body>Hello!</body></html>"
message = b""
message += b"<html><body>Hello!</body></html>"
self.wfile.write(message)
print message
print(message)
return
else:
self.send_error(404, 'File Not Found: %s' % self.path)
Expand All @@ -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__':
Expand Down