[REM] all references to cherrypy
bzr revid: xmo@openerp.com-20110902090326-veq9cb9wgb9rr6m4
This commit is contained in:
parent
4d89672e72
commit
12462610b0
|
@ -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)
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
import main
|
|
@ -1,12 +0,0 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
#import glob, os
|
||||
#import pprint
|
||||
#
|
||||
#import simplejson
|
||||
#
|
||||
#import openerpweb
|
||||
#import openerpweb.ast
|
||||
#import openerpweb.nonliterals
|
||||
#
|
||||
#import cherrypy
|
||||
#
|
Loading…
Reference in New Issue