summaryrefslogtreecommitdiff
path: root/jsonrpclib
diff options
context:
space:
mode:
authorJosh Marshall <jmarshall@ecology-dev.local>2010-10-26 03:20:19 -0500
committerJosh Marshall <jmarshall@ecology-dev.local>2010-10-26 03:20:19 -0500
commit6a388ded772221c4b5fbb07ed69db8d57b0b583e (patch)
tree8dfb49609d4b2c5c984ab08cd9d3dea881e5e6dc /jsonrpclib
parent283a2a94ca6376d96b2feda716bc3a2ffbb31cb1 (diff)
downloadjsonrpclib-6a388ded772221c4b5fbb07ed69db8d57b0b583e.tar.gz
Setting fcntl to None if not importable, adding tests module, updating README to markdown.
Diffstat (limited to 'jsonrpclib')
-rw-r--r--jsonrpclib/SimpleJSONRPCServer.py16
-rw-r--r--jsonrpclib/history.py1
2 files changed, 6 insertions, 11 deletions
diff --git a/jsonrpclib/SimpleJSONRPCServer.py b/jsonrpclib/SimpleJSONRPCServer.py
index 75193b2..370ae40 100644
--- a/jsonrpclib/SimpleJSONRPCServer.py
+++ b/jsonrpclib/SimpleJSONRPCServer.py
@@ -4,8 +4,12 @@ import SimpleXMLRPCServer
import SocketServer
import types
import traceback
-import fcntl
import sys
+try:
+ import fcntl
+except ImportError:
+ # For Windows
+ fcntl = None
def get_version(request):
# must be a dict
@@ -173,8 +177,7 @@ class SimpleJSONRPCRequestHandler(
self.wfile.flush()
self.connection.shutdown(1)
-class SimpleJSONRPCServer(SocketServer.TCPServer,
- SimpleJSONRPCDispatcher):
+class SimpleJSONRPCServer(SocketServer.TCPServer, SimpleJSONRPCDispatcher):
allow_reuse_address = True
@@ -209,10 +212,3 @@ class CGIJSONRPCRequestHandler(SimpleJSONRPCDispatcher):
sys.stdout.write(response)
handle_xmlrpc = handle_jsonrpc
-
-if __name__ == '__main__':
- print 'Running JSON-RPC server on port 8000'
- server = SimpleJSONRPCServer(("localhost", 8000))
- server.register_function(pow)
- server.register_function(lambda x,y: x+y, 'add')
- server.serve_forever()
diff --git a/jsonrpclib/history.py b/jsonrpclib/history.py
index e6a01cf..d11863d 100644
--- a/jsonrpclib/history.py
+++ b/jsonrpclib/history.py
@@ -1,4 +1,3 @@
-
class History(object):
"""
This holds all the response and request objects for a