Staging
v0.5.1
https://github.com/python/cpython
Revision ab7c1b3f1137f7479aa3c1aee82a353ee214cfe5 authored by Éric Araujo on 31 July 2011, 02:06:12 UTC, committed by Éric Araujo on 31 July 2011, 02:06:12 UTC
The changed behavior of sdist in 3.1 broke packaging for projects that
wanted to use a manually-maintained MANIFEST file (instead of having a
MANIFEST.in template and letting distutils generate the MANIFEST).

The fixes that were committed for #8688 (76643c286b9f by Tarek and
d54da9248ed9 by me) did not fix all issues exposed in the bug report,
and also added one problem: the MANIFEST file format gained comments,
but the read_manifest method was not updated to handle (i.e. ignore)
them.  This changeset should fix everything; the tests have been
expanded and I successfully tested the 2.7 version with Mercurial, which
suffered from this regression.

I have grouped the versionchanged directives for these bugs in one place
and added micro version numbers to help users know the quirks of the
exact version they’re using.

Initial report, thorough diagnosis and patch by John Dennis, further
work on the patch by Stephen Thorne, and a few edits and additions by
me.
1 parent a3e072b
Raw File
Tip revision: ab7c1b3f1137f7479aa3c1aee82a353ee214cfe5 authored by Éric Araujo on 31 July 2011, 02:06:12 UTC
Fix regression with distutils MANIFEST handing (#11104, #8688).
Tip revision: ab7c1b3
_gestalt.c
/***********************************************************
Copyright 1991-1997 by Stichting Mathematisch Centrum, Amsterdam,
The Netherlands.

                        All Rights Reserved

Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
both that copyright notice and this permission notice appear in
supporting documentation, and that the names of Stichting Mathematisch
Centrum or CWI not be used in advertising or publicity pertaining to
distribution of the software without specific, written prior permission.

STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

******************************************************************/

/* Macintosh Gestalt interface */

#include "Python.h"

#include <Carbon/Carbon.h>

/* Convert a 4-char string object argument to an OSType value */
static int
convert_to_OSType(PyObject *v, OSType *pr)
{
    uint32_t tmp;
    if (!PyUnicode_Check(v) || PyUnicode_GetSize(v) != 4) {
    PyErr_SetString(PyExc_TypeError,
                    "OSType arg must be string of 4 chars");
    return 0;
    }
    memcpy((char *)&tmp, _PyUnicode_AsString(v), 4);
    *pr = (OSType)ntohl(tmp);
    return 1;
}

static PyObject *
gestalt_gestalt(PyObject *self, PyObject *args)
{
    OSErr iErr;
    OSType selector;
    SInt32 response;
    if (!PyArg_ParseTuple(args, "O&", convert_to_OSType, &selector))
        return NULL;
    iErr = Gestalt(selector, &response);
    if (iErr != 0) {
    PyErr_SetString(PyExc_OSError,
                    "non-zero exit code!");
    return NULL;
    }
    return PyLong_FromLong(response);
}

static struct PyMethodDef gestalt_methods[] = {
    {"gestalt", gestalt_gestalt, METH_VARARGS},
    {NULL, NULL} /* Sentinel */
};

static struct PyModuleDef gestaltmodule = {
    PyModuleDef_HEAD_INIT,
    "_gestalt",
    NULL,
    -1,
    gestalt_methods,
    NULL,
    NULL,
    NULL,
    NULL
};

PyMODINIT_FUNC
PyInit__gestalt(void)
{
    return PyModule_Create(&gestaltmodule);
}
back to top