]> granicus.if.org Git - python/commitdiff
Merge #17275: Fix class name in init errors in C bufferedio classes.
authorR David Murray <rdmurray@bitdance.com>
Sun, 24 Feb 2013 03:07:55 +0000 (22:07 -0500)
committerR David Murray <rdmurray@bitdance.com>
Sun, 24 Feb 2013 03:07:55 +0000 (22:07 -0500)
This fixes an apparent copy-and-paste error.

Patch by Manuel Jacob.

1  2 
Lib/test/test_io.py
Misc/ACKS
Misc/NEWS
Modules/_io/bufferedio.c

Simple merge
diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
Simple merge
index b077f34fff8c49d63031292964880d6fede7a426,a8278d466ce1d25bc8c4a7458bf1cbe5a25d5824..2b39f66ccf9d4362e9ee33eb72802dbef1405692
@@@ -1817,8 -1702,8 +1817,8 @@@ bufferedwriter_init(buffered *self, PyO
      self->ok = 0;
      self->detached = 0;
  
-     if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|n:BufferedReader", kwlist,
 -    if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|nn:BufferedWriter", kwlist,
 -                                     &raw, &buffer_size, &max_buffer_size)) {
++    if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|n:BufferedWriter", kwlist,
 +                                     &raw, &buffer_size)) {
          return -1;
      }
  
@@@ -2446,8 -2339,8 +2446,8 @@@ bufferedrandom_init(buffered *self, PyO
      self->ok = 0;
      self->detached = 0;
  
-     if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|n:BufferedReader", kwlist,
 -    if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|nn:BufferedRandom", kwlist,
 -                                     &raw, &buffer_size, &max_buffer_size)) {
++    if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|n:BufferedRandom", kwlist,
 +                                     &raw, &buffer_size)) {
          return -1;
      }