Skip to content

Commit

Permalink
Merge pull request #408 from swisscom/upgrade_python
Browse files Browse the repository at this point in the history
Update python app to Python 3.x
  • Loading branch information
pivotaljohn authored Feb 25, 2020
2 parents 00cdb2e + 333427b commit d51a1d6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion assets/python/runtime.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
\r\r\n\npython-2.7.x\n\n\r\r
python-3.x
12 changes: 6 additions & 6 deletions assets/python/server.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
from SocketServer import ThreadingMixIn
from http.server import HTTPServer, BaseHTTPRequestHandler
from socketserver import ThreadingMixIn
import os

class Handler(BaseHTTPRequestHandler):
def do_GET(self):
self.send_response(200)
self.end_headers()
message = "Hello python, world!"
self.wfile.write(message)
self.wfile.write('\n')
self.wfile.write(message.encode('utf-8'))
self.wfile.write('\n'.encode('utf-8'))
return

class ThreadedHTTPServer(ThreadingMixIn, HTTPServer):
Expand All @@ -17,7 +17,7 @@ class ThreadedHTTPServer(ThreadingMixIn, HTTPServer):
if __name__ == '__main__':
port = int(os.environ.get('PORT', '8080'))
host = os.environ.get('VCAP_APP_HOST', '127.0.0.1')
print "Goin to start sever on %s:%s" % (host, port)
print("Going to start server on %s:%s" % (host, port))
server = ThreadedHTTPServer((host, port), Handler)
print 'Starting server, use <Ctrl-C> to stop'
print('Starting server, use <Ctrl-C> to stop')
server.serve_forever()

0 comments on commit d51a1d6

Please sign in to comment.