From 0afe7af28f6328404a1d01bfbaf8ad811e52a600 Mon Sep 17 00:00:00 2001
From: Per Cederqvist <ceder@lysator.liu.se>
Date: Sun, 19 Oct 2003 11:40:05 +0000
Subject: [PATCH] Simplified.
---
demo/ftp_interact.py | 55 ++++++++++++++++++++------------------------
1 file changed, 25 insertions(+), 30 deletions(-)
diff --git a/demo/ftp_interact.py b/demo/ftp_interact.py
index 831929f..990a81c 100644
--- a/demo/ftp_interact.py
+++ b/demo/ftp_interact.py
@@ -36,34 +36,29 @@ cmd("cd pub")
cmd("cd gnu")
cmd("passive")
-user_spawn_id = None
-try:
- user_spawn_id = pcl_expect.user.user(pcl_expect.user.COOKED)
- user_spawn_id.send("ftp> ")
- buf = ""
+user_spawn_id = pcl_expect.user.user()
+user_spawn_id.send("ftp> ")
+buf = ""
- x = pcl_expect.controller()
- while x.loop():
- if x.re(user_spawn_id, "..*"):
- s = user_spawn_id.match.group()
- buf += s
- elif x.re(user_spawn_id, "\n"):
- if buf == "home":
- cmd("cd /pub/gnu/ftp.gnu.org/pub/gnu")
- user_spawn_id.send("ftp> ")
- else:
- ftp.send(buf + "\n")
- buf = ""
- elif x.eof(user_spawn_id):
- user_spawn_id.send("\nGot eof from stdin\n")
- break
- elif x.re(ftp, "(?s)..*"):
- user_spawn_id.send(ftp.match.group())
- elif x.eof(ftp):
- user_spawn_id.send("\nGot eof from ftp process\n")
- break
- elif x.timeout():
- pass
-finally:
- if user_spawn_id is not None:
- user_spawn_id.close()
+x = pcl_expect.controller()
+while x.loop():
+ if x.re(user_spawn_id, "..*"):
+ s = user_spawn_id.match.group()
+ buf += s
+ elif x.re(user_spawn_id, "\n"):
+ if buf == "home":
+ cmd("cd /pub/gnu/ftp.gnu.org/pub/gnu")
+ user_spawn_id.send("ftp> ")
+ else:
+ ftp.send(buf + "\n")
+ buf = ""
+ elif x.eof(user_spawn_id):
+ user_spawn_id.send("\nGot eof from stdin\n")
+ break
+ elif x.re(ftp, "(?s)..*"):
+ user_spawn_id.send(ftp.match.group())
+ elif x.eof(ftp):
+ user_spawn_id.send("\nGot eof from ftp process\n")
+ break
+ elif x.timeout():
+ pass
--
GitLab