changeset 458:4110fdc3c1ff

fixing some wrong attribute references imported from: moin--main--1.5--patch-462
author Thomas Waldmann <tw@waldmann-edv.de>
date Sun, 26 Feb 2006 23:55:12 +0000
parents f423a8496ae3
children 39e0f08c0906
files ChangeLog MoinMoin/caching.py MoinMoin/userform.py
diffstat 3 files changed, 19 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Feb 26 19:20:17 2006 +0000
+++ b/ChangeLog	Sun Feb 26 23:55:12 2006 +0000
@@ -2,6 +2,20 @@
 # arch-tag: automatic-ChangeLog--arch@arch.thinkmo.de--2003-archives/moin--main--1.5
 #
 
+2006-02-27 00:55:12 GMT	Thomas Waldmann <tw@waldmann-edv.de>	patch-462
+
+    Summary:
+      fixing some wrong attribute references
+    Revision:
+      moin--main--1.5--patch-462
+
+    fixing some wrong attribute references
+    
+
+    modified files:
+     ChangeLog MoinMoin/caching.py MoinMoin/userform.py
+
+
 2006-02-26 20:20:17 GMT	Thomas Waldmann <tw@waldmann-edv.de>	patch-461
 
     Summary:
--- a/MoinMoin/caching.py	Sun Feb 26 19:20:17 2006 +0000
+++ b/MoinMoin/caching.py	Sun Feb 26 23:55:12 2006 +0000
@@ -82,7 +82,7 @@
                 if locking:
                     self.wlock.release()
         else:
-            request.log("Can't acquire write lock in %s", self.lock_dir)
+            self.request.log("Can't acquire write lock in %s", self.lock_dir)
 
     def update(self, content, encode=False):
         if encode:
@@ -100,7 +100,7 @@
                 if locking:
                     self.wlock.release()
         else:
-            request.log("Can't acquire write lock in %s", self.lock_dir)
+            self.request.log("Can't acquire write lock in %s", self.lock_dir)
 
     def remove(self):
         try:
@@ -118,7 +118,7 @@
                 if locking:
                     self.rlock.release()
         else:
-            request.log("Can't acquire read lock in %s", self.lock_dir)
+            self.request.log("Can't acquire read lock in %s", self.lock_dir)
         if decode:
             data = data.decode(config.charset)
         return data
--- a/MoinMoin/userform.py	Sun Feb 26 19:20:17 2006 +0000
+++ b/MoinMoin/userform.py	Sun Feb 26 23:55:12 2006 +0000
@@ -89,7 +89,7 @@
                 return _("Use UserPreferences to change your settings or create an account.")
             # Create user profile
             if form.has_key('create'):
-                theuser = self.request.get_user()
+                theuser = self.request.get_user_from_form()
             else:
                 theuser = user.User(self.request, auth_method="request:152")
                 
@@ -179,7 +179,7 @@
         if form.has_key('save'): # Save user profile
             if self.request.request_method != 'POST':
                 return _("Use UserPreferences to change your settings or create an account.")
-            theuser = self.request.get_user()
+            theuser = self.request.get_user_from_form()
                 
             if not 'name' in theuser.auth_attribs:
                 # Require non-empty name