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

Changeset 806

Show
Ignore:
Timestamp:
11/10/05 00:35:43
Author:
fumanchu
Message:

Removed really weird dead code in _cputil. Somebody's indenter must have been on the fritz.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/cherrypy/_cphttptools.py

    r805 r806  
    3535            entity. 
    3636         
    37         When run() is done, cherrypy.response should have 3 attributes: 
     37        When run() is done, the returned object should have 3 attributes: 
    3838          status, e.g. "200 OK" 
    3939          headers, a list of (name, value) tuples 

  • trunk/cherrypy/_cputil.py

    r805 r806  
    88import cherrypy 
    99from cherrypy.lib import httptools 
    10  
    11  
    12 class EmptyClass: 
    13     """ An empty class """ 
    14     pass 
    1510 
    1611 
    …… 
    341336} 
    342337 
    343 # this is where the actuall filter instances are first stored 
     338# this is where the actual filter instances are first stored 
    344339_cpDefaultFilterInstances = {} 
    345340 
    346341# These are in order for a reason! 
    347342# They must be strings matching keys in _cpDefaultFilterClasses 
    348 __cpDefaultInputFilters = [ 
     343__cpDefaultInputFilterNames = [ 
    349344    'CacheFilter', 
    350345    'LogDebugInfoFilter', 
    …… 
    359354] 
    360355 
    361 __cpDefaultOutputFilters = [ 
     356__cpDefaultOutputFilterNames = [ 
    362357    'XmlRpcFilter', 
    363358    'EncodingFilter', 
    …… 
    383378    _cpDefaultFilterInstances = {} 
    384379     
    385     for filterName in __cpDefaultInputFilters: 
     380    for filterName in __cpDefaultInputFilterNames: 
    386381        filterClass = _cpDefaultFilterClasses[filterName] 
    387382        filterInstance = _cpDefaultFilterInstances[filterName] = filterClass() 
    388383        _cpDefaultInputFilterList.append(filterInstance) 
    389384     
    390     for filterName in __cpDefaultOutputFilters: 
     385    for filterName in __cpDefaultOutputFilterNames: 
    391386        filterClass = _cpDefaultFilterClasses[filterName] 
    392387        filterInstance = _cpDefaultFilterInstances.setdefault(filterName, filterClass()) 
    …… 
    400395    if len(filtersRoot) == 0: 
    401396        return 
    402  
     397     
    403398    sys.path.extend(filtersRoot) 
    404          
     399     
    405400    for filterName, filterClassname in inputFiltersDict.items(): 
    406401        filterModule = __import__(filterName, globals(),  locals(), []) 
    …… 
    408403        filterInstance = filterClass() 
    409404        _cpDefaultInputFilterList.append(filterInstance) 
    410  
     405     
    411406    for filterName, filterClassname in outputFiltersDict.items(): 
    412407        filterModule = __import__(filterName, globals(),  locals(), []) 
    …… 
    414409        filterInstance = filterClass() 
    415410        _cpDefaultOutputFilterList.append(filterInstance) 
    416  
     411     
    417412    # Avoid pollution of the system path 
    418413    for path in filtersRoot: 
    …… 
    430425 
    431426class UnknownType(Exception): 
    432      
    433     # initialize the built-in filters  
    434     for n in xrange(len(_cpDefaultInputFilterList)): 
    435         try: 
    436             _cpDefaultInputFilterList[n] = _cpDefaultInputFilterList[n]() 
    437         except: 
    438             pass 
    439      
    440     for n in xrange(len(_cpDefaultOutputFilterList)): 
    441         try: 
    442             _cpDefaultOutputFilterList[n] = _cpDefaultOutputFilterList[n]() 
    443         except: 
    444             pass 
     427    pass 
    445428 
    446429 

Hosted by WebFaction

Log in as guest/cpguest to create tickets