Remove dependency on cherrypy (now uses the reference WSGI server in …

…Python 2.5 so that version is the lowest usable distrubution now).

examples/async.py

@@ -4,6 +4,7 @@
 from soaplib.serializers.binary import Attachment
 from soaplib.util import get_callback_info
 
+from wsgiref.simple_server import make_server
 from threading import Thread
 from tempfile import mkstemp
 import time
@@ -36,7 +37,5 @@ def woke_up(self,message):
         pass
 
 if __name__=='__main__':
-    try:from cherrypy.wsgiserver import CherryPyWSGIServer
-    except:from cherrypy._cpwsgiserver import CherryPyWSGIServer
-    server = CherryPyWSGIServer(('localhost',7789),SleepingService())
-    server.start()
+    server = make_server('localhost', 7789, SleepingService())
+    server.serve_forever()

examples/binary.py

@@ -3,6 +3,7 @@
 from soaplib.serializers.primitive import String, Integer, Array
 from soaplib.serializers.binary import Attachment
 
+from wsgiref.simple_server import make_server
 from tempfile import mkstemp
 import os
 
@@ -46,7 +47,5 @@ def make_client():
     return client
 
 if __name__=='__main__':
-    try:from cherrypy.wsgiserver import CherryPyWSGIServer
-    except:from cherrypy._cpwsgiserver import CherryPyWSGIServer
-    server = CherryPyWSGIServer(('localhost',7889),DocumentArchiver())
-    server.start()
+    server = make_server('localhost', 7889, DocumentArchiver())
+    server.serve_forever()

examples/classserializer.py

@@ -3,6 +3,8 @@
 from soaplib.serializers.primitive import String, Integer, Array
 from soaplib.serializers.clazz import ClassSerializer
 
+from wsgiref.simple_server import make_server
+
 '''
 This example shows how to define and use complex structures
 in soaplib.  This example uses an extremely simple in-memory
@@ -59,7 +61,5 @@ def list_users(self):
         return [v for k,v in user_database.items()]
 
 if __name__=='__main__':
-    try:from cherrypy.wsgiserver import CherryPyWSGIServer
-    except:from cherrypy._cpwsgiserver import CherryPyWSGIServer
-    server = CherryPyWSGIServer(('localhost',7789),UserManager())
-    server.start()
+    server = make_server('localhost', 7789, UserManager())
+    server.serve_forever()

examples/helloworld.py

@@ -2,6 +2,8 @@
 from soaplib.service import soapmethod
 from soaplib.serializers.primitive import String, Integer, Array
 
+from wsgiref.simple_server import make_server
+
 '''
 This is a simple HelloWorld example to show the basics of writing
 a webservice using soaplib, starting a server, and creating a service
@@ -30,7 +32,5 @@ def make_client():
     return client
 
 if __name__=='__main__':
-    try:from cherrypy.wsgiserver import CherryPyWSGIServer
-    except:from cherrypy._cpwsgiserver import CherryPyWSGIServer
-    server = CherryPyWSGIServer(('localhost',7889),HelloWorldService())
-    server.start()
+    server = make_server('localhost', 7889, HelloWorldService())
+    server.serve_forever()

examples/helloworld_attach.py

@@ -5,6 +5,8 @@
 from soaplib.serializers.primitive import String, Integer, Array
 from soaplib.serializers.binary import Attachment
 
+from wsgiref.simple_server import make_server
+
 class HelloWorldService(SimpleWSGISoapApp):
 
     @soapmethod(Attachment,Integer,_returns=Array(String), _mtom=True)
@@ -15,8 +17,5 @@ def say_hello(self,name,times):
         return results
 
 if __name__=='__main__':
-    try:from cherrypy.wsgiserver import CherryPyWSGIServer
-    except:from cherrypy._cpwsgiserver import CherryPyWSGIServer
-    # this example uses CherryPy2.2, use cherrypy.wsgiserver.CherryPyWSGIServer for CherryPy 3.0
-    server = CherryPyWSGIServer(('localhost',7789),HelloWorldService())
-    server.start()
+    server = make_server('localhost', 7789, HelloWorldService())
+    server.serve_forever()

examples/hooks.py

@@ -1,9 +1,11 @@
 from soaplib.wsgi_soap import SimpleWSGISoapApp
 from soaplib.service import soapmethod
 from soaplib.serializers.primitive import String, Integer, Array
-
 from soaplib.wsgi_soap import request
+
 from time import time
+from wsgiref.simple_server import make_server
+
 
 '''
 This example is an enhanced version of the HelloWorld example that
@@ -62,7 +64,5 @@ def make_client():
     return client
 
 if __name__=='__main__':
-    try:from cherrypy.wsgiserver import CherryPyWSGIServer
-    except:from cherrypy._cpwsgiserver import CherryPyWSGIServer
-    server = CherryPyWSGIServer(('localhost',7889),HelloWorldService())
-    server.start()
+    server = make_server('localhost', 7889, HelloWorldService())
+    server.serve_forever()

examples/override.py

@@ -2,6 +2,8 @@
 from soaplib.service import soapmethod
 from soaplib.serializers.primitive import String, Integer, Array
 
+from wsgiref.simple_server import make_server
+
 '''
 This example shows how to override the variable names for fun and profit.
 This is very useful for situations that require the use of variable names
@@ -18,7 +20,5 @@ def sendEmail(self,_to,_from,message):
         return 'sent!'
 
 if __name__=='__main__':
-    try:from cherrypy.wsgiserver import CherryPyWSGIServer
-    except:from cherrypy._cpwsgiserver import CherryPyWSGIServer
-    server = CherryPyWSGIServer(('localhost',7989),EmailManager())
-    server.start()
+    server = make_server('localhost', 7989,EmailManager())
+    server.serve_forever()

setup.py

@@ -1,6 +1,10 @@
 #!/usr/bin/env python
 
 from setuptools import setup, find_packages
+import sys
+
+if sys.hexversion < 0x2050000
+   raise RuntimeError("Python 2.5 or higher required)
 
 
 VERSION = '0.7.2'
@@ -34,7 +38,7 @@
       license='LGPL',
       packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
       zip_safe=False,
-      install_requires=['pytz', 'cherrypy', 'lxml'],
+      install_requires=['pytz', 'lxml'],
       test_suite='tests.test_suite',
       entry_points="""
       """,