[Python-3000-checkins] r56466 - in python/branches/p3yk: Doc/lib/libwave.tex Lib/test/test_asyncore.py Modules/_codecsmodule.c

[guido.van.rossum]

Author: guido.van.rossum
Date: Fri Jul 20 05:58:16 2007
New Revision: 56466

Modified:
   python/branches/p3yk/   (props changed)
   python/branches/p3yk/Doc/lib/libwave.tex
   python/branches/p3yk/Lib/test/test_asyncore.py
   python/branches/p3yk/Modules/_codecsmodule.c
Log:
Merged revisions 56413-56465 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r56439 | georg.brandl | 2007-07-17 23:37:55 -0700 (Tue, 17 Jul 2007) | 2 lines
  
  Use "Unix" as platform name, not "UNIX".
........
  r56441 | guido.van.rossum | 2007-07-18 10:19:14 -0700 (Wed, 18 Jul 2007) | 3 lines
  
  SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors.
  (Slightly tweaked for style and refcounts.)
........
  r56444 | kurt.kaiser | 2007-07-18 12:58:42 -0700 (Wed, 18 Jul 2007) | 2 lines
  
  Fix failing unicode test caused by change to ast.c at r56441
........
  r56451 | georg.brandl | 2007-07-18 15:36:53 -0700 (Wed, 18 Jul 2007) | 2 lines
  
  Add description for wave.setcomptype() values
........
  r56456 | walter.doerwald | 2007-07-19 06:04:38 -0700 (Thu, 19 Jul 2007) | 3 lines
  
  Document that codecs.lookup() returns a CodecInfo object.
  (fixes SF bug #1754453).
........
  r56463 | facundo.batista | 2007-07-19 16:57:38 -0700 (Thu, 19 Jul 2007) | 6 lines
  
  
  Added a select.select call in the test server loop to make sure the
  socket is ready to be read from before attempting a read (this
  prevents an error 10035 on some Windows platforms). [GSoC - Alan
  McIntyre]
........


Modified: python/branches/p3yk/Doc/lib/libwave.tex
==============================================================================
--- python/branches/p3yk/Doc/lib/libwave.tex	(original)
+++ python/branches/p3yk/Doc/lib/libwave.tex	Fri Jul 20 05:58:16 2007
@@ -142,6 +142,8 @@
 
 \begin{methoddesc}[Wave_write]{setcomptype}{type, name}
 Set the compression type and description.
+At the moment, only compression type \samp{NONE} is supported,
+meaning no compression.
 \end{methoddesc}
 
 \begin{methoddesc}[Wave_write]{setparams}{tuple}

Modified: python/branches/p3yk/Lib/test/test_asyncore.py
==============================================================================
--- python/branches/p3yk/Lib/test/test_asyncore.py	(original)
+++ python/branches/p3yk/Lib/test/test_asyncore.py	Fri Jul 20 05:58:16 2007
@@ -65,11 +65,13 @@
     else:
         n = 200
         while n > 0:
-            data = conn.recv(10)
-            # keep everything except for the newline terminator
-            buf.write(data.replace('\n', ''))
-            if '\n' in data:
-                break
+            r, w, e = select.select([conn], [], [])
+            if r:
+                data = conn.recv(10)
+                # keep everything except for the newline terminator
+                buf.write(data.replace('\n', ''))
+                if '\n' in data:
+                    break
             n -= 1
             time.sleep(0.01)
 

Modified: python/branches/p3yk/Modules/_codecsmodule.c
==============================================================================
--- python/branches/p3yk/Modules/_codecsmodule.c	(original)
+++ python/branches/p3yk/Modules/_codecsmodule.c	Fri Jul 20 05:58:16 2007
@@ -10,7 +10,7 @@
 
      register(search_function) -> None
 
-     lookup(encoding) -> (encoder, decoder, stream_reader, stream_writer)
+     lookup(encoding) -> CodecInfo object
 
    The builtin Unicode codecs use the following interface:
 
@@ -45,7 +45,8 @@
 \n\
 Register a codec search function. Search functions are expected to take\n\
 one argument, the encoding name in all lower case letters, and return\n\
-a tuple of functions (encoder, decoder, stream_reader, stream_writer).");
+a tuple of functions (encoder, decoder, stream_reader, stream_writer)\n\
+(or a CodecInfo object).");
 
 static
 PyObject *codec_register(PyObject *self, PyObject *search_function)
@@ -57,10 +58,10 @@
 }
 
 PyDoc_STRVAR(lookup__doc__,
-"lookup(encoding) -> (encoder, decoder, stream_reader, stream_writer)\n\
+"lookup(encoding) -> CodecInfo\n\
 \n\
 Looks up a codec tuple in the Python codec registry and returns\n\
-a tuple of functions.");
+a tuple of function (or a CodecInfo object).");
 
 static
 PyObject *codec_lookup(PyObject *self, PyObject *args)