[gnue] r7521 - trunk/gnue-navigator/src

[johannes]

Author: johannes
Date: 2005-05-04 07:59:59 -0500 (Wed, 04 May 2005)
New Revision: 7521

Modified:
   trunk/gnue-navigator/src/UItext.py
Log:
Use new GLoginHandler (or derived classes)


Modified: trunk/gnue-navigator/src/UItext.py
===================================================================
--- trunk/gnue-navigator/src/UItext.py  2005-05-04 12:59:38 UTC (rev 7520)
+++ trunk/gnue-navigator/src/UItext.py  2005-05-04 12:59:59 UTC (rev 7521)
@@ -30,6 +30,7 @@
 # reuse GNUe Form's UI* classes if at all possible.
 
 import string, sys
+from gnue.common.datasources.GLoginHandler import BasicLoginHandler
 
 class Instance:
   def __init__(self, processes):
@@ -38,7 +39,7 @@
   def run(self, connections):
     print "Login Handler set"
     
-    connections.setLoginHandler(LoginHandler())
+    connections.setLoginHandler (BasicLoginHandler ())
     self.buildMenu(self.processes)
     
     self.connections = connections
@@ -139,43 +140,3 @@
       return string.upper(val)
     elif not responseSet:
       return val
-
-
-from gnue.common.datasources import GLoginHandler
-import getpass
-class LoginHandler(GLoginHandler.LoginHandler):
-
-  defaults = {'_username': None, '_password': None}
-
-  def getLogin(self, loginData, error):
-    try:
-      print ( "*"*60 )
-      if len(loginData[1]):
-        print ( 'Attempting to log into "%s" (%s):' % (loginData[1], 
loginData[0]) )
-      else:
-        print ( 'Attempting to log into %s:' % (loginData[0]) )
-      print ("")
-      val = {}
-      for prompt in loginData[2]:
-         if self.defaults.has_key(prompt[0])  and self.defaults[prompt[0]]:
-           print_nl ( "  %s: " % prompt[1] )
-           if prompt[2]:
-             print ( "***" )
-           else:
-             print ( self.defaults[prompt[0]] )
-           val[prompt[0]] = self.defaults[prompt[0]]
-         else:
-           if prompt[2]:
-             val[prompt[0]] = getpass.getpass("  %s: " % prompt[1])
-           else:
-             val[prompt[0]] = raw_input("  %s: " % prompt[1])
-      print ("")
-      print ("*"*60)
-      return val
-    except KeyboardInterrupt:
-      raise GLoginHandler.UserCanceledLogin
-
-
-  def destroyLoginDialog(self):
-    pass
-