Issue #3602

Lib/asynchat.py

 # -*- Mode: Python; tab-width: 4 -*-
 #       Id: asynchat.py,v 2.26 2000/09/07 22:29:26 rushing Exp
 #       Author: Sam Rushing <rushing@nightmare.com>
 
 # ======================================================================
 # Copyright 1996 by Sam Rushing
 #
 #                         All Rights Reserved
 #
 # Permission to use, copy, modify, and distribute this software and
@@ skipping 31 matching lines @@
 order to process the single-line greeting.  Just before issuing a
 'LIST' command you'll set it to '\r\n.\r\n'.  The output of the LIST
 command will be accumulated (using your own 'collect_incoming_data'
 method) up to the terminator, and then control will be returned to
 you - by calling your self.found_terminator() method.
 """
 
 import socket
 import asyncore
 from collections import deque
+from sys import py3kwarning

[Benjamin, 2008/08/23 01:46:36]

I think it's better to just "import sys" here, so we don't have a bunch of
modules with "py3kwarning" in them sitting around.

[brett.cannon, 2008/08/23 02:19:54]

On 2008/08/23 01:46:36, Benjamin wrote:
> I think it's better to just "import sys" here, so we don't have a bunch of
> modules with "py3kwarning" in them sitting around.

Maybe, but you could say this about any import. I don't see it as a problem.

 from test.test_support import catch_warning
-from warnings import filterwarnings
+from warnings import filterwarnings, catch_warnings
 
 class async_chat (asyncore.dispatcher):
     """This is an abstract class.  You must derive from this class, and add
     the two methods collect_incoming_data() and found_terminator()"""
 
     # these are overridable defaults
 
     ac_in_buffer_size       = 4096
     ac_out_buffer_size      = 4096
 
@@ skipping 147 matching lines @@
             # handle empty string/buffer or None entry
             if not first:
                 del self.producer_fifo[0]
                 if first is None:
                     self.handle_close()
                     return
 
             # handle classic producer behavior
             obs = self.ac_out_buffer_size
             try:
-                with catch_warning(record=False):
-                    filterwarnings("ignore", ".*buffer", DeprecationWarning)
+                with catch_warnings():
+                    if py3kwarning:
+                        filterwarnings("ignore", ".*buffer", DeprecationWarning)
                     data = buffer(first, 0, obs)
             except TypeError:
                 data = first.more()
                 if data:
                     self.producer_fifo.appendleft(data)
                 else:
                     del self.producer_fifo[0]
                 continue
 
             # send the data
@@ skipping 71 matching lines @@
 # new python:   28961/s
 # old python:   18307/s
 # re:        12820/s
 # regex:     14035/s
 
 def find_prefix_at_end (haystack, needle):
     l = len(needle) - 1
     while l and not haystack.endswith(needle[:l]):
         l -= 1
     return l