Download Install Tutorial Docs FAQ Tools Wiki ∇ License Team IRC Planet Involvement Shop Book

Changeset 1926

Show
Ignore:
Timestamp:
03/16/08 17:29:06
Author:
fumanchu
Message:

Renamed restsrv -> process in all referrers.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/cherrypy/__init__.py

    r1868 r1926  
    179179from cherrypy import _cpwsgi as wsgi 
    180180 
    181 from cherrypy import restsrv 
     181from cherrypy import process 
    182182try: 
    183     from cherrypy.restsrv import win32 as _restsrvwin 
    184     engine = _restsrvwin.Win32Bus() 
    185     _console_control_handler = _restsrvwin.ConsoleCtrlHandler(engine) 
     183    from cherrypy.process import win32 
     184    engine = win32.Win32Bus() 
     185    _console_control_handler = win32.ConsoleCtrlHandler(engine) 
    186186    # If you don't want a ConsoleControlHandler, 
    187187    # unsubscribe this before calling engine.start(). 
    188188    _console_control_handler.subscribe() 
     189    del win32 
    189190except ImportError: 
    190     engine = restsrv.bus 
     191    engine = process.bus 
    191192 
    192193 
    193194# Timeout monitor 
    194 class _TimeoutMonitor(restsrv.plugins.Monitor): 
     195class _TimeoutMonitor(process.plugins.Monitor): 
    195196     
    196197    def __init__(self, bus): 
    197198        self.servings = [] 
    198         restsrv.plugins.Monitor.__init__(self, bus, self.run) 
     199        process.plugins.Monitor.__init__(self, bus, self.run) 
    199200     
    200201    def acquire(self): 
    …… 
    215216 
    216217# Add an autoreloader (the 'engine' config namespace may detach/attach it). 
    217 engine.autoreload = restsrv.plugins.Autoreloader(engine) 
     218engine.autoreload = process.plugins.Autoreloader(engine) 
    218219engine.autoreload.subscribe() 
    219220 
    220 restsrv.plugins.ThreadManager(engine).subscribe() 
    221  
    222 signal_handler = restsrv.plugins.SignalHandler(engine) 
     221process.plugins.ThreadManager(engine).subscribe() 
     222 
     223signal_handler = process.plugins.SignalHandler(engine) 
    223224 
    224225from cherrypy import _cpserver 

  • trunk/cherrypy/_cpserver.py

    r1837 r1926  
    99# We import * because we want to export check_port 
    1010# et al as attributes of this module. 
    11 from cherrypy.restsrv.servers import * 
     11from cherrypy.process.servers import * 
    1212 
    1313 

  • trunk/cherrypy/cherryd.py

    r1887 r1926  
    66 
    77import cherrypy 
    8 from cherrypy.restsrv import plugins 
     8from cherrypy.process import plugins 
    99 
    1010 

  • trunk/cherrypy/lib/sessions.py

    r1924 r1926  
    147147            # clean_up is in instancemethod and not a classmethod, 
    148148            # so that tool config can be accessed inside the method. 
    149             t = cherrypy.restsrv.plugins.Monitor( 
     149            t = cherrypy.process.plugins.Monitor( 
    150150                cherrypy.engine, self.clean_up, self.clean_freq * 60) 
    151151            t.subscribe() 

  • trunk/cherrypy/process/__init__.py

    r1691 r1926  
    1111""" 
    1212 
    13 from cherrypy.restsrv.wspbus import bus 
    14 from cherrypy.restsrv import plugins, servers 
     13from cherrypy.process.wspbus import bus 
     14from cherrypy.process import plugins, servers 

  • trunk/cherrypy/process/plugins.py

    r1896 r1926  
    353353        """Start our callback in its own perpetual timer thread.""" 
    354354        if self.frequency > 0: 
    355             threadname = "restsrv %s" % self.__class__.__name__ 
     355            threadname = self.__class__.__name__ 
    356356            if self.thread is None: 
    357357                self.thread = PerpetualTimer(self.frequency, self.callback) 

  • trunk/cherrypy/process/win32.py

    r1842 r1926  
    1 """Windows service for restsrv. Requires pywin32.""" 
     1"""Windows service. Requires pywin32.""" 
    22 
    33import os 
    …… 
    99import win32serviceutil 
    1010 
    11 from cherrypy.restsrv import wspbus, plugins 
     11from cherrypy.process import wspbus, plugins 
    1212 
    1313 
    …… 
    143143    _svc_display_name_ = "Python Web Service" 
    144144    _svc_deps_ = None        # sequence of service names on which this depends 
    145     _exe_name_ = "restsrv" 
     145    _exe_name_ = "pywebsvc" 
    146146    _exe_args_ = None        # Default to no arguments 
    147147     
    …… 
    150150     
    151151    def SvcDoRun(self): 
    152         from cherrypy import restsrv 
    153         restsrv.bus.start() 
    154         restsrv.bus.block() 
     152        from cherrypy import process 
     153        process.bus.start() 
     154        process.bus.block() 
    155155     
    156156    def SvcStop(self): 
    157         from cherrypy import restsrv 
     157        from cherrypy import process 
    158158        self.ReportServiceStatus(win32service.SERVICE_STOP_PENDING) 
    159         restsrv.bus.exit() 
     159        process.bus.exit() 
    160160     
    161161    def SvcOther(self, control): 
    162         restsrv.bus.publish(control_codes.key_for(control)) 
     162        process.bus.publish(control_codes.key_for(control)) 
    163163 
    164164 

  • trunk/cherrypy/scaffold/cpdeploy.py

    r1864 r1926  
    1212 
    1313import cherrypy 
    14 from cherrypy.restsrv.plugins import Daemonizer, PIDFile 
     14from cherrypy.process.plugins import Daemonizer, PIDFile 
    1515 
    1616# TODO: Change this to import your project root. 

  • trunk/cherrypy/test/test_states_demo.py

    r1830 r1926  
    55 
    66import cherrypy 
    7 from cherrypy.restsrv import plugins 
     7from cherrypy.process import plugins 
    88thisdir = os.path.join(os.getcwd(), os.path.dirname(__file__)) 
    99PID_file_path = os.path.join(thisdir, 'pid_for_test_daemonize') 

Hosted by WebFaction

Log in as guest/cpguest to create tickets