Add Python 2 support

Add requirements file for reproducible builds
This commit is contained in:
Sam Whited 2015-07-04 13:28:52 -05:00
parent 2f8ac488a5
commit af00bb7562
5 changed files with 15 additions and 4 deletions

1
__init__.py Normal file
View File

@ -0,0 +1 @@
# Make Python 2 happy

View File

@ -0,0 +1 @@
# Make Python 2 happy

BIN
plugins/__init__.pyc Normal file

Binary file not shown.

3
requirements.txt Normal file
View File

@ -0,0 +1,3 @@
PyYAML==3.11
sleekxmpp==1.3.1
wheel==0.24.0

View File

@ -9,8 +9,14 @@ import random
import os import os
from threading import Thread from threading import Thread
from threading import Lock from threading import Lock
from http.server import HTTPServer, BaseHTTPRequestHandler try:
from socketserver import ThreadingMixIn # Python 3
from http.server import HTTPServer, BaseHTTPRequestHandler
from socketserver import ThreadingMixIn
except ImportError:
# Python 2
from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
from SocketServer import ThreadingMixIn
import sleekxmpp import sleekxmpp
from sleekxmpp.componentxmpp import ComponentXMPP from sleekxmpp.componentxmpp import ComponentXMPP
@ -142,12 +148,12 @@ class HttpHandler(BaseHTTPRequestHandler):
class ThreadedHTTPServer(ThreadingMixIn, HTTPServer): class ThreadedHTTPServer(ThreadingMixIn, HTTPServer):
"""Handle requests in a separate thread.""" """Handle requests in a separate thread."""
if __name__ == "__main__": if __name__ == "__main__":
global files global files
global files_lock global files_lock
global config global config
with open('config.yml','r') as ymlfile: with open('config.yml','r') as ymlfile:
config = yaml.load(ymlfile) config = yaml.load(ymlfile)