[GH-37] Basic support for module 'bz2'.

PullRequest: graalpython/365

Author: fangerer

graalpython/com.oracle.graal.python.cext/modules/_bz2.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2018, Oracle and/or its affiliates.
+/* Copyright (c) 2018, 2019, Oracle and/or its affiliates.
  * Copyright (C) 1996-2017 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -689,7 +689,7 @@ mbuf_add_view(_PyManagedBufferObject *mbuf, const Py_buffer *src)
     Py_INCREF(mbuf);
     mbuf->exports++;
 
-    return (PyObject *)mv;
+    return (PyObject *)polyglot_from_PyMemoryViewObject(mv);
 }
 
 /* Register an incomplete view: shape, strides, suboffsets and flags still
@@ -720,7 +720,7 @@ mbuf_add_incomplete_view(_PyManagedBufferObject *mbuf, const Py_buffer *src,
     Py_INCREF(mbuf);
     mbuf->exports++;
 
-    return (PyObject *)mv;
+    return (PyObject *)polyglot_from_PyMemoryViewObject(mv);
 }
 
 /* Expose a raw memory area as a view of contiguous bytes. flags can be
@@ -941,7 +941,7 @@ PyMemoryView_GetContiguous(PyObject *obj, int buffertype, char order)
     }
 
     if (PyBuffer_IsContiguous(view, order))
-        return (PyObject *)mv;
+    	return (PyObject *)polyglot_from_PyMemoryViewObject(mv);
 
     if (buffertype == PyBUF_WRITE) {
         PyErr_SetString(PyExc_BufferError,
@@ -1403,7 +1403,7 @@ memory_cast(PyMemoryViewObject *self, PyObject *args, PyObject *kwds)
     if (shape && cast_to_ND(mv, shape, (int)ndim) < 0)
         goto error;
 
-    return (PyObject *)mv;
+  	return (PyObject *)polyglot_from_PyMemoryViewObject(mv);
 
 error:
     Py_DECREF(mv);

graalpython/com.oracle.graal.python.cext/modules/_memoryview.c

@@ -0,0 +1,182 @@
+/* Copyright (c) 2019, Oracle and/or its affiliates.
+ * Copyright (C) 1996-2017 Python Software Foundation
+ *
+ * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+ */
+/*[clinic input]
+preserve
+[clinic start generated code]*/
+
+PyDoc_STRVAR(_bz2_BZ2Compressor_compress__doc__,
+"compress($self, data, /)\n"
+"--\n"
+"\n"
+"Provide data to the compressor object.\n"
+"\n"
+"Returns a chunk of compressed data if possible, or b\'\' otherwise.\n"
+"\n"
+"When you have finished providing data to the compressor, call the\n"
+"flush() method to finish the compression process.");
+
+#define _BZ2_BZ2COMPRESSOR_COMPRESS_METHODDEF    \
+    {"compress", (PyCFunction)_bz2_BZ2Compressor_compress, METH_O, _bz2_BZ2Compressor_compress__doc__},
+
+static PyObject *
+_bz2_BZ2Compressor_compress_impl(BZ2Compressor *self, Py_buffer *data);
+
+static PyObject *
+_bz2_BZ2Compressor_compress(BZ2Compressor *self, PyObject *arg)
+{
+    PyObject *return_value = NULL;
+    Py_buffer data = {NULL, NULL};
+
+    if (!PyArg_Parse(arg, "y*:compress", &data)) {
+        goto exit;
+    }
+    return_value = _bz2_BZ2Compressor_compress_impl(self, &data);
+
+exit:
+    /* Cleanup for data */
+    if (data.obj) {
+       PyBuffer_Release(&data);
+    }
+
+    return return_value;
+}
+
+PyDoc_STRVAR(_bz2_BZ2Compressor_flush__doc__,
+"flush($self, /)\n"
+"--\n"
+"\n"
+"Finish the compression process.\n"
+"\n"
+"Returns the compressed data left in internal buffers.\n"
+"\n"
+"The compressor object may not be used after this method is called.");
+
+#define _BZ2_BZ2COMPRESSOR_FLUSH_METHODDEF    \
+    {"flush", (PyCFunction)_bz2_BZ2Compressor_flush, METH_NOARGS, _bz2_BZ2Compressor_flush__doc__},
+
+static PyObject *
+_bz2_BZ2Compressor_flush_impl(BZ2Compressor *self);
+
+static PyObject *
+_bz2_BZ2Compressor_flush(BZ2Compressor *self, PyObject *Py_UNUSED(ignored))
+{
+    return _bz2_BZ2Compressor_flush_impl(self);
+}
+
+PyDoc_STRVAR(_bz2_BZ2Compressor___init____doc__,
+"BZ2Compressor(compresslevel=9, /)\n"
+"--\n"
+"\n"
+"Create a compressor object for compressing data incrementally.\n"
+"\n"
+"  compresslevel\n"
+"    Compression level, as a number between 1 and 9.\n"
+"\n"
+"For one-shot compression, use the compress() function instead.");
+
+static int
+_bz2_BZ2Compressor___init___impl(BZ2Compressor *self, int compresslevel);
+
+static int
+_bz2_BZ2Compressor___init__(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+    int return_value = -1;
+    int compresslevel = 9;
+
+    if ((Py_TYPE(self) == &BZ2Compressor_Type) &&
+        !_PyArg_NoKeywords("BZ2Compressor", kwargs)) {
+        goto exit;
+    }
+    if (!PyArg_ParseTuple(args, "|i:BZ2Compressor",
+        &compresslevel)) {
+        goto exit;
+    }
+    return_value = _bz2_BZ2Compressor___init___impl((BZ2Compressor *)self, compresslevel);
+
+exit:
+    return return_value;
+}
+
+PyDoc_STRVAR(_bz2_BZ2Decompressor_decompress__doc__,
+"decompress($self, /, data, max_length=-1)\n"
+"--\n"
+"\n"
+"Decompress *data*, returning uncompressed data as bytes.\n"
+"\n"
+"If *max_length* is nonnegative, returns at most *max_length* bytes of\n"
+"decompressed data. If this limit is reached and further output can be\n"
+"produced, *self.needs_input* will be set to ``False``. In this case, the next\n"
+"call to *decompress()* may provide *data* as b\'\' to obtain more of the output.\n"
+"\n"
+"If all of the input data was decompressed and returned (either because this\n"
+"was less than *max_length* bytes, or because *max_length* was negative),\n"
+"*self.needs_input* will be set to True.\n"
+"\n"
+"Attempting to decompress data after the end of stream is reached raises an\n"
+"EOFError.  Any data found after the end of the stream is ignored and saved in\n"
+"the unused_data attribute.");
+
+#define _BZ2_BZ2DECOMPRESSOR_DECOMPRESS_METHODDEF    \
+    {"decompress", (PyCFunction)_bz2_BZ2Decompressor_decompress, METH_FASTCALL, _bz2_BZ2Decompressor_decompress__doc__},
+
+static PyObject *
+_bz2_BZ2Decompressor_decompress_impl(BZ2Decompressor *self, Py_buffer *data,
+                                     Py_ssize_t max_length);
+
+static PyObject *
+_bz2_BZ2Decompressor_decompress(BZ2Decompressor *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames)
+{
+    PyObject *return_value = NULL;
+    static const char * const _keywords[] = {"data", "max_length", NULL};
+    static _PyArg_Parser _parser = {"y*|n:decompress", _keywords, 0};
+    Py_buffer data = {NULL, NULL};
+    Py_ssize_t max_length = -1;
+
+    if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser,
+        &data, &max_length)) {
+        goto exit;
+    }
+    return_value = _bz2_BZ2Decompressor_decompress_impl(self, &data, max_length);
+
+exit:
+    /* Cleanup for data */
+    if (data.obj) {
+       PyBuffer_Release(&data);
+    }
+
+    return return_value;
+}
+
+PyDoc_STRVAR(_bz2_BZ2Decompressor___init____doc__,
+"BZ2Decompressor()\n"
+"--\n"
+"\n"
+"Create a decompressor object for decompressing data incrementally.\n"
+"\n"
+"For one-shot decompression, use the decompress() function instead.");
+
+static int
+_bz2_BZ2Decompressor___init___impl(BZ2Decompressor *self);
+
+static int
+_bz2_BZ2Decompressor___init__(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+    int return_value = -1;
+
+    if ((Py_TYPE(self) == &BZ2Decompressor_Type) &&
+        !_PyArg_NoPositional("BZ2Decompressor", args)) {
+        goto exit;
+    }
+    if ((Py_TYPE(self) == &BZ2Decompressor_Type) &&
+        !_PyArg_NoKeywords("BZ2Decompressor", kwargs)) {
+        goto exit;
+    }
+    return_value = _bz2_BZ2Decompressor___init___impl((BZ2Decompressor *)self);
+
+exit:
+    return return_value;
+}
+/*[clinic end generated code: output=7e57af0b368d3e55 input=a9049054013a1b77]*/

graalpython/com.oracle.graal.python.cext/modules/clinic/_bz2module.c.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -280,3 +280,8 @@ UPCALL_ID(PyBytes_Join);
 PyObject *_PyBytes_Join(PyObject *sep, PyObject *x) {
     return UPCALL_CEXT_O(_jls_PyBytes_Join, native_to_java(sep), native_to_java(x));
 }
+
+UPCALL_ID(_PyBytes_Resize);
+int _PyBytes_Resize(PyObject **pv, Py_ssize_t newsize) {
+    return UPCALL_CEXT_I(_jls__PyBytes_Resize, native_to_java(*pv), newsize);
+}

graalpython/com.oracle.graal.python.cext/src/bytesobject.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -61,3 +61,13 @@ UPCALL_ID(PyThread_allocate_lock);
 void* PyThread_allocate_lock() {
     return UPCALL_CEXT_O(_jls_PyThread_allocate_lock);
 }
+
+UPCALL_ID(PyThread_acquire_lock);
+int PyThread_acquire_lock(PyThread_type_lock aLock, int waitflag) {
+    return UPCALL_CEXT_O(_jls_PyThread_acquire_lock, native_to_java(aLock), waitflag ? -1 : 0);
+}
+
+UPCALL_ID(PyThread_release_lock);
+void PyThread_release_lock(PyThread_type_lock aLock) {
+    UPCALL_CEXT_O(_jls_PyThread_release_lock, native_to_java(aLock));
+}

graalpython/com.oracle.graal.python.cext/src/ceval.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -83,6 +83,7 @@ PyObject * PyExc_NotImplementedError = NULL;
 PyObject * PyExc_RecursionError = NULL;
 PyObject * PyExc_UnicodeEncodeError = NULL;
 PyObject * PyExc_GeneratorExit = NULL;
+PyObject * PyExc_EOFError = NULL;
 
 void initialize_exceptions() {
     PyExc_AttributeError = PY_EXCEPTION("AttributeError");
@@ -122,6 +123,7 @@ void initialize_exceptions() {
     PyExc_NotImplementedError = PY_EXCEPTION("NotImplementedError");
     PyExc_UnicodeEncodeError = PY_EXCEPTION("UnicodeEncodeError");
     PyExc_GeneratorExit = PY_EXCEPTION("GeneratorExit");
+    PyExc_EOFError = PY_EXCEPTION("EOFError");
 }
 
 

graalpython/com.oracle.graal.python.cext/src/exceptions.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -42,6 +42,19 @@
 
 #include <stdio.h>
 
+static int getbuffer(PyObject *arg, Py_buffer *view, const char **errmsg) {
+    if (PyObject_GetBuffer(arg, view, PyBUF_SIMPLE) != 0) {
+        *errmsg = "bytes-like object";
+        return -1;
+    }
+//    if (!PyBuffer_IsContiguous(view, 'C')) {
+//        PyBuffer_Release(view);
+//        *errmsg = "contiguous buffer";
+//        return -1;
+//    }
+    return 0;
+}
+
 typedef struct _positional_argstack {
     PyObject* argv;
     int argnum;
@@ -89,10 +102,15 @@ UPCALL_ID(__bool__);
         case 'y': \
             arg = PyTruffle_GetArg(v, kwds, kwdnames, rest_keywords_only); \
             if (format[format_idx + 1] == '*') { \
+                Py_buffer* p = (Py_buffer*)PyTruffle_ArgN(output_idx); \
+                const char* buf; \
                 format_idx++; /* skip over '*' */ \
-                PyErr_Format(PyExc_TypeError, "%c* not supported", c); \
-                __return_code__; \
-                return 0; \
+            	if (getbuffer(arg, p, &buf) < 0) { \
+            		PyErr_Format(PyExc_TypeError, "expected bytes, got %R", Py_TYPE(arg)); \
+            		__return_code__; \
+            		return 0; \
+            	} \
+                PyTruffle_WriteOut(output_idx, Py_buffer, *p); \
             } else if (arg == Py_None) { \
                 if (c == 'z') { \
                     PyTruffle_WriteOut(output_idx, const char*, NULL); \
@@ -842,3 +860,36 @@ int PyArg_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssize
 #define PyArg_UnpackTuple _backup_PyArg_UnpackTuple
 #undef _backup_PyArg_UnpackTuple
 #endif
+
+// taken from CPython 3.6.5 "Python/getargs.c"
+int _PyArg_NoKeywords(const char *funcname, PyObject *kw) {
+    if (kw == NULL)
+        return 1;
+    if (!PyDict_CheckExact(kw)) {
+        PyErr_BadInternalCall();
+        return 0;
+    }
+    if (PyDict_Size(kw) == 0)
+        return 1;
+
+    PyErr_Format(PyExc_TypeError, "%s does not take keyword arguments",
+                    funcname);
+    return 0;
+}
+
+int
+_PyArg_NoPositional(const char *funcname, PyObject *args)
+{
+    if (args == NULL)
+        return 1;
+    if (!PyTuple_CheckExact(args)) {
+        PyErr_BadInternalCall();
+        return 0;
+    }
+    if (PyTuple_GET_SIZE(args) == 0)
+        return 1;
+
+    PyErr_Format(PyExc_TypeError, "%s does not take positional arguments",
+                    funcname);
+    return 0;
+}