Fixed stupid _v_ problem

lib/python/AccessControl/User.py

@@ -84,7 +84,7 @@
 ##############################################################################
 """Access control package"""
 
-__version__='$Revision: 1.99 $'[11:-2]
+__version__='$Revision: 1.100 $'[11:-2]
 
 import Globals, App.Undo, socket, regex
 from Globals import HTMLFile, MessageDialog, Persistent, PersistentMapping
@@ -715,8 +715,8 @@ def manage_addUserFolder(self,dtself=None,REQUEST=None,**ignored):
 from ZPublisher.BaseRequest import _marker
 
 def verify_watermark(auth_user):
-    if not hasattr(auth_user, '__marker__') or \
-       auth_user.__marker__ is not _marker:
+    if not hasattr(auth_user, '_v__marker__') or \
+       auth_user._v__marker__ is not _marker:
         raise 'Unauthorized', (
             'You are not authorized to access this resource.'
             )

lib/python/ZPublisher/BaseRequest.py

@@ -82,7 +82,7 @@
 # attributions are listed in the accompanying credits file.
 # 
 ##############################################################################
-__version__='$Revision: 1.22 $'[11:-2]
+__version__='$Revision: 1.23 $'[11:-2]
 
 from string import join, split, find, rfind, lower, upper
 from urllib import quote
@@ -454,7 +454,7 @@ class BaseRequest:
         steps=join(steps[:-i],'/')
         if user is not None:
             # Try to set a watermark on the user object.
-            user.__marker__=_marker
+            user._v__marker__=_marker
             request['AUTHENTICATED_USER']=user
             request['AUTHENTICATION_PATH']=steps