websync now works with new sourceforge security policy.

git-svn-id: http://pexpect.svn.sourceforge.net/svnroot/pexpect/trunk@394 656d521f-e311-0410-88e0-e7920216d269

2 files changed, 16 insertions, 23 deletions

diff --git a/pexpect/tools/sfupload.py b/pexpect/tools/sfupload.py
index 1331a02..78cd0db 100755
--- a/pexpect/tools/sfupload.py
+++ b/pexpect/tools/sfupload.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
-'''This connects to an ftp site; does a few ftp stuff; and 
-then gives the user interactive control over the session.
+'''This uploads the latest pexpect package to sourceforge.
 '''
 import pexpect
 import sys
@@ -18,9 +17,9 @@ child.sendline('bin')
 child.expect('ftp> ')
 child.sendline('prompt')
 child.expect('ftp> ')
-child.sendline('mput pexpect-*.tgz')
+child.sendline('mput pexpect-*.tar.gz')
 child.expect('ftp> ')
-child.sendline('ls pexpect-*')
+child.sendline('ls pexpect*')
 child.expect('ftp> ')
 print child.before
 child.sendline('bye')
diff --git a/pexpect/tools/websync.py b/pexpect/tools/websync.py
index d27553b..4294771 100755
--- a/pexpect/tools/websync.py
+++ b/pexpect/tools/websync.py
@@ -11,38 +11,32 @@ import getpass
 import sys, os
 
 X = getpass.getpass('Password: ')
+pp_pattern=["(?i)password:", "(?i)enter passphrase for key '.*?':"]
 
-p = pexpect.spawn ('scp -r doc/. noah@use-pr-shell1.sourceforge.net:htdocs/.')
+p = pexpect.spawn ('scp -r doc/. noah@shell.sourceforge.net:htdocs/.')
 p.logfile = sys.stdout
-p.expect ('password:')
+p.expect (pp_pattern)
 p.sendline (X)
 p.expect (pexpect.EOF)
 print p.before
 
-p = pexpect.spawn ('scp doc/clean.css noah@use-pr-shell1.sourceforge.net:htdocs/clean.css')
+p = pexpect.spawn ('scp doc/clean.css noah@shell.sourceforge.net:htdocs/clean.css')
 p.logfile = sys.stdout
-p.expect ('password:')
+p.expect (pp_pattern)
 p.sendline (X)
 p.expect (pexpect.EOF)
 print p.before
 
-p = pexpect.spawn ('scp pexpect-doc.tgz noah@use-pr-shell1.sourceforge.net:htdocs/pexpect-doc.tgz')
-p.logfile = sys.stdout
-p.expect ('password:')
-p.sendline (X)
-p.expect (pexpect.EOF)
-print p.before
-
-p = pexpect.spawn ('ssh noah@use-pr-shell1.sourceforge.net "cd htdocs;tar zxvf pexpect-doc.tgz"')
-p.logfile = sys.stdout
-p.expect ('password:')
-p.sendline (X)
-p.expect (pexpect.EOF)
-print p.before
+#p = pexpect.spawn ('ssh noah@use-pr-shell1.sourceforge.net "cd htdocs;tar zxvf pexpect-doc.tgz"')
+#p.logfile = sys.stdout
+#p.expect ('password:')
+#p.sendline (X)
+#p.expect (pexpect.EOF)
+#print p.before
 
-p = pexpect.spawn ('scp pexpect-current.tgz noah@use-pr-shell1.sourceforge.net:htdocs/pexpect-current.tgz')
+p = pexpect.spawn ('scp dist/pexpect-*.tar.gz noah@shell.sourceforge.net:htdocs/.')
 p.logfile = sys.stdout
-p.expect ('password:')
+p.expect (pp_pattern)
 p.sendline (X)
 p.expect (pexpect.EOF)
 print p.before