From: W. Trevor King <wking@drexel.edu>
Date: Wed, 25 Aug 2010 13:00:05 +0000 (-0400)
Subject: Remove CherryPy v2.* support
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=28d121f4c3fe3dc5d2662be8fb443bf4c6f2e0e0;p=chemdb.git

Remove CherryPy v2.* support
---

diff --git a/chemdb/server.py b/chemdb/server.py
index 3dcfb0a..aadc551 100644
--- a/chemdb/server.py
+++ b/chemdb/server.py
@@ -210,8 +210,6 @@ class ServerDaemon (Daemon):
     def run(self):
         if cherrypy.__version__.startswith('3.'):
             cherrypy.quickstart(root=self.server, config=self.app_config)
-        elif cherrypy.__version__.startswith('2.'):
-            cherrypy.server.start()
 
 #        if self.pkey_file == None or self.cert_file == None:
 #            logging.info("http://%s:%d/" % web.validip(self.ip_address))
@@ -368,19 +366,6 @@ class ServerDaemon (Daemon):
                     app_config[url] = digest_auth
             self.server = server
             self.app_config = app_config
-        elif cherrypy.__version__.startswith('2.'):
-            cherrypy.root = server
-            cherrypy.config.update({
-                    'server.environment': 'production',
-                    'server.socket_host': self.options.address,
-                    'server.socket_port': int(self.options.port),
-                    'decoding_filter.on': True,
-                    'encoding_filter.on': True,
-                    'encodinf_filter.encoding': 'utf8',
-                    'static_filter.on': True,
-                    'static_filter.dir': static_dir,
-                    })
-            cherrypy.server.start()
         else:
             raise NotImplementedError(
                 'Unsupported CherryPy version %s' % cherrypy.__version__)