[REM] all references to cherrypy

bzr revid: xmo@openerp.com-20110902090326-veq9cb9wgb9rr6m4

5 files changed, 2 insertions, 29 deletions

diff --git a/addons/base/common/dispatch.py b/addons/base/common/dispatch.py
index 704e91d8580..14e1a873830 100644
--- a/addons/base/common/dispatch.py
+++ b/addons/base/common/dispatch.py
@@ -29,7 +29,6 @@ import __main__
 
 path_root = __main__.path_root
 path_addons = __main__.path_addons
-cherrypy_root = None
 
 #-----------------------------------------------------------
 # Globals (wont move into a pool)
@@ -46,10 +45,7 @@ controllers_path = {}
 # OpenERP Web RequestHandler
 #----------------------------------------------------------
 class WebRequest(object):
-    """ CherryPy request handling
-    """
     def __init__(self, request, config):
-        # Move cherrypy thread local objects to attributes
         self.applicationsession = applicationsession
         self.httprequest = request
         self.httpresponse = None
@@ -213,10 +209,6 @@ def httprequest(f):
     http_handler.exposed = True
     return http_handler
 
-#-----------------------------------------------------------
-# Cherrypy stuff
-#-----------------------------------------------------------
-
 class ControllerType(type):
     def __init__(cls, name, bases, attrs):
         super(ControllerType, cls).__init__(name, bases, attrs)
diff --git a/addons/web_chat/controllers/main.py b/addons/web_chat/controllers/main.py
index 5c427812d47..e445eb4be6d 100644
--- a/addons/web_chat/controllers/main.py
+++ b/addons/web_chat/controllers/main.py
@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
-import sys, time
-import cherrypy
+import time
 
 import simplejson
-import random
 import base.common as openerpweb
 
 #----------------------------------------------------------
@@ -38,7 +36,7 @@ class PollServerMessageQueue(object):
             if msg['to'] == recipient:
                 return self.messages
             
-    def gc():
+    def gc(self):
         # remove message older than 300s from self.l
         # remove dead users from self.users
         pass
@@ -72,7 +70,6 @@ class PollServer(openerpweb.Controller):
         
         #r = 'logged in'
         #u = generate random.randint(0,2**32)
-        #s = cherrypy cookie id
         #f = mq.userlist()
         
 #        username = 'Guest'+ str(random.randint(0, 2**32))
@@ -132,8 +129,6 @@ class PollServer(openerpweb.Controller):
         
         msg = '[]'
 
-        cherrypy.response.headers['content-type'] = 'application/javascript';
-        
         for i in range(5):
             received_msg = mq.read('Guest1', i)
             if received_msg:
diff --git a/addons/web_mobile/controllers/__init__.py b/addons/web_mobile/controllers/__init__.py
index 8ee9bae18d9..e69de29bb2d 100644
--- a/addons/web_mobile/controllers/__init__.py
+++ b/addons/web_mobile/controllers/__init__.py
@@ -1 +0,0 @@
-import main
diff --git a/addons/web_mobile/controllers/main.py b/addons/web_mobile/controllers/main.py
deleted file mode 100644
index 8fa3e32a775..00000000000
--- a/addons/web_mobile/controllers/main.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-#import glob, os
-#import pprint
-#
-#import simplejson
-#
-#import openerpweb
-#import openerpweb.ast
-#import openerpweb.nonliterals
-#
-#import cherrypy
-#
diff --git a/setup.py b/setup.py
index 55a5e92c8a5..648c2f54584 100644
--- a/setup.py
+++ b/setup.py
@@ -54,7 +54,6 @@ setup(
     download_url=download_url,
     license=license,
     install_requires=[
-        "CherryPy >= 3.1.2",
         "Babel >= 0.9.6",
         "simplejson >= 2.0.9",
         "python-dateutil >= 1.4.1",