Commits

Ian Bicking committed 17ac8f0

Import CherryPy WSGI server directly; should fix #1

  • Participants
  • Parent commits e701753

Comments (0)

Files changed (2)

File docs/news.txt

 
 .. contents::
 
+hg tip
+------
+
+* Import CherryPy directly instead of including its server inline in the
+  ``paste.script`` package.  You must install CherryPy before using
+  ``egg:PasteScript#cherrypy``
+
 1.7.4.2
 -------
 

File paste/script/cherrypy_server.py

 """
 Entry point for CherryPy's WSGI server
 """
-import paste.script.wsgiserver as wsgiserver
+try:
+    from cherrypy import wsgiserver
+except ImportError:
+    print '=' * 60
+    print '== You must install CherryPy (pip install cherrypy) to use the egg:PasteScript#cherrypy server'
+    print '=' * 60
+    raise
+
 
 def cpwsgi_server(app, global_conf=None, host='127.0.0.1', port=None,
                   ssl_pem=None, protocol_version=None, numthreads=None,