neale/moth
neale
/
moth
mirror of https://github.com/dirtbags/moth.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into neale

This commit is contained in:
Neale Pickett 2019-11-02 15:02:27 -06:00
parent 9be527fa8f d1bffeace1
commit 4b05d31002
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
3.3 3.3.1

9
devel/devel-server.py
View File

@ -14,6 +14,7 @@ import os
import pathlib import pathlib
import random import random
import shutil import shutil
import socketserver
import sys import sys
import traceback import traceback
import mothballer import mothballer
@ -25,14 +26,8 @@ from http import HTTPStatus
sys.dont_write_bytecode = True # Don't write .pyc files sys.dont_write_bytecode = True # Don't write .pyc files
try:
ThreadingHTTPServer = http.server.ThreadingHTTPServer
except AttributeError:
import socketserver
class ThreadingHTTPServer(socketserver.ThreadingMixIn, http.server.HTTPServer):
daemon_threads = True
class MothServer(ThreadingHTTPServer): class MothServer(socketserver.ForkingMixIn, http.server.HTTPServer):
def __init__(self, server_address, RequestHandlerClass): def __init__(self, server_address, RequestHandlerClass):
super().__init__(server_address, RequestHandlerClass) super().__init__(server_address, RequestHandlerClass)
self.args = {} self.args = {}