← Back to branch summary

~pythonregexp2.7/python/issue2636-11

« back to all changes in this revision

Viewing changes to Lib/socket.py

  • Committer: Jeffrey C. "The TimeHorse" Jacobs
  • Date: 2008-09-21 17:53:26 UTC
  • mfrom: (39025.1.14 Regexp-2.7)
  • Revision ID: darklord@timehorse.com-20080921175326-92vaej2hc3yuecxb
Merged in changes from the core Regexp branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Lib/socket.py
407
407
                nl = data.find('\n')
408
408
                if nl >= 0:
409
409
                    nl += 1
410
 
                    buf.write(buffer(data, 0, nl))
411
 
                    self._rbuf.write(buffer(data, nl))
 
410
                    buf.write(data[:nl])
 
411
                    self._rbuf.write(data[nl:])
412
412
                    del data
413
413
                    break
414
414
                buf.write(data)
434
434
                if nl >= 0:
435
435
                    nl += 1
436
436
                    # save the excess data to _rbuf
437
 
                    self._rbuf.write(buffer(data, nl))
 
437
                    self._rbuf.write(data[nl:])
438
438
                    if buf_len:
439
 
                        buf.write(buffer(data, 0, nl))
 
439
                        buf.write(data[:nl])
440
440
                        break
441
441
                    else:
442
442
                        # Shortcut.  Avoid data copy through buf when returning
448
448
                    # returning exactly all of our first recv().
449
449
                    return data
450
450
                if n >= left:
451
 
                    buf.write(buffer(data, 0, left))
452
 
                    self._rbuf.write(buffer(data, left))
 
451
                    buf.write(data[:left])
 
452
                    self._rbuf.write(data[left:])
453
453
                    break
454
454
                buf.write(data)
455
455
                buf_len += n