Skip to content

Commit cc8dc58

Browse files
committed
Implement C API function _PyNamespace_New
1 parent cc3207e commit cc8dc58

File tree

5 files changed

+88
-0
lines changed

5 files changed

+88
-0
lines changed

graalpython/com.oracle.graal.python.cext/include/Python.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
#include "modsupport.h"
8181
#include "tupleobject.h"
8282
#include "structseq.h"
83+
#include "namespaceobject.h"
8384
#include "structmember.h"
8485
#include "pytime.h"
8586
#include "pymem.h"
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/* Copyright (c) 2020, Oracle and/or its affiliates.
2+
* Copyright (C) 1996-2020 Python Software Foundation
3+
*
4+
* Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
5+
*/
6+
7+
/* simple namespace object interface */
8+
9+
#ifndef NAMESPACEOBJECT_H
10+
#define NAMESPACEOBJECT_H
11+
#ifdef __cplusplus
12+
extern "C" {
13+
#endif
14+
15+
#ifndef Py_LIMITED_API
16+
PyAPI_DATA(PyTypeObject) _PyNamespace_Type;
17+
18+
PyAPI_FUNC(PyObject *) _PyNamespace_New(PyObject *kwds);
19+
#endif /* !Py_LIMITED_API */
20+
21+
#ifdef __cplusplus
22+
}
23+
#endif
24+
#endif /* !NAMESPACEOBJECT_H */
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
/*
2+
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* The Universal Permissive License (UPL), Version 1.0
6+
*
7+
* Subject to the condition set forth below, permission is hereby granted to any
8+
* person obtaining a copy of this software, associated documentation and/or
9+
* data (collectively the "Software"), free of charge and under any and all
10+
* copyright rights in the Software, and any and all patent rights owned or
11+
* freely licensable by each licensor hereunder covering either (i) the
12+
* unmodified Software as contributed to or provided by such licensor, or (ii)
13+
* the Larger Works (as defined below), to deal in both
14+
*
15+
* (a) the Software, and
16+
*
17+
* (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
18+
* one is included with the Software each a "Larger Work" to which the Software
19+
* is contributed by such licensors),
20+
*
21+
* without restriction, including without limitation the rights to copy, create
22+
* derivative works of, display, perform, and distribute the Software and make,
23+
* use, sell, offer for sale, import, export, have made, and have sold the
24+
* Software and the Larger Work(s), and to sublicense the foregoing rights on
25+
* either these or other terms.
26+
*
27+
* This license is subject to the following condition:
28+
*
29+
* The above copyright notice and either this complete permission notice or at a
30+
* minimum a reference to the UPL must be included in all copies or substantial
31+
* portions of the Software.
32+
*
33+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
34+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
35+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
36+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
37+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
38+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
39+
* SOFTWARE.
40+
*/
41+
#include "capi.h"
42+
43+
typedef struct {
44+
PyObject_HEAD
45+
PyObject *ns_dict;
46+
} _PyNamespaceObject;
47+
48+
PyTypeObject _PyNamespace_Type = PY_TRUFFLE_TYPE("SimpleNamespace", &PyType_Type, Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_BASETYPE, sizeof(_PyNamespaceObject));
49+
50+
UPCALL_ID(_PyNamespace_New);
51+
PyObject *
52+
_PyNamespace_New(PyObject *kwds) {
53+
return UPCALL_CEXT_O(_jls__PyNamespace_New, native_to_java(kwds));
54+
}

graalpython/lib-graalpython/python_cext.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1582,3 +1582,11 @@ def PyEval_GetBuiltins():
15821582

15831583
def sequence_clear():
15841584
return 0
1585+
1586+
namespace_type = None
1587+
@may_raise
1588+
def _PyNamespace_New(kwds):
1589+
global namespace_type
1590+
if not namespace_type:
1591+
from types import SimpleNamespace as namespace_type
1592+
return namespace_type(**kwds)

mx.graalpython/copyrights/overrides

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ graalpython/com.oracle.graal.python.cext/include/memoryobject.h,python.copyright
117117
graalpython/com.oracle.graal.python.cext/include/methodobject.h,python.copyright
118118
graalpython/com.oracle.graal.python.cext/include/modsupport.h,python.copyright
119119
graalpython/com.oracle.graal.python.cext/include/moduleobject.h,python.copyright
120+
graalpython/com.oracle.graal.python.cext/include/namespaceobject.h,python.copyright
120121
graalpython/com.oracle.graal.python.cext/include/object.h,python.copyright
121122
graalpython/com.oracle.graal.python.cext/include/objimpl.h,python.copyright
122123
graalpython/com.oracle.graal.python.cext/include/patchlevel.h,python.copyright

0 commit comments

Comments
 (0)