web/views/authentication.py
changeset 3460 e4843535db25
parent 3451 6b46d73823f5
child 3647 2941f4a0aab9
--- a/web/views/authentication.py	Thu Sep 24 00:23:32 2009 +0200
+++ b/web/views/authentication.py	Thu Sep 24 00:24:21 2009 +0200
@@ -73,19 +73,19 @@
             login, password = req.get_authorization()
         if not login:
             # No session and no login -> try anonymous
-            login, password = self._cw.vreg.config.anonymous_user()
+            login, password = self.vreg.config.anonymous_user()
             if not login: # anonymous not authorized
                 raise ExplicitLogin()
         # remove possibly cached cursor coming from closed connection
         clear_cache(req, 'cursor')
-        cnxprops = ConnectionProperties(self._cw.vreg.config.repo_method,
+        cnxprops = ConnectionProperties(self.vreg.config.repo_method,
                                         close=False, log=self.log_queries)
         try:
             cnx = repo_connect(self.repo, login, password, cnxprops=cnxprops)
         except AuthenticationError:
             req.set_message(req._('authentication failure'))
             # restore an anonymous connection if possible
-            anonlogin, anonpassword = self._cw.vreg.config.anonymous_user()
+            anonlogin, anonpassword = self.vreg.config.anonymous_user()
             if anonlogin and anonlogin != login:
                 cnx = repo_connect(self.repo, anonlogin, anonpassword,
                                    cnxprops=cnxprops)
@@ -100,9 +100,9 @@
 
     def _init_cnx(self, cnx, login, password):
         # decorate connection
-        if login == self._cw.vreg.config.anonymous_user()[0]:
+        if login == self.vreg.config.anonymous_user()[0]:
             cnx.anonymous_connection = True
-        cnx.vreg = self._cw.vreg
+        cnx.vreg = self.vreg
         cnx.login = login
         cnx.password = password