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

annotate Modules/bz2module.c @ 58925:eecf1bef052d 2.6

Merged revisions 78207 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78207 | ezio.melotti | 2010-02-17 01:26:09 +0200 (Wed, 17 Feb 2010) | 1 line #7930: fix stripid ........

author	Ezio Melotti <ezio.melotti@gmail.com>
date	Tue, 16 Feb 2010 23:29:44 +0000
parents	25bc3d69e8af
children	e38335d4df91

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

Mercurial > cpython-lru_cache-weakref

annotate Modules/bz2module.c @ 58925:eecf1bef052d 2.6