[Checkins] SVN: PluggableAuthService/branches/seattle-sprint/PluggableAuthService.py Move a few things around to get the tests running again

[Wichert Akkerman]

Log message for revision 70956:
  Move a few things around to get the tests running again

Changed:
  U   PluggableAuthService/branches/seattle-sprint/PluggableAuthService.py

-=-
Modified: PluggableAuthService/branches/seattle-sprint/PluggableAuthService.py
===================================================================
--- PluggableAuthService/branches/seattle-sprint/PluggableAuthService.py	2006-10-28 23:13:50 UTC (rev 70955)
+++ PluggableAuthService/branches/seattle-sprint/PluggableAuthService.py	2006-10-28 23:20:50 UTC (rev 70956)
@@ -546,22 +546,22 @@
         for extractor_id, extractor in extractors:
             try:
                 credentials = extractor.extractCredentials( request )
-            except _SWALLOWABLE_PLUGIN_EXCEPTIONS:
-                logger.info( 'ExtractionPlugin %s error' % extractor_id
-                            , exc_info=True)
-                continue
-            else:
+
                 if not credentials:
                     continue
 
                 credentials[ 'extractor' ] = extractor_id # XXX: in key?
                 credentialslist.append( credentials )
+            except _SWALLOWABLE_PLUGIN_EXCEPTIONS:
+                logger.info( 'ExtractionPlugin %s error' % extractor_id
+                            , exc_info=True)
+                continue
 
         return credentialslist
 
 
     security.declarePrivate( '_authenticateCredentials' )
-    def _authenticateCredentials( self, credentialslist ):
+    def _authenticateCredentials( self, credentialslist, plugins ):
         """Utility method to try to authenticate a list of credentials.
         """
         results = []
@@ -635,7 +635,7 @@
             return [ ( user_id, name ) ]
 
         credentialslist = self._extractCredentials( request, plugins )
-        user_ids = self._authenticateCredentials( credentialslist )
+        user_ids = self._authenticateCredentials( credentialslist, plugins )
 
         return user_ids