Parcourir la source

We can do without tools.getyesno

It's just another obsolete function
oz123 il y a 11 ans
Parent
commit
0cdf4724d9
2 fichiers modifiés avec 12 ajouts et 31 suppressions
  1. 10 9
      pwman/ui/base.py
  2. 2 22
      pwman/ui/tools.py

+ 10 - 9
pwman/ui/base.py

@@ -590,15 +590,16 @@ class BaseCommands(BaseUI, HelpUI):
         try:
             nodes = self._db.getnodes(ids)
             for n in nodes:
-                try:
-                    b = tools.getyesno(("Are you sure you want to"
-                                        " delete '%s@%s'?"
-                                        ) % (n.username, n.url), False)
-                except NameError:
-                    pass
-                if b is True:
-                    self._db.removenodes([n])
-                    print ("%s@%s deleted" % (n.username, n.url))
+                ans = ''
+                while True:
+                    ans = tools.getinput(("Are you sure you want to"
+                                         " delete '%s@%s' ([y/N])?"
+                                          ) % (n.username, n.url)).lower().strip('\n')
+                    if ans == '' or ans == 'y' or ans == 'n':
+                        break
+            if ans == 'y':
+                self._db.removenodes([n])
+                print ("%s@%s deleted" % (n.username, n.url))
         except Exception, e:
             self.error(e)
 

+ 2 - 22
pwman/ui/tools.py

@@ -108,7 +108,7 @@ def text_to_clipboards(text):  # pragma: no cover
                please check your configuration file ... ")
 
 
-def text_to_mcclipboard(text): # pragma: no cover
+def text_to_mcclipboard(text):  # pragma: no cover
     """
     copy text to mac os x clip board
     credit:
@@ -180,7 +180,7 @@ def gettermsize():  # pragma: no cover
 
 
 def getinput(question, default="", reader=raw_input,
-             completer=None, width=_defaultwidth):  # pragma: no cover
+             completer =None, width=_defaultwidth):  # pragma: no cover
     """
     http://stackoverflow.com/questions/2617057/\
             supply-inputs-to-python-unittests
@@ -209,26 +209,6 @@ def getinput(question, default="", reader=raw_input,
         return reader()
 
 
-def getyesno(question, defaultyes=False, width=_defaultwidth):  # pragma: no cover
-    if (defaultyes):
-        default = "[Y/n]"
-    else:
-        default = "[y/N]"
-    ch = getonechar("%s %s" % (question, default), width)
-
-    if (ch == '\n'):
-        if (defaultyes):
-            return True
-        else:
-            return False
-    elif (ch == 'y' or ch == 'Y'):
-        return True
-    elif (ch == 'n' or ch == 'N'):
-        return False
-    else:
-        return getyesno(question, defaultyes, width)
-
-
 class CliMenu(object):  # pragma: no cover
     def __init__(self):
         self.items = []