summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorGiampaolo RodolĂ  <g.rodola@gmail.com>2010-05-06 20:21:57 (GMT)
committerGiampaolo RodolĂ  <g.rodola@gmail.com>2010-05-06 20:21:57 (GMT)
commitd930b63583a8dc1ece9407652636209a3d396149 (patch)
tree693307910ba3526bd15ccea40cbd08f1f6e76f9b /Lib
parentd61e397b12aab80889e2b0981a0cb27dac0acc86 (diff)
downloadcpython-d930b63583a8dc1ece9407652636209a3d396149.zip
cpython-d930b63583a8dc1ece9407652636209a3d396149.tar.gz
cpython-d930b63583a8dc1ece9407652636209a3d396149.tar.bz2
Merged revisions 80882 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r80882 | giampaolo.rodola | 2010-05-06 22:19:32 +0200 (gio, 06 mag 2010) | 1 line adds handle_error(self):raise to test modules using asyncore to provide a clearer error message in case something goes wrong ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_ftplib.py3
-rw-r--r--Lib/test/test_smtplib.py6
2 files changed, 9 insertions, 0 deletions
diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py
index 4e80dae..b949b69 100644
--- a/Lib/test/test_ftplib.py
+++ b/Lib/test/test_ftplib.py
@@ -50,6 +50,9 @@ class DummyDTPHandler(asynchat.async_chat):
def push(self, what):
super(DummyDTPHandler, self).push(what.encode('ascii'))
+ def handle_error(self):
+ raise
+
class DummyFTPHandler(asynchat.async_chat):
diff --git a/Lib/test/test_smtplib.py b/Lib/test/test_smtplib.py
index 3a9de5b..d0b2b27 100644
--- a/Lib/test/test_smtplib.py
+++ b/Lib/test/test_smtplib.py
@@ -374,6 +374,9 @@ class SimSMTPChannel(smtpd.SMTPChannel):
else:
self.push('550 No access for you!')
+ def handle_error(self):
+ raise
+
class SimSMTPServer(smtpd.SMTPServer):
@@ -392,6 +395,9 @@ class SimSMTPServer(smtpd.SMTPServer):
def add_feature(self, feature):
self._extra_features.append(feature)
+ def handle_error(self):
+ raise
+
# Test various SMTP & ESMTP commands/behaviors that require a simulated server
# (i.e., something with more features than DebuggingServer)