cpython-lru_cache-weakref: Modules/bz2module.c annotate

annotate Modules/bz2module.c @ 65035:87f4b32905df 2.7

Cosmetic fix to use print function.

author	Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
date	Fri, 01 Oct 2010 10:48:47 +0000
parents	20f345fc0361
children	b36cb4602e21

rev	line source
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1 /*
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	3 python-bz2 - python bz2 library interface
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	4
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	5 Copyright (c) 2002 Gustavo Niemeyer <niemeyer@conectiva.com>
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	6 Copyright (c) 2002 Python Software Foundation; All Rights Reserved
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	7
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	8 */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	9
26365 d1d8959b138a Include Python.h first. Martin v. Löwis <martin@v.loewis.de> parents: 26123 diff changeset	10 #include "Python.h"
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	11 #include <stdio.h>
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	12 #include <bzlib.h>
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	13 #include "structmember.h"
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	14
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	15 #ifdef WITH_THREAD
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	16 #include "pythread.h"
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	17 #endif
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	18
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	19 static char __author__[] =
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	20 "The bz2 python module was written by:\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	21 \n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	22 Gustavo Niemeyer <niemeyer@conectiva.com>\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	23 ";
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	24
35374 797d82eec625 Fix BZ2File.(x)readlines() for files without a newline. Georg Brandl <georg@python.org> parents: 35013 diff changeset	25 /* Our very own off_t-like type, 64-bit if possible */
797d82eec625 Fix BZ2File.(x)readlines() for files without a newline. Georg Brandl <georg@python.org> parents: 35013 diff changeset	26 /* copied from Objects/fileobject.c */
797d82eec625 Fix BZ2File.(x)readlines() for files without a newline. Georg Brandl <georg@python.org> parents: 35013 diff changeset	27 #if !defined(HAVE_LARGEFILE_SUPPORT)
797d82eec625 Fix BZ2File.(x)readlines() for files without a newline. Georg Brandl <georg@python.org> parents: 35013 diff changeset	28 typedef off_t Py_off_t;
797d82eec625 Fix BZ2File.(x)readlines() for files without a newline. Georg Brandl <georg@python.org> parents: 35013 diff changeset	29 #elif SIZEOF_OFF_T >= 8
797d82eec625 Fix BZ2File.(x)readlines() for files without a newline. Georg Brandl <georg@python.org> parents: 35013 diff changeset	30 typedef off_t Py_off_t;
797d82eec625 Fix BZ2File.(x)readlines() for files without a newline. Georg Brandl <georg@python.org> parents: 35013 diff changeset	31 #elif SIZEOF_FPOS_T >= 8
797d82eec625 Fix BZ2File.(x)readlines() for files without a newline. Georg Brandl <georg@python.org> parents: 35013 diff changeset	32 typedef fpos_t Py_off_t;
797d82eec625 Fix BZ2File.(x)readlines() for files without a newline. Georg Brandl <georg@python.org> parents: 35013 diff changeset	33 #else
797d82eec625 Fix BZ2File.(x)readlines() for files without a newline. Georg Brandl <georg@python.org> parents: 35013 diff changeset	34 #error "Large file support, but neither off_t nor fpos_t is large enough."
797d82eec625 Fix BZ2File.(x)readlines() for files without a newline. Georg Brandl <georg@python.org> parents: 35013 diff changeset	35 #endif
797d82eec625 Fix BZ2File.(x)readlines() for files without a newline. Georg Brandl <georg@python.org> parents: 35013 diff changeset	36
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	37 #define BUF(v) PyString_AS_STRING((PyStringObject *)v)
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	38
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	39 #define MODE_CLOSED 0
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	40 #define MODE_READ 1
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	41 #define MODE_READ_EOF 2
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	42 #define MODE_WRITE 3
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	43
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	44 #define BZ2FileObject_Check(v) (Py_TYPE(v) == &BZ2File_Type)
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	45
28861 64230ee8eea5 Applying patch by Neal Norwitz: Gustavo Niemeyer <gustavo@niemeyer.net> parents: 28437 diff changeset	46
64230ee8eea5 Applying patch by Neal Norwitz: Gustavo Niemeyer <gustavo@niemeyer.net> parents: 28437 diff changeset	47 #ifdef BZ_CONFIG_ERROR
64230ee8eea5 Applying patch by Neal Norwitz: Gustavo Niemeyer <gustavo@niemeyer.net> parents: 28437 diff changeset	48
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	49 #if SIZEOF_LONG >= 8
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	50 #define BZS_TOTAL_OUT(bzs) \
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	51 (((long)bzs->total_out_hi32 << 32) + bzs->total_out_lo32)
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	52 #elif SIZEOF_LONG_LONG >= 8
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	53 #define BZS_TOTAL_OUT(bzs) \
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	54 (((PY_LONG_LONG)bzs->total_out_hi32 << 32) + bzs->total_out_lo32)
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	55 #else
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	56 #define BZS_TOTAL_OUT(bzs) \
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	57 bzs->total_out_lo32
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	58 #endif
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	59
28861 64230ee8eea5 Applying patch by Neal Norwitz: Gustavo Niemeyer <gustavo@niemeyer.net> parents: 28437 diff changeset	60 #else /* ! BZ_CONFIG_ERROR */
64230ee8eea5 Applying patch by Neal Norwitz: Gustavo Niemeyer <gustavo@niemeyer.net> parents: 28437 diff changeset	61
64230ee8eea5 Applying patch by Neal Norwitz: Gustavo Niemeyer <gustavo@niemeyer.net> parents: 28437 diff changeset	62 #define BZ2_bzRead bzRead
64230ee8eea5 Applying patch by Neal Norwitz: Gustavo Niemeyer <gustavo@niemeyer.net> parents: 28437 diff changeset	63 #define BZ2_bzReadOpen bzReadOpen
64230ee8eea5 Applying patch by Neal Norwitz: Gustavo Niemeyer <gustavo@niemeyer.net> parents: 28437 diff changeset	64 #define BZ2_bzReadClose bzReadClose
64230ee8eea5 Applying patch by Neal Norwitz: Gustavo Niemeyer <gustavo@niemeyer.net> parents: 28437 diff changeset	65 #define BZ2_bzWrite bzWrite
64230ee8eea5 Applying patch by Neal Norwitz: Gustavo Niemeyer <gustavo@niemeyer.net> parents: 28437 diff changeset	66 #define BZ2_bzWriteOpen bzWriteOpen
64230ee8eea5 Applying patch by Neal Norwitz: Gustavo Niemeyer <gustavo@niemeyer.net> parents: 28437 diff changeset	67 #define BZ2_bzWriteClose bzWriteClose
64230ee8eea5 Applying patch by Neal Norwitz: Gustavo Niemeyer <gustavo@niemeyer.net> parents: 28437 diff changeset	68 #define BZ2_bzCompress bzCompress
64230ee8eea5 Applying patch by Neal Norwitz: Gustavo Niemeyer <gustavo@niemeyer.net> parents: 28437 diff changeset	69 #define BZ2_bzCompressInit bzCompressInit
64230ee8eea5 Applying patch by Neal Norwitz: Gustavo Niemeyer <gustavo@niemeyer.net> parents: 28437 diff changeset	70 #define BZ2_bzCompressEnd bzCompressEnd
64230ee8eea5 Applying patch by Neal Norwitz: Gustavo Niemeyer <gustavo@niemeyer.net> parents: 28437 diff changeset	71 #define BZ2_bzDecompress bzDecompress
64230ee8eea5 Applying patch by Neal Norwitz: Gustavo Niemeyer <gustavo@niemeyer.net> parents: 28437 diff changeset	72 #define BZ2_bzDecompressInit bzDecompressInit
64230ee8eea5 Applying patch by Neal Norwitz: Gustavo Niemeyer <gustavo@niemeyer.net> parents: 28437 diff changeset	73 #define BZ2_bzDecompressEnd bzDecompressEnd
64230ee8eea5 Applying patch by Neal Norwitz: Gustavo Niemeyer <gustavo@niemeyer.net> parents: 28437 diff changeset	74
64230ee8eea5 Applying patch by Neal Norwitz: Gustavo Niemeyer <gustavo@niemeyer.net> parents: 28437 diff changeset	75 #define BZS_TOTAL_OUT(bzs) bzs->total_out
64230ee8eea5 Applying patch by Neal Norwitz: Gustavo Niemeyer <gustavo@niemeyer.net> parents: 28437 diff changeset	76
64230ee8eea5 Applying patch by Neal Norwitz: Gustavo Niemeyer <gustavo@niemeyer.net> parents: 28437 diff changeset	77 #endif /* ! BZ_CONFIG_ERROR */
64230ee8eea5 Applying patch by Neal Norwitz: Gustavo Niemeyer <gustavo@niemeyer.net> parents: 28437 diff changeset	78
64230ee8eea5 Applying patch by Neal Norwitz: Gustavo Niemeyer <gustavo@niemeyer.net> parents: 28437 diff changeset	79
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	80 #ifdef WITH_THREAD
56850 3a992292ccd8 Issue #7205: Fix a possible deadlock when using a BZ2File object from several threads at once. Antoine Pitrou <solipsis@pitrou.net> parents: 50698 diff changeset	81 #define ACQUIRE_LOCK(obj) do { \
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	82 if (!PyThread_acquire_lock(obj->lock, 0)) { \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	83 Py_BEGIN_ALLOW_THREADS \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	84 PyThread_acquire_lock(obj->lock, 1); \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	85 Py_END_ALLOW_THREADS \
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	86 } } while(0)
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	87 #define RELEASE_LOCK(obj) PyThread_release_lock(obj->lock)
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	88 #else
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	89 #define ACQUIRE_LOCK(obj)
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	90 #define RELEASE_LOCK(obj)
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	91 #endif
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	92
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	93 /* Bits in f_newlinetypes */
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	94 #define NEWLINE_UNKNOWN 0 /* No newline seen, yet */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	95 #define NEWLINE_CR 1 /* \r newline seen */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	96 #define NEWLINE_LF 2 /* \n newline seen */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	97 #define NEWLINE_CRLF 4 /* \r\n newline seen */
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	98
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	99 /* ===================================================================== */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	100 /* Structure definitions. */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	101
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	102 typedef struct {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	103 PyObject_HEAD
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	104 PyObject *file;
27819 ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	105
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	106 char* f_buf; /* Allocated readahead buffer */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	107 char* f_bufend; /* Points after last occupied position */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	108 char* f_bufptr; /* Current buffer position */
27819 ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	109
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	110 int f_softspace; /* Flag used by 'print' command */
27819 ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	111
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	112 int f_univ_newline; /* Handle any newline convention */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	113 int f_newlinetypes; /* Types of newlines seen */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	114 int f_skipnextlf; /* Skip next \n */
27819 ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	115
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	116 BZFILE *fp;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	117 int mode;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	118 Py_off_t pos;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	119 Py_off_t size;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	120 #ifdef WITH_THREAD
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	121 PyThread_type_lock lock;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	122 #endif
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	123 } BZ2FileObject;
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	124
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	125 typedef struct {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	126 PyObject_HEAD
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	127 bz_stream bzs;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	128 int running;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	129 #ifdef WITH_THREAD
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	130 PyThread_type_lock lock;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	131 #endif
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	132 } BZ2CompObject;
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	133
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	134 typedef struct {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	135 PyObject_HEAD
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	136 bz_stream bzs;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	137 int running;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	138 PyObject *unused_data;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	139 #ifdef WITH_THREAD
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	140 PyThread_type_lock lock;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	141 #endif
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	142 } BZ2DecompObject;
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	143
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	144 /* ===================================================================== */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	145 /* Utility functions. */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	146
63458 a8cfef88408f Merged revisions 83440 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	147 /* Refuse regular I/O if there's data in the iteration-buffer.
a8cfef88408f Merged revisions 83440 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	148 * Mixing them would cause data to arrive out of order, as the read*
a8cfef88408f Merged revisions 83440 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	149 * methods don't use the iteration buffer. */
a8cfef88408f Merged revisions 83440 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	150 static int
a8cfef88408f Merged revisions 83440 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	151 check_iterbuffered(BZ2FileObject *f)
a8cfef88408f Merged revisions 83440 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	152 {
a8cfef88408f Merged revisions 83440 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	153 if (f->f_buf != NULL &&
a8cfef88408f Merged revisions 83440 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	154 (f->f_bufend - f->f_bufptr) > 0 &&
a8cfef88408f Merged revisions 83440 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	155 f->f_buf[0] != '\0') {
a8cfef88408f Merged revisions 83440 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	156 PyErr_SetString(PyExc_ValueError,
a8cfef88408f Merged revisions 83440 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	157 "Mixing iteration and read methods would lose data");
a8cfef88408f Merged revisions 83440 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	158 return -1;
a8cfef88408f Merged revisions 83440 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	159 }
a8cfef88408f Merged revisions 83440 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	160 return 0;
a8cfef88408f Merged revisions 83440 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	161 }
a8cfef88408f Merged revisions 83440 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	162
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	163 static int
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	164 Util_CatchBZ2Error(int bzerror)
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	165 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	166 int ret = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	167 switch(bzerror) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	168 case BZ_OK:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	169 case BZ_STREAM_END:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	170 break;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	171
28861 64230ee8eea5 Applying patch by Neal Norwitz: Gustavo Niemeyer <gustavo@niemeyer.net> parents: 28437 diff changeset	172 #ifdef BZ_CONFIG_ERROR
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	173 case BZ_CONFIG_ERROR:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	174 PyErr_SetString(PyExc_SystemError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	175 "the bz2 library was not compiled "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	176 "correctly");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	177 ret = 1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	178 break;
28861 64230ee8eea5 Applying patch by Neal Norwitz: Gustavo Niemeyer <gustavo@niemeyer.net> parents: 28437 diff changeset	179 #endif
26117 e9aebd4cf56c This couldn't compile on WIndows, due to hardcoded "long long". Repaired. Tim Peters <tim.peters@gmail.com> parents: 26113 diff changeset	180
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	181 case BZ_PARAM_ERROR:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	182 PyErr_SetString(PyExc_ValueError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	183 "the bz2 library has received wrong "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	184 "parameters");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	185 ret = 1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	186 break;
26117 e9aebd4cf56c This couldn't compile on WIndows, due to hardcoded "long long". Repaired. Tim Peters <tim.peters@gmail.com> parents: 26113 diff changeset	187
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	188 case BZ_MEM_ERROR:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	189 PyErr_NoMemory();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	190 ret = 1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	191 break;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	192
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	193 case BZ_DATA_ERROR:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	194 case BZ_DATA_ERROR_MAGIC:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	195 PyErr_SetString(PyExc_IOError, "invalid data stream");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	196 ret = 1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	197 break;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	198
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	199 case BZ_IO_ERROR:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	200 PyErr_SetString(PyExc_IOError, "unknown IO error");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	201 ret = 1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	202 break;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	203
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	204 case BZ_UNEXPECTED_EOF:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	205 PyErr_SetString(PyExc_EOFError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	206 "compressed file ended before the "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	207 "logical end-of-stream was detected");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	208 ret = 1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	209 break;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	210
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	211 case BZ_SEQUENCE_ERROR:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	212 PyErr_SetString(PyExc_RuntimeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	213 "wrong sequence of bz2 library "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	214 "commands used");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	215 ret = 1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	216 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	217 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	218 return ret;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	219 }
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	220
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	221 #if BUFSIZ < 8192
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	222 #define SMALLCHUNK 8192
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	223 #else
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	224 #define SMALLCHUNK BUFSIZ
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	225 #endif
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	226
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	227 #if SIZEOF_INT < 4
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	228 #define BIGCHUNK (512 * 32)
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	229 #else
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	230 #define BIGCHUNK (512 * 1024)
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	231 #endif
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	232
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	233 /* This is a hacked version of Python's fileobject.c:new_buffersize(). */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	234 static size_t
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	235 Util_NewBufferSize(size_t currentsize)
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	236 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	237 if (currentsize > SMALLCHUNK) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	238 /* Keep doubling until we reach BIGCHUNK;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	239 then keep adding BIGCHUNK. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	240 if (currentsize <= BIGCHUNK)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	241 return currentsize + currentsize;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	242 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	243 return currentsize + BIGCHUNK;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	244 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	245 return currentsize + SMALLCHUNK;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	246 }
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	247
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	248 /* This is a hacked version of Python's fileobject.c:get_line(). */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	249 static PyObject *
27819 ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	250 Util_GetLine(BZ2FileObject *f, int n)
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	251 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	252 char c;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	253 char buf, end;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	254 size_t total_v_size; /* total # of slots in buffer */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	255 size_t used_v_size; /* # used slots in buffer */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	256 size_t increment; /* amount to increment the buffer */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	257 PyObject *v;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	258 int bzerror;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	259 int bytes_read;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	260 int newlinetypes = f->f_newlinetypes;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	261 int skipnextlf = f->f_skipnextlf;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	262 int univ_newline = f->f_univ_newline;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	263
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	264 total_v_size = n > 0 ? n : 100;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	265 v = PyString_FromStringAndSize((char *)NULL, total_v_size);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	266 if (v == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	267 return NULL;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	268
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	269 buf = BUF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	270 end = buf + total_v_size;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	271
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	272 for (;;) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	273 Py_BEGIN_ALLOW_THREADS
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	274 while (buf != end) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	275 bytes_read = BZ2_bzRead(&bzerror, f->fp, &c, 1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	276 f->pos++;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	277 if (bytes_read == 0) break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	278 if (univ_newline) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	279 if (skipnextlf) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	280 skipnextlf = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	281 if (c == '\n') {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	282 /* Seeing a \n here with skipnextlf true means we
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	283 * saw a \r before.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	284 */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	285 newlinetypes \|= NEWLINE_CRLF;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	286 if (bzerror != BZ_OK) break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	287 bytes_read = BZ2_bzRead(&bzerror, f->fp, &c, 1);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	288 f->pos++;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	289 if (bytes_read == 0) break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	290 } else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	291 newlinetypes \|= NEWLINE_CR;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	292 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	293 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	294 if (c == '\r') {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	295 skipnextlf = 1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	296 c = '\n';
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	297 } else if (c == '\n')
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	298 newlinetypes \|= NEWLINE_LF;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	299 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	300 *buf++ = c;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	301 if (bzerror != BZ_OK \|\| c == '\n') break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	302 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	303 if (univ_newline && bzerror == BZ_STREAM_END && skipnextlf)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	304 newlinetypes \|= NEWLINE_CR;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	305 Py_END_ALLOW_THREADS
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	306 f->f_newlinetypes = newlinetypes;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	307 f->f_skipnextlf = skipnextlf;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	308 if (bzerror == BZ_STREAM_END) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	309 f->size = f->pos;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	310 f->mode = MODE_READ_EOF;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	311 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	312 } else if (bzerror != BZ_OK) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	313 Util_CatchBZ2Error(bzerror);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	314 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	315 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	316 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	317 if (c == '\n')
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	318 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	319 /* Must be because buf == end */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	320 if (n > 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	321 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	322 used_v_size = total_v_size;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	323 increment = total_v_size >> 2; /* mild exponential growth */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	324 total_v_size += increment;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	325 if (total_v_size > INT_MAX) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	326 PyErr_SetString(PyExc_OverflowError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	327 "line is longer than a Python string can hold");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	328 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	329 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	330 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	331 if (_PyString_Resize(&v, total_v_size) < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	332 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	333 buf = BUF(v) + used_v_size;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	334 end = BUF(v) + total_v_size;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	335 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	336
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	337 used_v_size = buf - BUF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	338 if (used_v_size != total_v_size)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	339 _PyString_Resize(&v, used_v_size);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	340 return v;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	341 }
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	342
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	343 /* This is a hacked version of Python's
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	344 * fileobject.c:Py_UniversalNewlineFread(). */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	345 size_t
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	346 Util_UnivNewlineRead(int bzerror, BZFILE stream,
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	347 char* buf, size_t n, BZ2FileObject *f)
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	348 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	349 char *dst = buf;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	350 int newlinetypes, skipnextlf;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	351
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	352 assert(buf != NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	353 assert(stream != NULL);
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	354
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	355 if (!f->f_univ_newline)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	356 return BZ2_bzRead(bzerror, stream, buf, n);
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	357
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	358 newlinetypes = f->f_newlinetypes;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	359 skipnextlf = f->f_skipnextlf;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	360
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	361 /* Invariant: n is the number of bytes remaining to be filled
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	362 * in the buffer.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	363 */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	364 while (n) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	365 size_t nread;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	366 int shortread;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	367 char *src = dst;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	368
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	369 nread = BZ2_bzRead(bzerror, stream, dst, n);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	370 assert(nread <= n);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	371 n -= nread; /* assuming 1 byte out for each in; will adjust */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	372 shortread = n != 0; /* true iff EOF or error */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	373 while (nread--) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	374 char c = *src++;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	375 if (c == '\r') {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	376 /* Save as LF and set flag to skip next LF. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	377 *dst++ = '\n';
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	378 skipnextlf = 1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	379 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	380 else if (skipnextlf && c == '\n') {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	381 /* Skip LF, and remember we saw CR LF. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	382 skipnextlf = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	383 newlinetypes \|= NEWLINE_CRLF;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	384 ++n;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	385 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	386 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	387 /* Normal char to be stored in buffer. Also
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	388 * update the newlinetypes flag if either this
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	389 * is an LF or the previous char was a CR.
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	390 */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	391 if (c == '\n')
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	392 newlinetypes \|= NEWLINE_LF;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	393 else if (skipnextlf)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	394 newlinetypes \|= NEWLINE_CR;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	395 *dst++ = c;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	396 skipnextlf = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	397 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	398 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	399 if (shortread) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	400 /* If this is EOF, update type flags. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	401 if (skipnextlf && *bzerror == BZ_STREAM_END)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	402 newlinetypes \|= NEWLINE_CR;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	403 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	404 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	405 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	406 f->f_newlinetypes = newlinetypes;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	407 f->f_skipnextlf = skipnextlf;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	408 return dst - buf;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	409 }
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	410
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	411 /* This is a hacked version of Python's fileobject.c:drop_readahead(). */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	412 static void
27819 ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	413 Util_DropReadAhead(BZ2FileObject *f)
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	414 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	415 if (f->f_buf != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	416 PyMem_Free(f->f_buf);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	417 f->f_buf = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	418 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	419 }
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	420
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	421 /* This is a hacked version of Python's fileobject.c:readahead(). */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	422 static int
27819 ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	423 Util_ReadAhead(BZ2FileObject *f, int bufsize)
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	424 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	425 int chunksize;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	426 int bzerror;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	427
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	428 if (f->f_buf != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	429 if((f->f_bufend - f->f_bufptr) >= 1)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	430 return 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	431 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	432 Util_DropReadAhead(f);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	433 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	434 if (f->mode == MODE_READ_EOF) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	435 f->f_bufptr = f->f_buf;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	436 f->f_bufend = f->f_buf;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	437 return 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	438 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	439 if ((f->f_buf = PyMem_Malloc(bufsize)) == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	440 PyErr_NoMemory();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	441 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	442 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	443 Py_BEGIN_ALLOW_THREADS
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	444 chunksize = Util_UnivNewlineRead(&bzerror, f->fp, f->f_buf,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	445 bufsize, f);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	446 Py_END_ALLOW_THREADS
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	447 f->pos += chunksize;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	448 if (bzerror == BZ_STREAM_END) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	449 f->size = f->pos;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	450 f->mode = MODE_READ_EOF;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	451 } else if (bzerror != BZ_OK) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	452 Util_CatchBZ2Error(bzerror);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	453 Util_DropReadAhead(f);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	454 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	455 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	456 f->f_bufptr = f->f_buf;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	457 f->f_bufend = f->f_buf + chunksize;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	458 return 0;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	459 }
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	460
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	461 /* This is a hacked version of Python's
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	462 * fileobject.c:readahead_get_line_skip(). */
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	463 static PyStringObject *
27819 ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	464 Util_ReadAheadGetLineSkip(BZ2FileObject *f, int skip, int bufsize)
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	465 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	466 PyStringObject* s;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	467 char *bufptr;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	468 char *buf;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	469 int len;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	470
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	471 if (f->f_buf == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	472 if (Util_ReadAhead(f, bufsize) < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	473 return NULL;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	474
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	475 len = f->f_bufend - f->f_bufptr;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	476 if (len == 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	477 return (PyStringObject *)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	478 PyString_FromStringAndSize(NULL, skip);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	479 bufptr = memchr(f->f_bufptr, '\n', len);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	480 if (bufptr != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	481 bufptr++; /* Count the '\n' */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	482 len = bufptr - f->f_bufptr;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	483 s = (PyStringObject *)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	484 PyString_FromStringAndSize(NULL, skip+len);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	485 if (s == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	486 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	487 memcpy(PyString_AS_STRING(s)+skip, f->f_bufptr, len);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	488 f->f_bufptr = bufptr;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	489 if (bufptr == f->f_bufend)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	490 Util_DropReadAhead(f);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	491 } else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	492 bufptr = f->f_bufptr;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	493 buf = f->f_buf;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	494 f->f_buf = NULL; /* Force new readahead buffer */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	495 s = Util_ReadAheadGetLineSkip(f, skip+len,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	496 bufsize + (bufsize>>2));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	497 if (s == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	498 PyMem_Free(buf);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	499 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	500 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	501 memcpy(PyString_AS_STRING(s)+skip, bufptr, len);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	502 PyMem_Free(buf);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	503 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	504 return s;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	505 }
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	506
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	507 /* ===================================================================== */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	508 /* Methods of BZ2File. */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	509
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	510 PyDoc_STRVAR(BZ2File_read__doc__,
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	511 "read([size]) -> string\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	512 \n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	513 Read at most size uncompressed bytes, returned as a string. If the size\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	514 argument is negative or omitted, read until EOF is reached.\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	515 ");
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	516
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	517 /* This is a hacked version of Python's fileobject.c:file_read(). */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	518 static PyObject *
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	519 BZ2File_read(BZ2FileObject self, PyObject args)
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	520 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	521 long bytesrequested = -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	522 size_t bytesread, buffersize, chunksize;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	523 int bzerror;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	524 PyObject *ret = NULL;
26117 e9aebd4cf56c This couldn't compile on WIndows, due to hardcoded "long long". Repaired. Tim Peters <tim.peters@gmail.com> parents: 26113 diff changeset	525
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	526 if (!PyArg_ParseTuple(args, "\|l:read", &bytesrequested))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	527 return NULL;
26117 e9aebd4cf56c This couldn't compile on WIndows, due to hardcoded "long long". Repaired. Tim Peters <tim.peters@gmail.com> parents: 26113 diff changeset	528
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	529 ACQUIRE_LOCK(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	530 switch (self->mode) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	531 case MODE_READ:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	532 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	533 case MODE_READ_EOF:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	534 ret = PyString_FromString("");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	535 goto cleanup;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	536 case MODE_CLOSED:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	537 PyErr_SetString(PyExc_ValueError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	538 "I/O operation on closed file");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	539 goto cleanup;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	540 default:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	541 PyErr_SetString(PyExc_IOError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	542 "file is not ready for reading");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	543 goto cleanup;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	544 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	545
63458 a8cfef88408f Merged revisions 83440 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	546 /* refuse to mix with f.next() */
a8cfef88408f Merged revisions 83440 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	547 if (check_iterbuffered(self))
a8cfef88408f Merged revisions 83440 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	548 goto cleanup;
a8cfef88408f Merged revisions 83440 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	549
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	550 if (bytesrequested < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	551 buffersize = Util_NewBufferSize((size_t)0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	552 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	553 buffersize = bytesrequested;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	554 if (buffersize > INT_MAX) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	555 PyErr_SetString(PyExc_OverflowError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	556 "requested number of bytes is "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	557 "more than a Python string can hold");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	558 goto cleanup;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	559 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	560 ret = PyString_FromStringAndSize((char *)NULL, buffersize);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	561 if (ret == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	562 goto cleanup;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	563 bytesread = 0;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	564
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	565 for (;;) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	566 Py_BEGIN_ALLOW_THREADS
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	567 chunksize = Util_UnivNewlineRead(&bzerror, self->fp,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	568 BUF(ret)+bytesread,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	569 buffersize-bytesread,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	570 self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	571 self->pos += chunksize;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	572 Py_END_ALLOW_THREADS
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	573 bytesread += chunksize;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	574 if (bzerror == BZ_STREAM_END) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	575 self->size = self->pos;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	576 self->mode = MODE_READ_EOF;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	577 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	578 } else if (bzerror != BZ_OK) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	579 Util_CatchBZ2Error(bzerror);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	580 Py_DECREF(ret);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	581 ret = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	582 goto cleanup;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	583 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	584 if (bytesrequested < 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	585 buffersize = Util_NewBufferSize(buffersize);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	586 if (_PyString_Resize(&ret, buffersize) < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	587 goto cleanup;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	588 } else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	589 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	590 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	591 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	592 if (bytesread != buffersize)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	593 _PyString_Resize(&ret, bytesread);
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	594
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	595 cleanup:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	596 RELEASE_LOCK(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	597 return ret;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	598 }
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	599
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	600 PyDoc_STRVAR(BZ2File_readline__doc__,
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	601 "readline([size]) -> string\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	602 \n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	603 Return the next line from the file, as a string, retaining newline.\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	604 A non-negative size argument will limit the maximum number of bytes to\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	605 return (an incomplete line may be returned then). Return an empty\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	606 string at EOF.\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	607 ");
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	608
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	609 static PyObject *
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	610 BZ2File_readline(BZ2FileObject self, PyObject args)
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	611 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	612 PyObject *ret = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	613 int sizehint = -1;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	614
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	615 if (!PyArg_ParseTuple(args, "\|i:readline", &sizehint))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	616 return NULL;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	617
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	618 ACQUIRE_LOCK(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	619 switch (self->mode) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	620 case MODE_READ:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	621 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	622 case MODE_READ_EOF:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	623 ret = PyString_FromString("");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	624 goto cleanup;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	625 case MODE_CLOSED:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	626 PyErr_SetString(PyExc_ValueError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	627 "I/O operation on closed file");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	628 goto cleanup;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	629 default:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	630 PyErr_SetString(PyExc_IOError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	631 "file is not ready for reading");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	632 goto cleanup;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	633 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	634
63458 a8cfef88408f Merged revisions 83440 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	635 /* refuse to mix with f.next() */
a8cfef88408f Merged revisions 83440 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	636 if (check_iterbuffered(self))
a8cfef88408f Merged revisions 83440 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	637 goto cleanup;
a8cfef88408f Merged revisions 83440 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	638
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	639 if (sizehint == 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	640 ret = PyString_FromString("");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	641 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	642 ret = Util_GetLine(self, (sizehint < 0) ? 0 : sizehint);
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	643
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	644 cleanup:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	645 RELEASE_LOCK(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	646 return ret;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	647 }
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	648
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	649 PyDoc_STRVAR(BZ2File_readlines__doc__,
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	650 "readlines([size]) -> list\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	651 \n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	652 Call readline() repeatedly and return a list of lines read.\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	653 The optional size argument, if given, is an approximate bound on the\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	654 total number of bytes in the lines returned.\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	655 ");
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	656
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	657 /* This is a hacked version of Python's fileobject.c:file_readlines(). */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	658 static PyObject *
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	659 BZ2File_readlines(BZ2FileObject self, PyObject args)
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	660 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	661 long sizehint = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	662 PyObject *list = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	663 PyObject *line;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	664 char small_buffer[SMALLCHUNK];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	665 char *buffer = small_buffer;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	666 size_t buffersize = SMALLCHUNK;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	667 PyObject *big_buffer = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	668 size_t nfilled = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	669 size_t nread;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	670 size_t totalread = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	671 char p, q, *end;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	672 int err;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	673 int shortread = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	674 int bzerror;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	675
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	676 if (!PyArg_ParseTuple(args, "\|l:readlines", &sizehint))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	677 return NULL;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	678
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	679 ACQUIRE_LOCK(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	680 switch (self->mode) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	681 case MODE_READ:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	682 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	683 case MODE_READ_EOF:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	684 list = PyList_New(0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	685 goto cleanup;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	686 case MODE_CLOSED:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	687 PyErr_SetString(PyExc_ValueError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	688 "I/O operation on closed file");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	689 goto cleanup;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	690 default:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	691 PyErr_SetString(PyExc_IOError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	692 "file is not ready for reading");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	693 goto cleanup;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	694 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	695
63458 a8cfef88408f Merged revisions 83440 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	696 /* refuse to mix with f.next() */
a8cfef88408f Merged revisions 83440 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	697 if (check_iterbuffered(self))
a8cfef88408f Merged revisions 83440 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	698 goto cleanup;
a8cfef88408f Merged revisions 83440 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	699
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	700 if ((list = PyList_New(0)) == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	701 goto cleanup;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	702
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	703 for (;;) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	704 Py_BEGIN_ALLOW_THREADS
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	705 nread = Util_UnivNewlineRead(&bzerror, self->fp,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	706 buffer+nfilled,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	707 buffersize-nfilled, self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	708 self->pos += nread;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	709 Py_END_ALLOW_THREADS
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	710 if (bzerror == BZ_STREAM_END) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	711 self->size = self->pos;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	712 self->mode = MODE_READ_EOF;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	713 if (nread == 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	714 sizehint = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	715 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	716 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	717 shortread = 1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	718 } else if (bzerror != BZ_OK) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	719 Util_CatchBZ2Error(bzerror);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	720 error:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	721 Py_DECREF(list);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	722 list = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	723 goto cleanup;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	724 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	725 totalread += nread;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	726 p = memchr(buffer+nfilled, '\n', nread);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	727 if (!shortread && p == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	728 /* Need a larger buffer to fit this line */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	729 nfilled += nread;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	730 buffersize *= 2;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	731 if (buffersize > INT_MAX) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	732 PyErr_SetString(PyExc_OverflowError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	733 "line is longer than a Python string can hold");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	734 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	735 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	736 if (big_buffer == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	737 /* Create the big buffer */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	738 big_buffer = PyString_FromStringAndSize(
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	739 NULL, buffersize);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	740 if (big_buffer == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	741 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	742 buffer = PyString_AS_STRING(big_buffer);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	743 memcpy(buffer, small_buffer, nfilled);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	744 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	745 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	746 /* Grow the big buffer */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	747 _PyString_Resize(&big_buffer, buffersize);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	748 buffer = PyString_AS_STRING(big_buffer);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	749 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	750 continue;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	751 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	752 end = buffer+nfilled+nread;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	753 q = buffer;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	754 while (p != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	755 /* Process complete lines */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	756 p++;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	757 line = PyString_FromStringAndSize(q, p-q);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	758 if (line == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	759 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	760 err = PyList_Append(list, line);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	761 Py_DECREF(line);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	762 if (err != 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	763 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	764 q = p;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	765 p = memchr(q, '\n', end-q);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	766 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	767 /* Move the remaining incomplete line to the start */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	768 nfilled = end-q;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	769 memmove(buffer, q, nfilled);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	770 if (sizehint > 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	771 if (totalread >= (size_t)sizehint)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	772 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	773 if (shortread) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	774 sizehint = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	775 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	776 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	777 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	778 if (nfilled != 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	779 /* Partial last line */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	780 line = PyString_FromStringAndSize(buffer, nfilled);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	781 if (line == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	782 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	783 if (sizehint > 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	784 /* Need to complete the last line */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	785 PyObject *rest = Util_GetLine(self, 0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	786 if (rest == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	787 Py_DECREF(line);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	788 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	789 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	790 PyString_Concat(&line, rest);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	791 Py_DECREF(rest);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	792 if (line == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	793 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	794 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	795 err = PyList_Append(list, line);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	796 Py_DECREF(line);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	797 if (err != 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	798 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	799 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	800
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	801 cleanup:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	802 RELEASE_LOCK(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	803 if (big_buffer) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	804 Py_DECREF(big_buffer);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	805 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	806 return list;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	807 }
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	808
27819 ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	809 PyDoc_STRVAR(BZ2File_xreadlines__doc__,
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	810 "xreadlines() -> self\n\
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	811 \n\
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	812 For backward compatibility. BZ2File objects now include the performance\n\
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	813 optimizations previously implemented in the xreadlines module.\n\
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	814 ");
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	815
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	816 PyDoc_STRVAR(BZ2File_write__doc__,
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	817 "write(data) -> None\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	818 \n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	819 Write the 'data' string to file. Note that due to buffering, close() may\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	820 be needed before the file on disk reflects the data written.\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	821 ");
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	822
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	823 /* This is a hacked version of Python's fileobject.c:file_write(). */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	824 static PyObject *
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	825 BZ2File_write(BZ2FileObject self, PyObject args)
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	826 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	827 PyObject *ret = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	828 Py_buffer pbuf;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	829 char *buf;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	830 int len;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	831 int bzerror;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	832
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	833 if (!PyArg_ParseTuple(args, "s*:write", &pbuf))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	834 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	835 buf = pbuf.buf;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	836 len = pbuf.len;
26117 e9aebd4cf56c This couldn't compile on WIndows, due to hardcoded "long long". Repaired. Tim Peters <tim.peters@gmail.com> parents: 26113 diff changeset	837
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	838 ACQUIRE_LOCK(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	839 switch (self->mode) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	840 case MODE_WRITE:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	841 break;
26117 e9aebd4cf56c This couldn't compile on WIndows, due to hardcoded "long long". Repaired. Tim Peters <tim.peters@gmail.com> parents: 26113 diff changeset	842
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	843 case MODE_CLOSED:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	844 PyErr_SetString(PyExc_ValueError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	845 "I/O operation on closed file");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	846 goto cleanup;
26117 e9aebd4cf56c This couldn't compile on WIndows, due to hardcoded "long long". Repaired. Tim Peters <tim.peters@gmail.com> parents: 26113 diff changeset	847
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	848 default:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	849 PyErr_SetString(PyExc_IOError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	850 "file is not ready for writing");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	851 goto cleanup;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	852 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	853
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	854 self->f_softspace = 0;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	855
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	856 Py_BEGIN_ALLOW_THREADS
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	857 BZ2_bzWrite (&bzerror, self->fp, buf, len);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	858 self->pos += len;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	859 Py_END_ALLOW_THREADS
26117 e9aebd4cf56c This couldn't compile on WIndows, due to hardcoded "long long". Repaired. Tim Peters <tim.peters@gmail.com> parents: 26113 diff changeset	860
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	861 if (bzerror != BZ_OK) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	862 Util_CatchBZ2Error(bzerror);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	863 goto cleanup;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	864 }
26117 e9aebd4cf56c This couldn't compile on WIndows, due to hardcoded "long long". Repaired. Tim Peters <tim.peters@gmail.com> parents: 26113 diff changeset	865
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	866 Py_INCREF(Py_None);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	867 ret = Py_None;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	868
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	869 cleanup:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	870 PyBuffer_Release(&pbuf);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	871 RELEASE_LOCK(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	872 return ret;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	873 }
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	874
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	875 PyDoc_STRVAR(BZ2File_writelines__doc__,
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	876 "writelines(sequence_of_strings) -> None\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	877 \n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	878 Write the sequence of strings to the file. Note that newlines are not\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	879 added. The sequence can be any iterable object producing strings. This is\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	880 equivalent to calling write() for each string.\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	881 ");
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	882
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	883 /* This is a hacked version of Python's fileobject.c:file_writelines(). */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	884 static PyObject *
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	885 BZ2File_writelines(BZ2FileObject self, PyObject seq)
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	886 {
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	887 #define CHUNKSIZE 1000
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	888 PyObject *list = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	889 PyObject *iter = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	890 PyObject *ret = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	891 PyObject *line;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	892 int i, j, index, len, islist;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	893 int bzerror;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	894
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	895 ACQUIRE_LOCK(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	896 switch (self->mode) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	897 case MODE_WRITE:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	898 break;
39496 352ffe77b71d Patch #1535500: fix segfault in BZ2File.writelines and make sure it Georg Brandl <georg@python.org> parents: 39135 diff changeset	899
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	900 case MODE_CLOSED:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	901 PyErr_SetString(PyExc_ValueError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	902 "I/O operation on closed file");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	903 goto error;
39496 352ffe77b71d Patch #1535500: fix segfault in BZ2File.writelines and make sure it Georg Brandl <georg@python.org> parents: 39135 diff changeset	904
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	905 default:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	906 PyErr_SetString(PyExc_IOError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	907 "file is not ready for writing");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	908 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	909 }
39496 352ffe77b71d Patch #1535500: fix segfault in BZ2File.writelines and make sure it Georg Brandl <georg@python.org> parents: 39135 diff changeset	910
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	911 islist = PyList_Check(seq);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	912 if (!islist) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	913 iter = PyObject_GetIter(seq);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	914 if (iter == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	915 PyErr_SetString(PyExc_TypeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	916 "writelines() requires an iterable argument");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	917 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	918 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	919 list = PyList_New(CHUNKSIZE);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	920 if (list == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	921 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	922 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	923
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	924 /* Strategy: slurp CHUNKSIZE lines into a private list,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	925 checking that they are all strings, then write that list
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	926 without holding the interpreter lock, then come back for more. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	927 for (index = 0; ; index += CHUNKSIZE) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	928 if (islist) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	929 Py_XDECREF(list);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	930 list = PyList_GetSlice(seq, index, index+CHUNKSIZE);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	931 if (list == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	932 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	933 j = PyList_GET_SIZE(list);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	934 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	935 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	936 for (j = 0; j < CHUNKSIZE; j++) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	937 line = PyIter_Next(iter);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	938 if (line == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	939 if (PyErr_Occurred())
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	940 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	941 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	942 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	943 PyList_SetItem(list, j, line);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	944 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	945 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	946 if (j == 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	947 break;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	948
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	949 /* Check that all entries are indeed strings. If not,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	950 apply the same rules as for file.write() and
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	951 convert the rets to strings. This is slow, but
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	952 seems to be the only way since all conversion APIs
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	953 could potentially execute Python code. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	954 for (i = 0; i < j; i++) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	955 PyObject *v = PyList_GET_ITEM(list, i);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	956 if (!PyString_Check(v)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	957 const char *buffer;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	958 Py_ssize_t len;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	959 if (PyObject_AsCharBuffer(v, &buffer, &len)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	960 PyErr_SetString(PyExc_TypeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	961 "writelines() "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	962 "argument must be "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	963 "a sequence of "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	964 "strings");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	965 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	966 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	967 line = PyString_FromStringAndSize(buffer,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	968 len);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	969 if (line == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	970 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	971 Py_DECREF(v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	972 PyList_SET_ITEM(list, i, line);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	973 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	974 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	975
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	976 self->f_softspace = 0;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	977
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	978 /* Since we are releasing the global lock, the
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	979 following code may not execute Python code. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	980 Py_BEGIN_ALLOW_THREADS
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	981 for (i = 0; i < j; i++) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	982 line = PyList_GET_ITEM(list, i);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	983 len = PyString_GET_SIZE(line);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	984 BZ2_bzWrite (&bzerror, self->fp,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	985 PyString_AS_STRING(line), len);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	986 if (bzerror != BZ_OK) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	987 Py_BLOCK_THREADS
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	988 Util_CatchBZ2Error(bzerror);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	989 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	990 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	991 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	992 Py_END_ALLOW_THREADS
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	993
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	994 if (j < CHUNKSIZE)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	995 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	996 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	997
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	998 Py_INCREF(Py_None);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	999 ret = Py_None;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1000
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1001 error:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1002 RELEASE_LOCK(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1003 Py_XDECREF(list);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1004 Py_XDECREF(iter);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1005 return ret;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1006 #undef CHUNKSIZE
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1007 }
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1008
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1009 PyDoc_STRVAR(BZ2File_seek__doc__,
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1010 "seek(offset [, whence]) -> None\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1011 \n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1012 Move to new file position. Argument offset is a byte count. Optional\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1013 argument whence defaults to 0 (offset from start of file, offset\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1014 should be >= 0); other values are 1 (move relative to current position,\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1015 positive or negative), and 2 (move relative to end of file, usually\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1016 negative, although many platforms allow seeking beyond the end of a file).\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1017 \n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1018 Note that seeking of bz2 files is emulated, and depending on the parameters\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1019 the operation may be extremely slow.\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1020 ");
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1021
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1022 static PyObject *
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1023 BZ2File_seek(BZ2FileObject self, PyObject args)
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1024 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1025 int where = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1026 PyObject *offobj;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1027 Py_off_t offset;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1028 char small_buffer[SMALLCHUNK];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1029 char *buffer = small_buffer;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1030 size_t buffersize = SMALLCHUNK;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1031 Py_off_t bytesread = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1032 size_t readsize;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1033 int chunksize;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1034 int bzerror;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1035 PyObject *ret = NULL;
26117 e9aebd4cf56c This couldn't compile on WIndows, due to hardcoded "long long". Repaired. Tim Peters <tim.peters@gmail.com> parents: 26113 diff changeset	1036
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1037 if (!PyArg_ParseTuple(args, "O\|i:seek", &offobj, &where))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1038 return NULL;
35374 797d82eec625 Fix BZ2File.(x)readlines() for files without a newline. Georg Brandl <georg@python.org> parents: 35013 diff changeset	1039 #if !defined(HAVE_LARGEFILE_SUPPORT)
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1040 offset = PyInt_AsLong(offobj);
35374 797d82eec625 Fix BZ2File.(x)readlines() for files without a newline. Georg Brandl <georg@python.org> parents: 35013 diff changeset	1041 #else
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1042 offset = PyLong_Check(offobj) ?
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1043 PyLong_AsLongLong(offobj) : PyInt_AsLong(offobj);
35374 797d82eec625 Fix BZ2File.(x)readlines() for files without a newline. Georg Brandl <georg@python.org> parents: 35013 diff changeset	1044 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1045 if (PyErr_Occurred())
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1046 return NULL;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1047
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1048 ACQUIRE_LOCK(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1049 Util_DropReadAhead(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1050 switch (self->mode) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1051 case MODE_READ:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1052 case MODE_READ_EOF:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1053 break;
26117 e9aebd4cf56c This couldn't compile on WIndows, due to hardcoded "long long". Repaired. Tim Peters <tim.peters@gmail.com> parents: 26113 diff changeset	1054
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1055 case MODE_CLOSED:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1056 PyErr_SetString(PyExc_ValueError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1057 "I/O operation on closed file");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1058 goto cleanup;
26117 e9aebd4cf56c This couldn't compile on WIndows, due to hardcoded "long long". Repaired. Tim Peters <tim.peters@gmail.com> parents: 26113 diff changeset	1059
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1060 default:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1061 PyErr_SetString(PyExc_IOError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1062 "seek works only while reading");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1063 goto cleanup;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1064 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1065
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1066 if (where == 2) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1067 if (self->size == -1) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1068 assert(self->mode != MODE_READ_EOF);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1069 for (;;) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1070 Py_BEGIN_ALLOW_THREADS
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1071 chunksize = Util_UnivNewlineRead(
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1072 &bzerror, self->fp,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1073 buffer, buffersize,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1074 self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1075 self->pos += chunksize;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1076 Py_END_ALLOW_THREADS
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1077
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1078 bytesread += chunksize;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1079 if (bzerror == BZ_STREAM_END) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1080 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1081 } else if (bzerror != BZ_OK) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1082 Util_CatchBZ2Error(bzerror);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1083 goto cleanup;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1084 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1085 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1086 self->mode = MODE_READ_EOF;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1087 self->size = self->pos;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1088 bytesread = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1089 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1090 offset = self->size + offset;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1091 } else if (where == 1) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1092 offset = self->pos + offset;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1093 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1094
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1095 /* Before getting here, offset must be the absolute position the file
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1096 * pointer should be set to. */
36571 18458711ebed Bug #1366000: cleanup BZ2File.seek() logic. Fixes the case of whence=2, offset>=0. Georg Brandl <georg@python.org> parents: 36501 diff changeset	1097
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1098 if (offset >= self->pos) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1099 /* we can move forward */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1100 offset -= self->pos;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1101 } else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1102 /* we cannot move back, so rewind the stream */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1103 BZ2_bzReadClose(&bzerror, self->fp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1104 if (self->fp) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1105 PyFile_DecUseCount((PyFileObject *)self->file);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1106 self->fp = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1107 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1108 if (bzerror != BZ_OK) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1109 Util_CatchBZ2Error(bzerror);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1110 goto cleanup;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1111 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1112 ret = PyObject_CallMethod(self->file, "seek", "(i)", 0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1113 if (!ret)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1114 goto cleanup;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1115 Py_DECREF(ret);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1116 ret = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1117 self->pos = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1118 self->fp = BZ2_bzReadOpen(&bzerror, PyFile_AsFile(self->file),
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1119 0, 0, NULL, 0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1120 if (self->fp)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1121 PyFile_IncUseCount((PyFileObject *)self->file);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1122 if (bzerror != BZ_OK) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1123 Util_CatchBZ2Error(bzerror);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1124 goto cleanup;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1125 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1126 self->mode = MODE_READ;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1127 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1128
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1129 if (offset <= 0 \|\| self->mode == MODE_READ_EOF)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1130 goto exit;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1131
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1132 /* Before getting here, offset must be set to the number of bytes
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1133 * to walk forward. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1134 for (;;) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1135 if (offset-bytesread > buffersize)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1136 readsize = buffersize;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1137 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1138 /* offset might be wider that readsize, but the result
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1139 * of the subtraction is bound by buffersize (see the
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1140 * condition above). buffersize is 8192. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1141 readsize = (size_t)(offset-bytesread);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1142 Py_BEGIN_ALLOW_THREADS
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1143 chunksize = Util_UnivNewlineRead(&bzerror, self->fp,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1144 buffer, readsize, self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1145 self->pos += chunksize;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1146 Py_END_ALLOW_THREADS
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1147 bytesread += chunksize;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1148 if (bzerror == BZ_STREAM_END) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1149 self->size = self->pos;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1150 self->mode = MODE_READ_EOF;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1151 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1152 } else if (bzerror != BZ_OK) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1153 Util_CatchBZ2Error(bzerror);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1154 goto cleanup;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1155 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1156 if (bytesread == offset)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1157 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1158 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1159
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1160 exit:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1161 Py_INCREF(Py_None);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1162 ret = Py_None;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1163
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1164 cleanup:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1165 RELEASE_LOCK(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1166 return ret;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1167 }
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1168
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1169 PyDoc_STRVAR(BZ2File_tell__doc__,
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1170 "tell() -> int\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1171 \n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1172 Return the current file position, an integer (may be a long integer).\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1173 ");
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1174
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1175 static PyObject *
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1176 BZ2File_tell(BZ2FileObject self, PyObject args)
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1177 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1178 PyObject *ret = NULL;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1179
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1180 if (self->mode == MODE_CLOSED) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1181 PyErr_SetString(PyExc_ValueError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1182 "I/O operation on closed file");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1183 goto cleanup;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1184 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1185
35516 de1c5d17fde6 bug [ 1274069 ] bz2module.c compiler warning Georg Brandl <georg@python.org> parents: 35374 diff changeset	1186 #if !defined(HAVE_LARGEFILE_SUPPORT)
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1187 ret = PyInt_FromLong(self->pos);
35516 de1c5d17fde6 bug [ 1274069 ] bz2module.c compiler warning Georg Brandl <georg@python.org> parents: 35374 diff changeset	1188 #else
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1189 ret = PyLong_FromLongLong(self->pos);
35516 de1c5d17fde6 bug [ 1274069 ] bz2module.c compiler warning Georg Brandl <georg@python.org> parents: 35374 diff changeset	1190 #endif
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1191
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1192 cleanup:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1193 return ret;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1194 }
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1195
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1196 PyDoc_STRVAR(BZ2File_close__doc__,
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1197 "close() -> None or (perhaps) an integer\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1198 \n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1199 Close the file. Sets data attribute .closed to true. A closed file\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1200 cannot be used for further I/O operations. close() may be called more\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1201 than once without error.\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1202 ");
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1203
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1204 static PyObject *
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1205 BZ2File_close(BZ2FileObject *self)
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1206 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1207 PyObject *ret = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1208 int bzerror = BZ_OK;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1209
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1210 ACQUIRE_LOCK(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1211 switch (self->mode) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1212 case MODE_READ:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1213 case MODE_READ_EOF:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1214 BZ2_bzReadClose(&bzerror, self->fp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1215 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1216 case MODE_WRITE:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1217 BZ2_bzWriteClose(&bzerror, self->fp,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1218 0, NULL, NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1219 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1220 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1221 if (self->fp) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1222 PyFile_DecUseCount((PyFileObject *)self->file);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1223 self->fp = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1224 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1225 self->mode = MODE_CLOSED;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1226 ret = PyObject_CallMethod(self->file, "close", NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1227 if (bzerror != BZ_OK) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1228 Util_CatchBZ2Error(bzerror);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1229 Py_XDECREF(ret);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1230 ret = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1231 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1232
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1233 RELEASE_LOCK(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1234 return ret;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1235 }
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1236
50698 5d5d9074f4ca Issue #3860: GzipFile and BZ2File now support the context manager protocol. Antoine Pitrou <solipsis@pitrou.net> parents: 48221 diff changeset	1237 PyDoc_STRVAR(BZ2File_enter_doc,
5d5d9074f4ca Issue #3860: GzipFile and BZ2File now support the context manager protocol. Antoine Pitrou <solipsis@pitrou.net> parents: 48221 diff changeset	1238 "__enter__() -> self.");
5d5d9074f4ca Issue #3860: GzipFile and BZ2File now support the context manager protocol. Antoine Pitrou <solipsis@pitrou.net> parents: 48221 diff changeset	1239
5d5d9074f4ca Issue #3860: GzipFile and BZ2File now support the context manager protocol. Antoine Pitrou <solipsis@pitrou.net> parents: 48221 diff changeset	1240 static PyObject *
5d5d9074f4ca Issue #3860: GzipFile and BZ2File now support the context manager protocol. Antoine Pitrou <solipsis@pitrou.net> parents: 48221 diff changeset	1241 BZ2File_enter(BZ2FileObject *self)
5d5d9074f4ca Issue #3860: GzipFile and BZ2File now support the context manager protocol. Antoine Pitrou <solipsis@pitrou.net> parents: 48221 diff changeset	1242 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1243 if (self->mode == MODE_CLOSED) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1244 PyErr_SetString(PyExc_ValueError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1245 "I/O operation on closed file");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1246 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1247 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1248 Py_INCREF(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1249 return (PyObject *) self;
50698 5d5d9074f4ca Issue #3860: GzipFile and BZ2File now support the context manager protocol. Antoine Pitrou <solipsis@pitrou.net> parents: 48221 diff changeset	1250 }
5d5d9074f4ca Issue #3860: GzipFile and BZ2File now support the context manager protocol. Antoine Pitrou <solipsis@pitrou.net> parents: 48221 diff changeset	1251
5d5d9074f4ca Issue #3860: GzipFile and BZ2File now support the context manager protocol. Antoine Pitrou <solipsis@pitrou.net> parents: 48221 diff changeset	1252 PyDoc_STRVAR(BZ2File_exit_doc,
5d5d9074f4ca Issue #3860: GzipFile and BZ2File now support the context manager protocol. Antoine Pitrou <solipsis@pitrou.net> parents: 48221 diff changeset	1253 "__exit__(*excinfo) -> None. Closes the file.");
5d5d9074f4ca Issue #3860: GzipFile and BZ2File now support the context manager protocol. Antoine Pitrou <solipsis@pitrou.net> parents: 48221 diff changeset	1254
5d5d9074f4ca Issue #3860: GzipFile and BZ2File now support the context manager protocol. Antoine Pitrou <solipsis@pitrou.net> parents: 48221 diff changeset	1255 static PyObject *
5d5d9074f4ca Issue #3860: GzipFile and BZ2File now support the context manager protocol. Antoine Pitrou <solipsis@pitrou.net> parents: 48221 diff changeset	1256 BZ2File_exit(BZ2FileObject self, PyObject args)
5d5d9074f4ca Issue #3860: GzipFile and BZ2File now support the context manager protocol. Antoine Pitrou <solipsis@pitrou.net> parents: 48221 diff changeset	1257 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1258 PyObject ret = PyObject_CallMethod((PyObject ) self, "close", NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1259 if (!ret)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1260 /* If error occurred, pass through */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1261 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1262 Py_DECREF(ret);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1263 Py_RETURN_NONE;
50698 5d5d9074f4ca Issue #3860: GzipFile and BZ2File now support the context manager protocol. Antoine Pitrou <solipsis@pitrou.net> parents: 48221 diff changeset	1264 }
5d5d9074f4ca Issue #3860: GzipFile and BZ2File now support the context manager protocol. Antoine Pitrou <solipsis@pitrou.net> parents: 48221 diff changeset	1265
5d5d9074f4ca Issue #3860: GzipFile and BZ2File now support the context manager protocol. Antoine Pitrou <solipsis@pitrou.net> parents: 48221 diff changeset	1266
27819 ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1267 static PyObject BZ2File_getiter(BZ2FileObject self);
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1268
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1269 static PyMethodDef BZ2File_methods[] = {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1270 {"read", (PyCFunction)BZ2File_read, METH_VARARGS, BZ2File_read__doc__},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1271 {"readline", (PyCFunction)BZ2File_readline, METH_VARARGS, BZ2File_readline__doc__},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1272 {"readlines", (PyCFunction)BZ2File_readlines, METH_VARARGS, BZ2File_readlines__doc__},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1273 {"xreadlines", (PyCFunction)BZ2File_getiter, METH_VARARGS, BZ2File_xreadlines__doc__},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1274 {"write", (PyCFunction)BZ2File_write, METH_VARARGS, BZ2File_write__doc__},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1275 {"writelines", (PyCFunction)BZ2File_writelines, METH_O, BZ2File_writelines__doc__},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1276 {"seek", (PyCFunction)BZ2File_seek, METH_VARARGS, BZ2File_seek__doc__},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1277 {"tell", (PyCFunction)BZ2File_tell, METH_NOARGS, BZ2File_tell__doc__},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1278 {"close", (PyCFunction)BZ2File_close, METH_NOARGS, BZ2File_close__doc__},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1279 {"__enter__", (PyCFunction)BZ2File_enter, METH_NOARGS, BZ2File_enter_doc},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1280 {"__exit__", (PyCFunction)BZ2File_exit, METH_VARARGS, BZ2File_exit_doc},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1281 {NULL, NULL} /* sentinel */
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1282 };
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1283
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1284
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1285 /* ===================================================================== */
27819 ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1286 /* Getters and setters of BZ2File. */
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1287
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1288 /* This is a hacked version of Python's fileobject.c:get_newlines(). */
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1289 static PyObject *
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1290 BZ2File_get_newlines(BZ2FileObject self, void closure)
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1291 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1292 switch (self->f_newlinetypes) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1293 case NEWLINE_UNKNOWN:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1294 Py_INCREF(Py_None);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1295 return Py_None;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1296 case NEWLINE_CR:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1297 return PyString_FromString("\r");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1298 case NEWLINE_LF:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1299 return PyString_FromString("\n");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1300 case NEWLINE_CR\|NEWLINE_LF:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1301 return Py_BuildValue("(ss)", "\r", "\n");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1302 case NEWLINE_CRLF:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1303 return PyString_FromString("\r\n");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1304 case NEWLINE_CR\|NEWLINE_CRLF:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1305 return Py_BuildValue("(ss)", "\r", "\r\n");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1306 case NEWLINE_LF\|NEWLINE_CRLF:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1307 return Py_BuildValue("(ss)", "\n", "\r\n");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1308 case NEWLINE_CR\|NEWLINE_LF\|NEWLINE_CRLF:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1309 return Py_BuildValue("(sss)", "\r", "\n", "\r\n");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1310 default:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1311 PyErr_Format(PyExc_SystemError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1312 "Unknown newlines value 0x%x\n",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1313 self->f_newlinetypes);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1314 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1315 }
27819 ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1316 }
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1317
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1318 static PyObject *
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1319 BZ2File_get_closed(BZ2FileObject self, void closure)
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1320 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1321 return PyInt_FromLong(self->mode == MODE_CLOSED);
27819 ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1322 }
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1323
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1324 static PyObject *
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1325 BZ2File_get_mode(BZ2FileObject self, void closure)
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1326 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1327 return PyObject_GetAttrString(self->file, "mode");
27819 ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1328 }
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1329
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1330 static PyObject *
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1331 BZ2File_get_name(BZ2FileObject self, void closure)
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1332 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1333 return PyObject_GetAttrString(self->file, "name");
27819 ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1334 }
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1335
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1336 static PyGetSetDef BZ2File_getset[] = {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1337 {"closed", (getter)BZ2File_get_closed, NULL,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1338 "True if the file is closed"},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1339 {"newlines", (getter)BZ2File_get_newlines, NULL,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1340 "end-of-line convention used in this file"},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1341 {"mode", (getter)BZ2File_get_mode, NULL,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1342 "file mode ('r', 'w', or 'U')"},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1343 {"name", (getter)BZ2File_get_name, NULL,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1344 "file name"},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1345 {NULL} /* Sentinel */
27819 ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1346 };
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1347
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1348
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1349 /* ===================================================================== */
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1350 /* Members of BZ2File_Type. */
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1351
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1352 #undef OFF
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1353 #define OFF(x) offsetof(BZ2FileObject, x)
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1354
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1355 static PyMemberDef BZ2File_members[] = {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1356 {"softspace", T_INT, OFF(f_softspace), 0,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1357 "flag indicating that a space needs to be printed; used by print"},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1358 {NULL} /* Sentinel */
27819 ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1359 };
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1360
ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1361 /* ===================================================================== */
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1362 /* Slot definitions for BZ2File_Type. */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1363
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1364 static int
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1365 BZ2File_init(BZ2FileObject self, PyObject args, PyObject *kwargs)
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1366 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1367 static char *kwlist[] = {"filename", "mode", "buffering",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1368 "compresslevel", 0};
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1369 PyObject *name;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1370 char *mode = "r";
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1371 int buffering = -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1372 int compresslevel = 9;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1373 int bzerror;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1374 int mode_char = 0;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1375
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1376 self->size = -1;
26117 e9aebd4cf56c This couldn't compile on WIndows, due to hardcoded "long long". Repaired. Tim Peters <tim.peters@gmail.com> parents: 26113 diff changeset	1377
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1378 if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O\|sii:BZ2File",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1379 kwlist, &name, &mode, &buffering,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1380 &compresslevel))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1381 return -1;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1382
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1383 if (compresslevel < 1 \|\| compresslevel > 9) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1384 PyErr_SetString(PyExc_ValueError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1385 "compresslevel must be between 1 and 9");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1386 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1387 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1388
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1389 for (;;) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1390 int error = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1391 switch (*mode) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1392 case 'r':
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1393 case 'w':
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1394 if (mode_char)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1395 error = 1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1396 mode_char = *mode;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1397 break;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1398
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1399 case 'b':
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1400 break;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1401
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1402 case 'U':
39043 c67b23397f30 Patch #1516912: improve Modules support for OpenVMS. Neal Norwitz <nnorwitz@gmail.com> parents: 38760 diff changeset	1403 #ifdef __VMS
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1404 self->f_univ_newline = 0;
39043 c67b23397f30 Patch #1516912: improve Modules support for OpenVMS. Neal Norwitz <nnorwitz@gmail.com> parents: 38760 diff changeset	1405 #else
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1406 self->f_univ_newline = 1;
39043 c67b23397f30 Patch #1516912: improve Modules support for OpenVMS. Neal Norwitz <nnorwitz@gmail.com> parents: 38760 diff changeset	1407 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1408 break;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1409
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1410 default:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1411 error = 1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1412 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1413 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1414 if (error) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1415 PyErr_Format(PyExc_ValueError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1416 "invalid mode char %c", *mode);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1417 return -1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1418 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1419 mode++;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1420 if (*mode == '\0')
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1421 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1422 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1423
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1424 if (mode_char == 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1425 mode_char = 'r';
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1426 }
35013 4a02a4317655 Bug #1194181: bz2.BZ2File didn't handle mode 'U' correctly. Georg Brandl <georg@python.org> parents: 33877 diff changeset	1427
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1428 mode = (mode_char == 'r') ? "rb" : "wb";
26117 e9aebd4cf56c This couldn't compile on WIndows, due to hardcoded "long long". Repaired. Tim Peters <tim.peters@gmail.com> parents: 26113 diff changeset	1429
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1430 self->file = PyObject_CallFunction((PyObject*)&PyFile_Type, "(Osi)",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1431 name, mode, buffering);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1432 if (self->file == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1433 return -1;
26113 9ffea50e8330 * Modules/bz2module.c Gustavo Niemeyer <gustavo@niemeyer.net> parents: 26045 diff changeset	1434
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1435 /* From now on, we have stuff to dealloc, so jump to error label
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1436 * instead of returning */
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1437
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1438 #ifdef WITH_THREAD
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1439 self->lock = PyThread_allocate_lock();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1440 if (!self->lock) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1441 PyErr_SetString(PyExc_MemoryError, "unable to allocate lock");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1442 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1443 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1444 #endif
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1445
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1446 if (mode_char == 'r')
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1447 self->fp = BZ2_bzReadOpen(&bzerror,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1448 PyFile_AsFile(self->file),
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1449 0, 0, NULL, 0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1450 else
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1451 self->fp = BZ2_bzWriteOpen(&bzerror,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1452 PyFile_AsFile(self->file),
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1453 compresslevel, 0, 0);
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1454
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1455 if (bzerror != BZ_OK) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1456 Util_CatchBZ2Error(bzerror);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1457 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1458 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1459 PyFile_IncUseCount((PyFileObject *)self->file);
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1460
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1461 self->mode = (mode_char == 'r') ? MODE_READ : MODE_WRITE;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1462
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1463 return 0;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1464
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1465 error:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1466 Py_CLEAR(self->file);
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1467 #ifdef WITH_THREAD
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1468 if (self->lock) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1469 PyThread_free_lock(self->lock);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1470 self->lock = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1471 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1472 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1473 return -1;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1474 }
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1475
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1476 static void
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1477 BZ2File_dealloc(BZ2FileObject *self)
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1478 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1479 int bzerror;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1480 #ifdef WITH_THREAD
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1481 if (self->lock)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1482 PyThread_free_lock(self->lock);
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1483 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1484 switch (self->mode) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1485 case MODE_READ:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1486 case MODE_READ_EOF:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1487 BZ2_bzReadClose(&bzerror, self->fp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1488 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1489 case MODE_WRITE:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1490 BZ2_bzWriteClose(&bzerror, self->fp,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1491 0, NULL, NULL);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1492 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1493 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1494 if (self->fp) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1495 PyFile_DecUseCount((PyFileObject *)self->file);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1496 self->fp = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1497 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1498 Util_DropReadAhead(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1499 Py_XDECREF(self->file);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1500 Py_TYPE(self)->tp_free((PyObject *)self);
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1501 }
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1502
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1503 /* This is a hacked version of Python's fileobject.c:file_getiter(). */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1504 static PyObject *
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1505 BZ2File_getiter(BZ2FileObject *self)
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1506 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1507 if (self->mode == MODE_CLOSED) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1508 PyErr_SetString(PyExc_ValueError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1509 "I/O operation on closed file");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1510 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1511 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1512 Py_INCREF((PyObject*)self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1513 return (PyObject *)self;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1514 }
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1515
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1516 /* This is a hacked version of Python's fileobject.c:file_iternext(). */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1517 #define READAHEAD_BUFSIZE 8192
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1518 static PyObject *
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1519 BZ2File_iternext(BZ2FileObject *self)
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1520 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1521 PyStringObject* ret;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1522 ACQUIRE_LOCK(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1523 if (self->mode == MODE_CLOSED) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1524 RELEASE_LOCK(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1525 PyErr_SetString(PyExc_ValueError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1526 "I/O operation on closed file");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1527 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1528 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1529 ret = Util_ReadAheadGetLineSkip(self, 0, READAHEAD_BUFSIZE);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1530 RELEASE_LOCK(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1531 if (ret == NULL \|\| PyString_GET_SIZE(ret) == 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1532 Py_XDECREF(ret);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1533 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1534 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1535 return (PyObject *)ret;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1536 }
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1537
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1538 /* ===================================================================== */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1539 /* BZ2File_Type definition. */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1540
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1541 PyDoc_VAR(BZ2File__doc__) =
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1542 PyDoc_STR(
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1543 "BZ2File(name [, mode='r', buffering=0, compresslevel=9]) -> file object\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1544 \n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1545 Open a bz2 file. The mode can be 'r' or 'w', for reading (default) or\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1546 writing. When opened for writing, the file will be created if it doesn't\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1547 exist, and truncated otherwise. If the buffering argument is given, 0 means\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1548 unbuffered, and larger numbers specify the buffer size. If compresslevel\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1549 is given, must be a number between 1 and 9.\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1550 ")
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1551 PyDoc_STR(
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1552 "\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1553 Add a 'U' to mode to open the file for input with universal newline\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1554 support. Any line ending in the input file will be seen as a '\\n' in\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1555 Python. Also, a file so opened gains the attribute 'newlines'; the value\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1556 for this attribute is one of None (no newline read yet), '\\r', '\\n',\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1557 '\\r\\n' or a tuple containing all the newline types seen. Universal\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1558 newlines are available only when reading.\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1559 ")
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1560 ;
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1561
26113 9ffea50e8330 * Modules/bz2module.c Gustavo Niemeyer <gustavo@niemeyer.net> parents: 26045 diff changeset	1562 static PyTypeObject BZ2File_Type = {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1563 PyVarObject_HEAD_INIT(NULL, 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1564 "bz2.BZ2File", /tp_name/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1565 sizeof(BZ2FileObject), /tp_basicsize/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1566 0, /tp_itemsize/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1567 (destructor)BZ2File_dealloc, /tp_dealloc/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1568 0, /tp_print/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1569 0, /tp_getattr/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1570 0, /tp_setattr/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1571 0, /tp_compare/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1572 0, /tp_repr/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1573 0, /tp_as_number/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1574 0, /tp_as_sequence/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1575 0, /tp_as_mapping/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1576 0, /tp_hash/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1577 0, /tp_call/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1578 0, /tp_str/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1579 PyObject_GenericGetAttr,/tp_getattro/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1580 PyObject_GenericSetAttr,/tp_setattro/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1581 0, /tp_as_buffer/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1582 Py_TPFLAGS_DEFAULT\|Py_TPFLAGS_BASETYPE, /tp_flags/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1583 BZ2File__doc__, /tp_doc/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1584 0, /tp_traverse/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1585 0, /tp_clear/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1586 0, /tp_richcompare/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1587 0, /tp_weaklistoffset/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1588 (getiterfunc)BZ2File_getiter, /tp_iter/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1589 (iternextfunc)BZ2File_iternext, /tp_iternext/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1590 BZ2File_methods, /tp_methods/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1591 BZ2File_members, /tp_members/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1592 BZ2File_getset, /tp_getset/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1593 0, /tp_base/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1594 0, /tp_dict/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1595 0, /tp_descr_get/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1596 0, /tp_descr_set/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1597 0, /tp_dictoffset/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1598 (initproc)BZ2File_init, /tp_init/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1599 PyType_GenericAlloc, /tp_alloc/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1600 PyType_GenericNew, /tp_new/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1601 _PyObject_Del, /tp_free/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1602 0, /tp_is_gc/
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1603 };
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1604
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1605
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1606 /* ===================================================================== */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1607 /* Methods of BZ2Comp. */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1608
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1609 PyDoc_STRVAR(BZ2Comp_compress__doc__,
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1610 "compress(data) -> string\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1611 \n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1612 Provide more data to the compressor object. It will return chunks of\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1613 compressed data whenever possible. When you've finished providing data\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1614 to compress, call the flush() method to finish the compression process,\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1615 and return what is left in the internal buffers.\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1616 ");
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1617
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1618 static PyObject *
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1619 BZ2Comp_compress(BZ2CompObject self, PyObject args)
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1620 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1621 Py_buffer pdata;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1622 char *data;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1623 int datasize;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1624 int bufsize = SMALLCHUNK;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1625 PY_LONG_LONG totalout;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1626 PyObject *ret = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1627 bz_stream *bzs = &self->bzs;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1628 int bzerror;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1629
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1630 if (!PyArg_ParseTuple(args, "s*:compress", &pdata))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1631 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1632 data = pdata.buf;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1633 datasize = pdata.len;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1634
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1635 if (datasize == 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1636 PyBuffer_Release(&pdata);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1637 return PyString_FromString("");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1638 }
31524 3d927e1c78c8 - Fixed #853061: allow BZ2Compressor.compress() to receive an empty string Gustavo Niemeyer <gustavo@niemeyer.net> parents: 31471 diff changeset	1639
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1640 ACQUIRE_LOCK(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1641 if (!self->running) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1642 PyErr_SetString(PyExc_ValueError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1643 "this object was already flushed");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1644 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1645 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1646
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1647 ret = PyString_FromStringAndSize(NULL, bufsize);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1648 if (!ret)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1649 goto error;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1650
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1651 bzs->next_in = data;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1652 bzs->avail_in = datasize;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1653 bzs->next_out = BUF(ret);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1654 bzs->avail_out = bufsize;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1655
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1656 totalout = BZS_TOTAL_OUT(bzs);
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1657
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1658 for (;;) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1659 Py_BEGIN_ALLOW_THREADS
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1660 bzerror = BZ2_bzCompress(bzs, BZ_RUN);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1661 Py_END_ALLOW_THREADS
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1662 if (bzerror != BZ_RUN_OK) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1663 Util_CatchBZ2Error(bzerror);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1664 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1665 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1666 if (bzs->avail_in == 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1667 break; /* no more input data */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1668 if (bzs->avail_out == 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1669 bufsize = Util_NewBufferSize(bufsize);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1670 if (_PyString_Resize(&ret, bufsize) < 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1671 BZ2_bzCompressEnd(bzs);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1672 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1673 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1674 bzs->next_out = BUF(ret) + (BZS_TOTAL_OUT(bzs)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1675 - totalout);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1676 bzs->avail_out = bufsize - (bzs->next_out - BUF(ret));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1677 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1678 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1679
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1680 _PyString_Resize(&ret, (Py_ssize_t)(BZS_TOTAL_OUT(bzs) - totalout));
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1681
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1682 RELEASE_LOCK(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1683 PyBuffer_Release(&pdata);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1684 return ret;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1685
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1686 error:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1687 RELEASE_LOCK(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1688 PyBuffer_Release(&pdata);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1689 Py_XDECREF(ret);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1690 return NULL;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1691 }
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1692
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1693 PyDoc_STRVAR(BZ2Comp_flush__doc__,
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1694 "flush() -> string\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1695 \n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1696 Finish the compression process and return what is left in internal buffers.\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1697 You must not use the compressor object after calling this method.\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1698 ");
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1699
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1700 static PyObject *
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1701 BZ2Comp_flush(BZ2CompObject *self)
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1702 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1703 int bufsize = SMALLCHUNK;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1704 PyObject *ret = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1705 bz_stream *bzs = &self->bzs;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1706 PY_LONG_LONG totalout;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1707 int bzerror;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1708
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1709 ACQUIRE_LOCK(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1710 if (!self->running) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1711 PyErr_SetString(PyExc_ValueError, "object was already "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1712 "flushed");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1713 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1714 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1715 self->running = 0;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1716
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1717 ret = PyString_FromStringAndSize(NULL, bufsize);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1718 if (!ret)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1719 goto error;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1720
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1721 bzs->next_out = BUF(ret);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1722 bzs->avail_out = bufsize;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1723
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1724 totalout = BZS_TOTAL_OUT(bzs);
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1725
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1726 for (;;) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1727 Py_BEGIN_ALLOW_THREADS
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1728 bzerror = BZ2_bzCompress(bzs, BZ_FINISH);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1729 Py_END_ALLOW_THREADS
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1730 if (bzerror == BZ_STREAM_END) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1731 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1732 } else if (bzerror != BZ_FINISH_OK) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1733 Util_CatchBZ2Error(bzerror);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1734 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1735 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1736 if (bzs->avail_out == 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1737 bufsize = Util_NewBufferSize(bufsize);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1738 if (_PyString_Resize(&ret, bufsize) < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1739 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1740 bzs->next_out = BUF(ret);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1741 bzs->next_out = BUF(ret) + (BZS_TOTAL_OUT(bzs)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1742 - totalout);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1743 bzs->avail_out = bufsize - (bzs->next_out - BUF(ret));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1744 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1745 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1746
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1747 if (bzs->avail_out != 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1748 _PyString_Resize(&ret, (Py_ssize_t)(BZS_TOTAL_OUT(bzs) - totalout));
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1749
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1750 RELEASE_LOCK(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1751 return ret;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1752
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1753 error:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1754 RELEASE_LOCK(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1755 Py_XDECREF(ret);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1756 return NULL;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1757 }
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1758
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1759 static PyMethodDef BZ2Comp_methods[] = {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1760 {"compress", (PyCFunction)BZ2Comp_compress, METH_VARARGS,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1761 BZ2Comp_compress__doc__},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1762 {"flush", (PyCFunction)BZ2Comp_flush, METH_NOARGS,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1763 BZ2Comp_flush__doc__},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1764 {NULL, NULL} /* sentinel */
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1765 };
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1766
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1767
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1768 /* ===================================================================== */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1769 /* Slot definitions for BZ2Comp_Type. */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1770
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1771 static int
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1772 BZ2Comp_init(BZ2CompObject self, PyObject args, PyObject *kwargs)
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1773 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1774 int compresslevel = 9;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1775 int bzerror;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1776 static char *kwlist[] = {"compresslevel", 0};
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1777
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1778 if (!PyArg_ParseTupleAndKeywords(args, kwargs, "\|i:BZ2Compressor",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1779 kwlist, &compresslevel))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1780 return -1;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1781
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1782 if (compresslevel < 1 \|\| compresslevel > 9) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1783 PyErr_SetString(PyExc_ValueError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1784 "compresslevel must be between 1 and 9");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1785 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1786 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1787
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1788 #ifdef WITH_THREAD
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1789 self->lock = PyThread_allocate_lock();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1790 if (!self->lock) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1791 PyErr_SetString(PyExc_MemoryError, "unable to allocate lock");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1792 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1793 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1794 #endif
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1795
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1796 memset(&self->bzs, 0, sizeof(bz_stream));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1797 bzerror = BZ2_bzCompressInit(&self->bzs, compresslevel, 0, 0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1798 if (bzerror != BZ_OK) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1799 Util_CatchBZ2Error(bzerror);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1800 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1801 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1802
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1803 self->running = 1;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1804
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1805 return 0;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1806 error:
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1807 #ifdef WITH_THREAD
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1808 if (self->lock) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1809 PyThread_free_lock(self->lock);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1810 self->lock = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1811 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1812 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1813 return -1;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1814 }
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1815
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1816 static void
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1817 BZ2Comp_dealloc(BZ2CompObject *self)
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1818 {
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1819 #ifdef WITH_THREAD
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1820 if (self->lock)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1821 PyThread_free_lock(self->lock);
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1822 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1823 BZ2_bzCompressEnd(&self->bzs);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1824 Py_TYPE(self)->tp_free((PyObject *)self);
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1825 }
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1826
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1827
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1828 /* ===================================================================== */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1829 /* BZ2Comp_Type definition. */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1830
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1831 PyDoc_STRVAR(BZ2Comp__doc__,
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1832 "BZ2Compressor([compresslevel=9]) -> compressor object\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1833 \n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1834 Create a new compressor object. This object may be used to compress\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1835 data sequentially. If you want to compress data in one shot, use the\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1836 compress() function instead. The compresslevel parameter, if given,\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1837 must be a number between 1 and 9.\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1838 ");
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1839
26113 9ffea50e8330 * Modules/bz2module.c Gustavo Niemeyer <gustavo@niemeyer.net> parents: 26045 diff changeset	1840 static PyTypeObject BZ2Comp_Type = {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1841 PyVarObject_HEAD_INIT(NULL, 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1842 "bz2.BZ2Compressor", /tp_name/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1843 sizeof(BZ2CompObject), /tp_basicsize/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1844 0, /tp_itemsize/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1845 (destructor)BZ2Comp_dealloc, /tp_dealloc/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1846 0, /tp_print/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1847 0, /tp_getattr/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1848 0, /tp_setattr/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1849 0, /tp_compare/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1850 0, /tp_repr/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1851 0, /tp_as_number/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1852 0, /tp_as_sequence/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1853 0, /tp_as_mapping/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1854 0, /tp_hash/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1855 0, /tp_call/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1856 0, /tp_str/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1857 PyObject_GenericGetAttr,/tp_getattro/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1858 PyObject_GenericSetAttr,/tp_setattro/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1859 0, /tp_as_buffer/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1860 Py_TPFLAGS_DEFAULT\|Py_TPFLAGS_BASETYPE, /tp_flags/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1861 BZ2Comp__doc__, /tp_doc/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1862 0, /tp_traverse/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1863 0, /tp_clear/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1864 0, /tp_richcompare/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1865 0, /tp_weaklistoffset/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1866 0, /tp_iter/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1867 0, /tp_iternext/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1868 BZ2Comp_methods, /tp_methods/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1869 0, /tp_members/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1870 0, /tp_getset/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1871 0, /tp_base/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1872 0, /tp_dict/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1873 0, /tp_descr_get/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1874 0, /tp_descr_set/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1875 0, /tp_dictoffset/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1876 (initproc)BZ2Comp_init, /tp_init/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1877 PyType_GenericAlloc, /tp_alloc/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1878 PyType_GenericNew, /tp_new/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1879 _PyObject_Del, /tp_free/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1880 0, /tp_is_gc/
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1881 };
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1882
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1883
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1884 /* ===================================================================== */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1885 /* Members of BZ2Decomp. */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1886
27819 ee10d7e7f818 Unparenting BZ2File, as discussed in SF patch #661796. Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27104 diff changeset	1887 #undef OFF
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1888 #define OFF(x) offsetof(BZ2DecompObject, x)
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1889
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1890 static PyMemberDef BZ2Decomp_members[] = {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1891 {"unused_data", T_OBJECT, OFF(unused_data), RO},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1892 {NULL} /* Sentinel */
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1893 };
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1894
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1895
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1896 /* ===================================================================== */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1897 /* Methods of BZ2Decomp. */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1898
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1899 PyDoc_STRVAR(BZ2Decomp_decompress__doc__,
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1900 "decompress(data) -> string\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1901 \n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1902 Provide more data to the decompressor object. It will return chunks\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1903 of decompressed data whenever possible. If you try to decompress data\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1904 after the end of stream is found, EOFError will be raised. If any data\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1905 was found after the end of stream, it'll be ignored and saved in\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1906 unused_data attribute.\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1907 ");
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1908
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1909 static PyObject *
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1910 BZ2Decomp_decompress(BZ2DecompObject self, PyObject args)
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1911 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1912 Py_buffer pdata;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1913 char *data;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1914 int datasize;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1915 int bufsize = SMALLCHUNK;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1916 PY_LONG_LONG totalout;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1917 PyObject *ret = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1918 bz_stream *bzs = &self->bzs;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1919 int bzerror;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1920
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1921 if (!PyArg_ParseTuple(args, "s*:decompress", &pdata))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1922 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1923 data = pdata.buf;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1924 datasize = pdata.len;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1925
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1926 ACQUIRE_LOCK(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1927 if (!self->running) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1928 PyErr_SetString(PyExc_EOFError, "end of stream was "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1929 "already found");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1930 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1931 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1932
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1933 ret = PyString_FromStringAndSize(NULL, bufsize);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1934 if (!ret)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1935 goto error;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1936
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1937 bzs->next_in = data;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1938 bzs->avail_in = datasize;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1939 bzs->next_out = BUF(ret);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1940 bzs->avail_out = bufsize;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1941
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1942 totalout = BZS_TOTAL_OUT(bzs);
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1943
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1944 for (;;) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1945 Py_BEGIN_ALLOW_THREADS
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1946 bzerror = BZ2_bzDecompress(bzs);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1947 Py_END_ALLOW_THREADS
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1948 if (bzerror == BZ_STREAM_END) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1949 if (bzs->avail_in != 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1950 Py_DECREF(self->unused_data);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1951 self->unused_data =
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1952 PyString_FromStringAndSize(bzs->next_in,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1953 bzs->avail_in);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1954 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1955 self->running = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1956 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1957 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1958 if (bzerror != BZ_OK) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1959 Util_CatchBZ2Error(bzerror);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1960 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1961 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1962 if (bzs->avail_in == 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1963 break; /* no more input data */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1964 if (bzs->avail_out == 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1965 bufsize = Util_NewBufferSize(bufsize);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1966 if (_PyString_Resize(&ret, bufsize) < 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1967 BZ2_bzDecompressEnd(bzs);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1968 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1969 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1970 bzs->next_out = BUF(ret);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1971 bzs->next_out = BUF(ret) + (BZS_TOTAL_OUT(bzs)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1972 - totalout);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1973 bzs->avail_out = bufsize - (bzs->next_out - BUF(ret));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1974 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1975 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1976
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1977 if (bzs->avail_out != 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1978 _PyString_Resize(&ret, (Py_ssize_t)(BZS_TOTAL_OUT(bzs) - totalout));
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1979
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1980 RELEASE_LOCK(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1981 PyBuffer_Release(&pdata);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1982 return ret;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1983
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1984 error:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1985 RELEASE_LOCK(self);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1986 PyBuffer_Release(&pdata);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1987 Py_XDECREF(ret);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1988 return NULL;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1989 }
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1990
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1991 static PyMethodDef BZ2Decomp_methods[] = {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1992 {"decompress", (PyCFunction)BZ2Decomp_decompress, METH_VARARGS, BZ2Decomp_decompress__doc__},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	1993 {NULL, NULL} /* sentinel */
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1994 };
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1995
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1996
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1997 /* ===================================================================== */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1998 /* Slot definitions for BZ2Decomp_Type. */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	1999
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2000 static int
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2001 BZ2Decomp_init(BZ2DecompObject self, PyObject args, PyObject *kwargs)
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2002 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2003 int bzerror;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2004
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2005 if (!PyArg_ParseTuple(args, ":BZ2Decompressor"))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2006 return -1;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2007
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2008 #ifdef WITH_THREAD
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2009 self->lock = PyThread_allocate_lock();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2010 if (!self->lock) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2011 PyErr_SetString(PyExc_MemoryError, "unable to allocate lock");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2012 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2013 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2014 #endif
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2015
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2016 self->unused_data = PyString_FromString("");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2017 if (!self->unused_data)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2018 goto error;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2019
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2020 memset(&self->bzs, 0, sizeof(bz_stream));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2021 bzerror = BZ2_bzDecompressInit(&self->bzs, 0, 0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2022 if (bzerror != BZ_OK) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2023 Util_CatchBZ2Error(bzerror);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2024 goto error;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2025 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2026
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2027 self->running = 1;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2028
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2029 return 0;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2030
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2031 error:
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2032 #ifdef WITH_THREAD
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2033 if (self->lock) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2034 PyThread_free_lock(self->lock);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2035 self->lock = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2036 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2037 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2038 Py_CLEAR(self->unused_data);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2039 return -1;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2040 }
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2041
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2042 static void
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2043 BZ2Decomp_dealloc(BZ2DecompObject *self)
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2044 {
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2045 #ifdef WITH_THREAD
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2046 if (self->lock)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2047 PyThread_free_lock(self->lock);
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2048 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2049 Py_XDECREF(self->unused_data);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2050 BZ2_bzDecompressEnd(&self->bzs);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2051 Py_TYPE(self)->tp_free((PyObject *)self);
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2052 }
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2053
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2054
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2055 /* ===================================================================== */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2056 /* BZ2Decomp_Type definition. */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2057
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2058 PyDoc_STRVAR(BZ2Decomp__doc__,
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2059 "BZ2Decompressor() -> decompressor object\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2060 \n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2061 Create a new decompressor object. This object may be used to decompress\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2062 data sequentially. If you want to decompress data in one shot, use the\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2063 decompress() function instead.\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2064 ");
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2065
26113 9ffea50e8330 * Modules/bz2module.c Gustavo Niemeyer <gustavo@niemeyer.net> parents: 26045 diff changeset	2066 static PyTypeObject BZ2Decomp_Type = {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2067 PyVarObject_HEAD_INIT(NULL, 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2068 "bz2.BZ2Decompressor", /tp_name/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2069 sizeof(BZ2DecompObject), /tp_basicsize/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2070 0, /tp_itemsize/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2071 (destructor)BZ2Decomp_dealloc, /tp_dealloc/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2072 0, /tp_print/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2073 0, /tp_getattr/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2074 0, /tp_setattr/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2075 0, /tp_compare/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2076 0, /tp_repr/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2077 0, /tp_as_number/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2078 0, /tp_as_sequence/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2079 0, /tp_as_mapping/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2080 0, /tp_hash/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2081 0, /tp_call/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2082 0, /tp_str/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2083 PyObject_GenericGetAttr,/tp_getattro/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2084 PyObject_GenericSetAttr,/tp_setattro/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2085 0, /tp_as_buffer/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2086 Py_TPFLAGS_DEFAULT\|Py_TPFLAGS_BASETYPE, /tp_flags/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2087 BZ2Decomp__doc__, /tp_doc/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2088 0, /tp_traverse/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2089 0, /tp_clear/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2090 0, /tp_richcompare/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2091 0, /tp_weaklistoffset/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2092 0, /tp_iter/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2093 0, /tp_iternext/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2094 BZ2Decomp_methods, /tp_methods/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2095 BZ2Decomp_members, /tp_members/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2096 0, /tp_getset/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2097 0, /tp_base/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2098 0, /tp_dict/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2099 0, /tp_descr_get/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2100 0, /tp_descr_set/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2101 0, /tp_dictoffset/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2102 (initproc)BZ2Decomp_init, /tp_init/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2103 PyType_GenericAlloc, /tp_alloc/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2104 PyType_GenericNew, /tp_new/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2105 _PyObject_Del, /tp_free/
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2106 0, /tp_is_gc/
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2107 };
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2108
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2109
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2110 /* ===================================================================== */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2111 /* Module functions. */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2112
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2113 PyDoc_STRVAR(bz2_compress__doc__,
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2114 "compress(data [, compresslevel=9]) -> string\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2115 \n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2116 Compress data in one shot. If you want to compress data sequentially,\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2117 use an instance of BZ2Compressor instead. The compresslevel parameter, if\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2118 given, must be a number between 1 and 9.\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2119 ");
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2120
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2121 static PyObject *
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2122 bz2_compress(PyObject self, PyObject args, PyObject *kwargs)
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2123 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2124 int compresslevel=9;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2125 Py_buffer pdata;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2126 char *data;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2127 int datasize;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2128 int bufsize;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2129 PyObject *ret = NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2130 bz_stream _bzs;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2131 bz_stream *bzs = &_bzs;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2132 int bzerror;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2133 static char *kwlist[] = {"data", "compresslevel", 0};
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2134
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2135 if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s*\|i",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2136 kwlist, &pdata,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2137 &compresslevel))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2138 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2139 data = pdata.buf;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2140 datasize = pdata.len;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2141
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2142 if (compresslevel < 1 \|\| compresslevel > 9) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2143 PyErr_SetString(PyExc_ValueError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2144 "compresslevel must be between 1 and 9");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2145 PyBuffer_Release(&pdata);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2146 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2147 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2148
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2149 /* Conforming to bz2 manual, this is large enough to fit compressed
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2150 * data in one shot. We will check it later anyway. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2151 bufsize = datasize + (datasize/100+1) + 600;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2152
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2153 ret = PyString_FromStringAndSize(NULL, bufsize);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2154 if (!ret) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2155 PyBuffer_Release(&pdata);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2156 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2157 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2158
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2159 memset(bzs, 0, sizeof(bz_stream));
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2160
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2161 bzs->next_in = data;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2162 bzs->avail_in = datasize;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2163 bzs->next_out = BUF(ret);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2164 bzs->avail_out = bufsize;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2165
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2166 bzerror = BZ2_bzCompressInit(bzs, compresslevel, 0, 0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2167 if (bzerror != BZ_OK) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2168 Util_CatchBZ2Error(bzerror);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2169 PyBuffer_Release(&pdata);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2170 Py_DECREF(ret);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2171 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2172 }
26117 e9aebd4cf56c This couldn't compile on WIndows, due to hardcoded "long long". Repaired. Tim Peters <tim.peters@gmail.com> parents: 26113 diff changeset	2173
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2174 for (;;) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2175 Py_BEGIN_ALLOW_THREADS
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2176 bzerror = BZ2_bzCompress(bzs, BZ_FINISH);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2177 Py_END_ALLOW_THREADS
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2178 if (bzerror == BZ_STREAM_END) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2179 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2180 } else if (bzerror != BZ_FINISH_OK) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2181 BZ2_bzCompressEnd(bzs);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2182 Util_CatchBZ2Error(bzerror);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2183 PyBuffer_Release(&pdata);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2184 Py_DECREF(ret);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2185 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2186 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2187 if (bzs->avail_out == 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2188 bufsize = Util_NewBufferSize(bufsize);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2189 if (_PyString_Resize(&ret, bufsize) < 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2190 BZ2_bzCompressEnd(bzs);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2191 PyBuffer_Release(&pdata);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2192 Py_DECREF(ret);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2193 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2194 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2195 bzs->next_out = BUF(ret) + BZS_TOTAL_OUT(bzs);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2196 bzs->avail_out = bufsize - (bzs->next_out - BUF(ret));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2197 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2198 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2199
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2200 if (bzs->avail_out != 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2201 _PyString_Resize(&ret, (Py_ssize_t)BZS_TOTAL_OUT(bzs));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2202 BZ2_bzCompressEnd(bzs);
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2203
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2204 PyBuffer_Release(&pdata);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2205 return ret;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2206 }
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2207
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2208 PyDoc_STRVAR(bz2_decompress__doc__,
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2209 "decompress(data) -> decompressed data\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2210 \n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2211 Decompress data in one shot. If you want to decompress data sequentially,\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2212 use an instance of BZ2Decompressor instead.\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2213 ");
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2214
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2215 static PyObject *
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2216 bz2_decompress(PyObject self, PyObject args)
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2217 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2218 Py_buffer pdata;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2219 char *data;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2220 int datasize;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2221 int bufsize = SMALLCHUNK;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2222 PyObject *ret;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2223 bz_stream _bzs;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2224 bz_stream *bzs = &_bzs;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2225 int bzerror;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2226
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2227 if (!PyArg_ParseTuple(args, "s*:decompress", &pdata))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2228 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2229 data = pdata.buf;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2230 datasize = pdata.len;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2231
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2232 if (datasize == 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2233 PyBuffer_Release(&pdata);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2234 return PyString_FromString("");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2235 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2236
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2237 ret = PyString_FromStringAndSize(NULL, bufsize);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2238 if (!ret) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2239 PyBuffer_Release(&pdata);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2240 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2241 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2242
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2243 memset(bzs, 0, sizeof(bz_stream));
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2244
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2245 bzs->next_in = data;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2246 bzs->avail_in = datasize;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2247 bzs->next_out = BUF(ret);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2248 bzs->avail_out = bufsize;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2249
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2250 bzerror = BZ2_bzDecompressInit(bzs, 0, 0);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2251 if (bzerror != BZ_OK) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2252 Util_CatchBZ2Error(bzerror);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2253 Py_DECREF(ret);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2254 PyBuffer_Release(&pdata);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2255 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2256 }
26117 e9aebd4cf56c This couldn't compile on WIndows, due to hardcoded "long long". Repaired. Tim Peters <tim.peters@gmail.com> parents: 26113 diff changeset	2257
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2258 for (;;) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2259 Py_BEGIN_ALLOW_THREADS
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2260 bzerror = BZ2_bzDecompress(bzs);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2261 Py_END_ALLOW_THREADS
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2262 if (bzerror == BZ_STREAM_END) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2263 break;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2264 } else if (bzerror != BZ_OK) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2265 BZ2_bzDecompressEnd(bzs);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2266 Util_CatchBZ2Error(bzerror);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2267 PyBuffer_Release(&pdata);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2268 Py_DECREF(ret);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2269 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2270 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2271 if (bzs->avail_in == 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2272 BZ2_bzDecompressEnd(bzs);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2273 PyErr_SetString(PyExc_ValueError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2274 "couldn't find end of stream");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2275 PyBuffer_Release(&pdata);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2276 Py_DECREF(ret);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2277 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2278 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2279 if (bzs->avail_out == 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2280 bufsize = Util_NewBufferSize(bufsize);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2281 if (_PyString_Resize(&ret, bufsize) < 0) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2282 BZ2_bzDecompressEnd(bzs);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2283 PyBuffer_Release(&pdata);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2284 Py_DECREF(ret);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2285 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2286 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2287 bzs->next_out = BUF(ret) + BZS_TOTAL_OUT(bzs);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2288 bzs->avail_out = bufsize - (bzs->next_out - BUF(ret));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2289 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2290 }
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2291
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2292 if (bzs->avail_out != 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2293 _PyString_Resize(&ret, (Py_ssize_t)BZS_TOTAL_OUT(bzs));
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2294 BZ2_bzDecompressEnd(bzs);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2295 PyBuffer_Release(&pdata);
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2296
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2297 return ret;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2298 }
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2299
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2300 static PyMethodDef bz2_methods[] = {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2301 {"compress", (PyCFunction) bz2_compress, METH_VARARGS\|METH_KEYWORDS,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2302 bz2_compress__doc__},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2303 {"decompress", (PyCFunction) bz2_decompress, METH_VARARGS,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2304 bz2_decompress__doc__},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2305 {NULL, NULL} /* sentinel */
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2306 };
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2307
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2308 /* ===================================================================== */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2309 /* Initialization function. */
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2310
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2311 PyDoc_STRVAR(bz2__doc__,
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2312 "The python bz2 module provides a comprehensive interface for\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2313 the bz2 compression library. It implements a complete file\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2314 interface, one shot (de)compression functions, and types for\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2315 sequential (de)compression.\n\
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2316 ");
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2317
29726 85e52ec85629 Use appropriate macros not the deprecated DL_IMPORT/DL_EXPORT macros Neal Norwitz <nnorwitz@gmail.com> parents: 28949 diff changeset	2318 PyMODINIT_FUNC
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2319 initbz2(void)
521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2320 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2321 PyObject *m;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2322
64912 20f345fc0361 Merged revisions 84980 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 63458 diff changeset	2323 if (PyType_Ready(&BZ2File_Type) < 0)
20f345fc0361 Merged revisions 84980 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 63458 diff changeset	2324 return;
20f345fc0361 Merged revisions 84980 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 63458 diff changeset	2325 if (PyType_Ready(&BZ2Comp_Type) < 0)
20f345fc0361 Merged revisions 84980 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 63458 diff changeset	2326 return;
20f345fc0361 Merged revisions 84980 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 63458 diff changeset	2327 if (PyType_Ready(&BZ2Decomp_Type) < 0)
20f345fc0361 Merged revisions 84980 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 63458 diff changeset	2328 return;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2329
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2330 m = Py_InitModule3("bz2", bz2_methods, bz2__doc__);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2331 if (m == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2332 return;
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2333
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2334 PyModule_AddObject(m, "__author__", PyString_FromString(__author__));
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2335
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2336 Py_INCREF(&BZ2File_Type);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2337 PyModule_AddObject(m, "BZ2File", (PyObject *)&BZ2File_Type);
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2338
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2339 Py_INCREF(&BZ2Comp_Type);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2340 PyModule_AddObject(m, "BZ2Compressor", (PyObject *)&BZ2Comp_Type);
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2341
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2342 Py_INCREF(&BZ2Decomp_Type);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 56850 diff changeset	2343 PyModule_AddObject(m, "BZ2Decompressor", (PyObject *)&BZ2Decomp_Type);
26037 521e89c4ff44 Patch implementing bz2 module. Gustavo Niemeyer <gustavo@niemeyer.net> parents: diff changeset	2344 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/bz2module.c @ 65035:87f4b32905df 2.7