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

Changeset 808

Show
Ignore:
Timestamp:
11/10/05 13:54:36
Author:
fumanchu
Message:

Moved cherrypy.lib.filter to cherrypy.filters. The old path will work (with a warning) until 2.3, when it will be removed.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/cherrypy/__init__.py

    r768 r808  
    5151 
    5252# Create variables needed for session (see lib/sessionfilter.py for more info) 
    53 from lib.filter import sessionfilter 
     53from filters import sessionfilter 
    5454session = sessionfilter.SessionWrapper() 
    5555_sessionDataHolder = {} # Needed for RAM sessions only 

  • trunk/cherrypy/_cphttptools.py

    r807 r808  
    88import cherrypy 
    99from cherrypy import _cputil, _cpcgifs, _cpwsgiserver 
    10 from cherrypy.lib.filter import applyFilters 
     10from cherrypy.filters import applyFilters 
    1111from cherrypy.lib import cptools, httptools 
    1212 

  • trunk/cherrypy/_cpserver.py

    r807 r808  
    77 
    88import cherrypy 
    9 from cherrypy import _cphttptools 
    10 from cherrypy.lib import autoreload, profiler, filter, cptools 
     9from cherrypy import _cphttptools, filters 
     10from cherrypy.lib import autoreload, profiler, cptools 
    1111 
    1212# Use a flag to indicate the state of the application server. 
    …… 
    278278     
    279279    # Initialize the built in filters 
    280     filter.init() 
     280    filters.init() 
    281281 
    282282 

  • trunk/cherrypy/filters/__init__.py

    r807 r808  
    33 
    44# Filters that are always included 
    5 from cherrypy.lib.filter import baseurlfilter, cachefilter, \ 
     5from cherrypy.filters import baseurlfilter, cachefilter, \ 
    66    decodingfilter, encodingfilter, gzipfilter, logdebuginfofilter, \ 
    77    staticfilter, nsgmlsfilter, tidyfilter, \ 

  • trunk/cherrypy/lib/filter/__init__.py

    r807 r808  
    1 import cherrypy 
    2 from cherrypy import _cputil 
     1import warnings 
     2warnings.warn("cherrypy.lib.filter has been superseded by cherrypy.filters and will be removed in CP 2.3") 
    33 
    4 # Filters that are always included 
    5 from cherrypy.lib.filter import baseurlfilter, cachefilter, \ 
    6     decodingfilter, encodingfilter, gzipfilter, logdebuginfofilter, \ 
    7     staticfilter, nsgmlsfilter, tidyfilter, \ 
    8     xmlrpcfilter, sessionauthenticatefilter, \ 
    9     sessionfilter 
    10  
    11 # this contains the classes for each filter type 
    12 # we do not store the instances here because the test 
    13 # suite must reinitialize the filters without restarting 
    14 # the server 
    15 _classes = { 
    16     'BaseUrlFilter'      : baseurlfilter.BaseUrlFilter, 
    17     'CacheFilter'        : cachefilter.CacheFilter, 
    18     'DecodingFilter'     : decodingfilter.DecodingFilter, 
    19     'EncodingFilter'     : encodingfilter.EncodingFilter, 
    20     'GzipFilter'         : gzipfilter.GzipFilter, 
    21     'LogDebugInfoFilter' : logdebuginfofilter.LogDebugInfoFilter, 
    22     'NsgmlsFilter'       : nsgmlsfilter.NsgmlsFilter, 
    23     'SessionAuthenticateFilter' : sessionauthenticatefilter.SessionAuthenticateFilter, 
    24     'SessionFilter'      : sessionfilter.SessionFilter, 
    25     'StaticFilter'       : staticfilter.StaticFilter, 
    26     'TidyFilter'         : tidyfilter.TidyFilter, 
    27     'XmlRpcFilter'       : xmlrpcfilter.XmlRpcFilter, 
    28 } 
    29  
    30 # These are in order for a reason! 
    31 # They must be strings matching keys in _classes 
    32 _input_order = [ 
    33     'CacheFilter', 
    34     'LogDebugInfoFilter', 
    35     'BaseUrlFilter', 
    36     'DecodingFilter', 
    37     'SessionFilter', 
    38     'SessionAuthenticateFilter', 
    39     'StaticFilter', 
    40     'NsgmlsFilter', 
    41     'TidyFilter', 
    42     'XmlRpcFilter', 
    43 ] 
    44  
    45 _output_order = [ 
    46     'XmlRpcFilter', 
    47     'EncodingFilter', 
    48     'TidyFilter', 
    49     'NsgmlsFilter', 
    50     'LogDebugInfoFilter', 
    51     'GzipFilter', 
    52     'SessionFilter', 
    53     'CacheFilter', 
    54 ] 
    55  
    56 _input_methods = ['onStartResource', 'beforeRequestBody', 'beforeMain'] 
    57 _output_methods = ['beforeFinalize', 'onEndResource', 
    58                    'beforeErrorResponse', 'afterErrorResponse'] 
    59  
    60  
    61 def init(): 
    62     """Initialize the filters.""" 
    63     instances = {} 
    64     inputs, outputs = [], [] 
    65      
    66     conf = cherrypy.config.get 
    67      
    68     for name in _input_order + conf('server.inputFilters', []): 
    69         f = instances.get(name) 
    70         if f is None: 
    71             f = instances[name] = _classes[name]() 
    72         inputs.append(f) 
    73      
    74     for name in conf('server.outputFilters', []) + _output_order: 
    75         f = instances.get(name) 
    76         if f is None: 
    77             f = instances[name] = _classes[name]() 
    78         outputs.append(f) 
    79      
    80     # Transform the instance lists into a dict of methods 
    81     _filterhooks.clear() 
    82     for name in _input_methods: 
    83         _filterhooks[name] = [] 
    84         for f in inputs: 
    85             method = getattr(f, name, None) 
    86             if method: 
    87                 _filterhooks[name].append(method) 
    88     for name in _output_methods: 
    89         _filterhooks[name] = [] 
    90         for f in outputs: 
    91             method = getattr(f, name, None) 
    92             if method: 
    93                 _filterhooks[name].append(method) 
    94  
    95  
    96 _filterhooks = {} 
    97  
    98  
    99 def applyFilters(methodName): 
    100     """Execute the given method for all registered filters.""" 
    101     special_methods = [] 
    102     for f in _cputil.getSpecialAttribute("_cpFilterList"): 
    103         method = getattr(f, methodName, None) 
    104         if method: 
    105             special_methods.append(method) 
    106      
    107     if methodName in _input_methods: 
    108         # Run special filters after defaults. 
    109         for method in _filterhooks[methodName] + special_methods: 
    110             method() 
    111     else: 
    112         # Run special filters before defaults. 
    113         for method in special_methods + _filterhooks[methodName]: 
    114             method() 
     4from cherrypy.filters import * 

  • trunk/cherrypy/test/helper.py

    r807 r808  
    193193        cherrypy.config.reset() 
    194194        setConfig(conf) 
    195         from cherrypy.lib import filter 
    196         filter.init() 
     195        from cherrypy import filters 
     196        filters.init() 
    197197         
    198198        suite = CPTestLoader.loadTestsFromName(testmod) 
    …… 
    209209def _test_main_thread(): 
    210210    cherrypy.server.wait() 
    211     from cherrypy.lib import filter 
    212     filter.init() 
     211    from cherrypy import filters 
     212    filters.init() 
    213213    try: 
    214214        webtest.main() 

Hosted by WebFaction

Log in as guest/cpguest to create tickets