Merge pull request #1 from ctb/master

0.9.1 pull

.gitignore

@@ -0,0 +1 @@
+*.pyc

doc/ChangeLog

@@ -1,3 +1,10 @@
+2014-04-02  Titus Brown  <[email protected]>
+
+	* Monkeypatched getpass.getpass for purposes of evil.
+
+	* Merged brtaylor92 patch to twill test server to deal with 2.7 unicode
+	issue. (Ben Taylor)
+
 2009-02-02  Titus Brown  <[email protected]>
 
 	* Fixed problem with quoted refresh URLs (Sergey Kishchenko).

setup.py

@@ -10,8 +10,8 @@
 
 setup(name = 'twill',
 
-      version = '0.9',
-      download_url = 'http://darcs.idyll.org/~t/projects/twill-0.9.tar.gz',
+      version = '0.9.1',
+#      download_url = 'http://darcs.idyll.org/~t/projects/twill-0.9.tar.gz',
 
       description = 'twill Web browsing language',
       author = 'C. Titus Brown',
@@ -28,7 +28,7 @@
       scripts = ['twill-fork'],
 
       maintainer = 'C. Titus Brown',
-      maintainer_email = 'titus@caltech.edu',
+      maintainer_email = 'titus@idyll.org',
 
       url = 'http://twill.idyll.org/',
       long_description = """\

tests/twilltestlib.py

@@ -1,4 +1,5 @@
 import sys, subprocess
+import getpass
 
 try:
     import pkg_resources
@@ -39,15 +40,20 @@ def execute_twill_script(filename, inp=None, initial_url=None):
     global testdir
 
     if inp:
+        def new_getpass(*args):
+            return ""
+
         inp_fp = StringIO(inp)
         old, sys.stdin = sys.stdin, inp_fp
+        old_getpass, getpass.getpass = getpass.getpass, new_getpass
 
     scriptfile = os.path.join(testdir, filename)
     try:
         twill.execute_file(filename, initial_url=initial_url)
     finally:
         if inp:
             sys.stdin = old
+            getpass.getpass = old_getpass
 
 def execute_twill_shell(filename, inp=None, initial_url=None,
                         fail_on_unknown=False):