Fixes for ticket #226.

2 files changed, 6 insertions, 6 deletions

diff --git a/cherrypy/lib/cptools.py b/cherrypy/lib/cptools.py
index 6875ced7..b38b4289 100644
--- a/cherrypy/lib/cptools.py
+++ b/cherrypy/lib/cptools.py
@@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 """
 Just a few convenient functions and classes
 """
-

-import cherrypy

+
+import cherrypy
 
 import inspect
 
@@ -103,8 +103,8 @@ class PositionalParametersAware(object):
         if len(args) == 0:
             args = ("index",)
         if hasattr( self, args[ 0 ] ):
-            return getattr( self, args[ 0 ] )( *args[ 1: ], **kwargs )

-        else:

+            return getattr( self, args[ 0 ] )( *args[ 1: ], **kwargs )
+        else:
             raise cherrypy.NotFound, cherrypy.request.path
     default.exposed = True
     
\ No newline at end of file
diff --git a/cherrypy/lib/csauthenticate.py b/cherrypy/lib/csauthenticate.py
index 63a7b569..233f3184 100644
--- a/cherrypy/lib/csauthenticate.py
+++ b/cherrypy/lib/csauthenticate.py
@@ -117,8 +117,8 @@ class CSAuthenticate(Aspect):
 
     def doLogout(self):
         try:
-            sessionId = request.simpleCookie[self.sessionIdCookieName].value
-            del request.sessionMap[sessionId]
+            sessionId = cherrypy.request.simpleCookie[self.sessionIdCookieName].value
+            del cherrypy.request.sessionMap[sessionId]
         except: pass
         
         cherrypy.response.simpleCookie[self.sessionIdCookieName] = ""