Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix httpd.py test script for Py3 compatibility

Browse source 
With these changes the script still works on Python 2.6/2.7.
This commit is contained in:
Daniel Thayer 2016-10-06 15:45:11 -05:00
parent 26d9517774
commit e780ebb17a
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
testing/scripts/httpd.py
View file

@ -1,7 +1,11 @@
#! /usr/bin/env python #! /usr/bin/env python
import BaseHTTPServer try:
# Python 2
import BaseHTTPServer
except ImportError:
# Python 3
import http.server as BaseHTTPServer
class MyRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler): class MyRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
@ -11,9 +15,9 @@ class MyRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
self.end_headers() self.end_headers()
if "/empty" in self.path: if "/empty" in self.path:
self.wfile.write("") self.wfile.write(b"")
else: else:
self.wfile.write("It works!") self.wfile.write(b"It works!")
def do_POST(self): def do_POST(self):
self.send_response(200) self.send_response(200)
@ -21,9 +25,9 @@ class MyRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
self.end_headers() self.end_headers()
if "/empty" in self.path: if "/empty" in self.path:
self.wfile.write("") self.wfile.write(b"")
else: else:
self.wfile.write("It works!") self.wfile.write(b"It works!")
def version_string(self): def version_string(self):
return "1.0" return "1.0"