From: Éric Araujo <merwok@netwok.org>
Date: Sun, 29 May 2011 01:24:45 +0000 (+0200)
Subject: Improve example for crypt module.  No string exceptions..
X-Git-Tag: v3.3.0a1~2183^2~60^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bc57789dafaadd3652b7f02a2b17684b6c74055e;p=python

Improve example for crypt module.  No string exceptions..
---

diff --git a/Doc/library/crypt.rst b/Doc/library/crypt.rst
index ec5a4b0ae2..27236c1914 100644
--- a/Doc/library/crypt.rst
+++ b/Doc/library/crypt.rst
@@ -131,18 +131,20 @@ Examples
 
 A simple example illustrating typical use::
 
-   import crypt, getpass, pwd
+   import pwd
+   import crypt
+   import getpass
 
    def login():
-       username = input('Python login:')
+       username = input('Python login: ')
        cryptedpasswd = pwd.getpwnam(username)[1]
        if cryptedpasswd:
            if cryptedpasswd == 'x' or cryptedpasswd == '*':
-               raise "Sorry, currently no support for shadow passwords"
+               raise ValueError('no support for shadow passwords')
            cleartext = getpass.getpass()
            return crypt.crypt(cleartext, cryptedpasswd) == cryptedpasswd
        else:
-           return 1
+           return True
 
 To generate a hash of a password using the strongest available method and
 check it against the original::
@@ -151,4 +153,4 @@ check it against the original::
 
    hashed = crypt.crypt(plaintext)
    if hashed != crypt.crypt(plaintext, hashed):
-      raise "Hashed version doesn't validate against original"
+      raise ValueError("hashed version doesn't validate against original")