[PATCH] Use the named tuple in root password dialog (#924138)

[Martin Sivak]

---
 pyanaconda/ui/tui/spokes/__init__.py | 2 +-
 pyanaconda/ui/tui/spokes/password.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pyanaconda/ui/tui/spokes/__init__.py b/pyanaconda/ui/tui/spokes/__init__.py
index cd4dba0..6b3c868 100644
--- a/pyanaconda/ui/tui/spokes/__init__.py
+++ b/pyanaconda/ui/tui/spokes/__init__.py
@@ -30,7 +30,7 @@ from pyanaconda.iutil import setdeepattr, getdeepattr
 import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)

-__all__ = ["TUISpoke", "EditTUISpoke", "EditTUIDialog", "StandaloneSpoke", "NormalSpoke", "PersonalizationSpoke",
+__all__ = ["TUISpoke", "EditTUISpoke", "EditTUIDialog", "EditTUISpokeEntry", "StandaloneSpoke", "NormalSpoke", "PersonalizationSpoke",
            "collect_spokes", "collect_categories"]

class TUISpoke(TUIObject, tui.Widget, Spoke):
diff --git a/pyanaconda/ui/tui/spokes/password.py b/pyanaconda/ui/tui/spokes/password.py
index 522aa30..2bc2b52 100644
--- a/pyanaconda/ui/tui/spokes/password.py
+++ b/pyanaconda/ui/tui/spokes/password.py
@@ -20,7 +20,7 @@
 #                    Jesse Keating 
 #

-from pyanaconda.ui.tui.spokes import EditTUIDialog
+from pyanaconda.ui.tui.spokes import EditTUIDialog, EditTUISpokeEntry
 from pyanaconda.ui.common import FirstbootSpokeMixIn
 from pyanaconda.ui.tui.simpleline import TextWidget
 from pyanaconda.users import cryptPassword
@@ -66,7 +66,7 @@ class PasswordSpoke(FirstbootSpokeMixIn, EditTUIDialog):

def prompt(self, args = None):
         """Overriden prompt as password typing is special."""
-        EditTUIDialog.prompt(self, (_("Password"), "", EditTUIDialog.PASSWORD, True))
+        EditTUIDialog.prompt(self, EditTUISpokeEntry(_("Password"), "", EditTUIDialog.PASSWORD, True))
         if self.value == None:
             return

[Vratislav Podzimek]

On Thu, 2013-03-21 at 16:56 +0100, Martin Sivak wrote:
> pyanaconda/ui/tui/spokes/__init__.py | 2 +-
>  pyanaconda/ui/tui/spokes/password.py | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/pyanaconda/ui/tui/spokes/__init__.py b/pyanaconda/ui/tui/spokes/__init__.py
> index cd4dba0..6b3c868 100644
> --- a/pyanaconda/ui/tui/spokes/__init__.py
> +++ b/pyanaconda/ui/tui/spokes/__init__.py
> @@ -30,7 +30,7 @@ from pyanaconda.iutil import setdeepattr, getdeepattr
>  import gettext
>  _ = lambda x: gettext.ldgettext("anaconda", x)
>
> -__all__ = ["TUISpoke", "EditTUISpoke", "EditTUIDialog", "StandaloneSpoke", "NormalSpoke", "PersonalizationSpoke",
> +__all__ = ["TUISpoke", "EditTUISpoke", "EditTUIDialog", "EditTUISpokeEntry", "StandaloneSpoke", "NormalSpoke", "PersonalizationSpoke",
>             "collect_spokes", "collect_categories"]
>
> class TUISpoke(TUIObject, tui.Widget, Spoke):
> diff --git a/pyanaconda/ui/tui/spokes/password.py b/pyanaconda/ui/tui/spokes/password.py
> index 522aa30..2bc2b52 100644
> --- a/pyanaconda/ui/tui/spokes/password.py
> +++ b/pyanaconda/ui/tui/spokes/password.py
> @@ -20,7 +20,7 @@
>  #                    Jesse Keating 
>  #
>
> -from pyanaconda.ui.tui.spokes import EditTUIDialog
> +from pyanaconda.ui.tui.spokes import EditTUIDialog, EditTUISpokeEntry
>  from pyanaconda.ui.common import FirstbootSpokeMixIn
>  from pyanaconda.ui.tui.simpleline import TextWidget
>  from pyanaconda.users import cryptPassword
> @@ -66,7 +66,7 @@ class PasswordSpoke(FirstbootSpokeMixIn, EditTUIDialog):
>  def prompt(self, args = None):
>      """Overriden prompt as password typing is special."""
>    EditTUIDialog.prompt(self, (_("Password"), "", EditTUIDialog.PASSWORD, True))
>    EditTUIDialog.prompt(self, EditTUISpokeEntry(_("Password"), "", EditTUIDialog.PASSWORD, True))
>    if self.value == None:
>        return

ACK.