[Python-checkins] r80883 - in python/branches/py3k: Lib/test/test_ftplib.py Lib/test/test_smtplib.py

[giampaolo.rodola]

Author: giampaolo.rodola
Date: Thu May  6 22:21:57 2010
New Revision: 80883

Log:
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
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/test/test_ftplib.py
   python/branches/py3k/Lib/test/test_smtplib.py

Modified: python/branches/py3k/Lib/test/test_ftplib.py
==============================================================================
--- python/branches/py3k/Lib/test/test_ftplib.py	(original)
+++ python/branches/py3k/Lib/test/test_ftplib.py	Thu May  6 22:21:57 2010
@@ -50,6 +50,9 @@
     def push(self, what):
         super(DummyDTPHandler, self).push(what.encode('ascii'))
 
+    def handle_error(self):
+        raise
+
 
 class DummyFTPHandler(asynchat.async_chat):
 

Modified: python/branches/py3k/Lib/test/test_smtplib.py
==============================================================================
--- python/branches/py3k/Lib/test/test_smtplib.py	(original)
+++ python/branches/py3k/Lib/test/test_smtplib.py	Thu May  6 22:21:57 2010
@@ -374,6 +374,9 @@
         else:
             self.push('550 No access for you!')
 
+    def handle_error(self):
+        raise
+
 
 class SimSMTPServer(smtpd.SMTPServer):
 
@@ -392,6 +395,9 @@
     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)