Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
nexedi
cython
Commits
9f49a988
Commit
9f49a988
authored
Aug 23, 2011
by
Stefan Behnel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adapted __Pyx_PyObject_AsPy_UCS4() to PEP 393
parent
74a080f4
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
2 deletions
+11
-2
Cython/Compiler/PyrexTypes.py
Cython/Compiler/PyrexTypes.py
+11
-2
No files found.
Cython/Compiler/PyrexTypes.py
View file @
9f49a988
...
@@ -992,7 +992,15 @@ impl='''
...
@@ -992,7 +992,15 @@ impl='''
static CYTHON_INLINE Py_UCS4 __Pyx_PyObject_AsPy_UCS4(PyObject* x) {
static CYTHON_INLINE Py_UCS4 __Pyx_PyObject_AsPy_UCS4(PyObject* x) {
long ival;
long ival;
if (PyUnicode_Check(x)) {
if (PyUnicode_Check(x)) {
if (likely(PyUnicode_GET_SIZE(x) == 1)) {
Py_ssize_t length;
#ifdef CYTHON_PEP393_ENABLED
length = PyUnicode_GET_LENGTH(x);
if (likely(length == 1)) {
return PyUnicode_READ_CHAR(x, 0);
}
#else
length = PyUnicode_GET_SIZE(x);
if (likely(length == 1)) {
return PyUnicode_AS_UNICODE(x)[0];
return PyUnicode_AS_UNICODE(x)[0];
}
}
#if Py_UNICODE_SIZE == 2
#if Py_UNICODE_SIZE == 2
...
@@ -1006,9 +1014,10 @@ static CYTHON_INLINE Py_UCS4 __Pyx_PyObject_AsPy_UCS4(PyObject* x) {
...
@@ -1006,9 +1014,10 @@ static CYTHON_INLINE Py_UCS4 __Pyx_PyObject_AsPy_UCS4(PyObject* x) {
}
}
}
}
#endif
#endif
#endif
PyErr_Format(PyExc_ValueError,
PyErr_Format(PyExc_ValueError,
"only single character unicode strings can be converted to Py_UCS4, "
"only single character unicode strings can be converted to Py_UCS4, "
"got length %"PY_FORMAT_SIZE_T"d",
PyUnicode_GET_SIZE(x)
);
"got length %"PY_FORMAT_SIZE_T"d",
length
);
return (Py_UCS4)-1;
return (Py_UCS4)-1;
}
}
ival = __Pyx_PyInt_AsLong(x);
ival = __Pyx_PyInt_AsLong(x);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment