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

6 files changed, 21 insertions, 29 deletions

diff --git a/pexpect/LICENSE b/pexpect/LICENSE
index 4b83f63..27bb809 100644
--- a/pexpect/LICENSE
+++ b/pexpect/LICENSE
@@ -1,5 +1,5 @@
 Free, open source, and all that good stuff.
-Pexpect Copyright (c) 2005 Noah Spurrier
+Pexpect Copyright (c) 2006 Noah Spurrier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/pexpect/Makefile b/pexpect/Makefile
index d24e9f6..9ed54f0 100644
--- a/pexpect/Makefile
+++ b/pexpect/Makefile
@@ -31,8 +31,7 @@ dist/pexpect-$(VERSION).tar.gz:
 	rm -f *.pyc
 	rm -f pexpect-$(VERSION).tar.gz
 	rm -f dist/pexpect-$(VERSION).tar.gz
-	/usr/bin/env python setup.py sdist
-	cp dist/pexpect-$(VERSION).tar.gz ./pexpect-$(VERSION).tar.gz
+	python setup.py sdist
 
 clean:
 	-rm -f MANIFEST
diff --git a/pexpect/README b/pexpect/README
index d7f2a78..7271c0d 100644
--- a/pexpect/README
+++ b/pexpect/README
@@ -17,7 +17,7 @@ extensions to be compiled. It should work on any platform that supports the
 standard Python pty module. The Pexpect interface was designed to be easy to use.
 
 Free, open source, and all that good stuff.
-Pexpect Copyright (c) 2005 Noah Spurrier
+Pexpect Copyright (c) 2006 Noah Spurrier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/pexpect/doc/index.template.html b/pexpect/doc/index.template.html
index eec2e60..325e758 100644
--- a/pexpect/doc/index.template.html
+++ b/pexpect/doc/index.template.html
@@ -66,7 +66,7 @@ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
 OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 USE OR OTHER DEALINGS IN THE SOFTWARE.<br>
 <br>
-Pexpect Copyright (c) 2005 Noah Spurrier<br>
+Pexpect Copyright (c) 2006 Noah Spurrier<br>
 http://pexpect.sourceforge.net/
 </p>
 
@@ -918,7 +918,7 @@ bug</a>.</p>
 <a href="#changes" title="What's new with Pexpect">Recent Changes</a><br>
 <a href="#testing" title="Test results on various platforms">Testing</a><br>
 <a href="#todo" title="What to do next">To do</a><br>
-<a href="http://cvs.sourceforge.net/viewcvs.py/pexpect/pexpect/" title="browse SVN">Browse SVN</a><br>
+<a href="http://svn.sourceforge.net/viewcvs.cgi/pexpect/trunk/pexpect/" title="browse SVN">Browse SVN</a><br>
 <br>
 <a href="http://sourceforge.net/projects/pexpect/"
  title="The Pexpect project page on SourceForge.net"> <img
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