Hello community,
here is the log from the commit of package python-ruamel.yaml.clib for
openSUSE:Factory checked in at 2019-10-05 16:19:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-ruamel.yaml.clib (Old)
and /work/SRC/openSUSE:Factory/.python-ruamel.yaml.clib.new.2352 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-ruamel.yaml.clib"
Sat Oct 5 16:19:27 2019 rev:3 rq:734573 version:0.2.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-ruamel.yaml.clib/python-ruamel.yaml.clib.changes
2019-08-27 10:10:10.863984346 +0200
+++
/work/SRC/openSUSE:Factory/.python-ruamel.yaml.clib.new.2352/python-ruamel.yaml.clib.changes
2019-10-05 16:19:28.285567494 +0200
@@ -1,0 +2,7 @@
+Tue Oct 1 15:27:58 UTC 2019 - Marketa Calabkova <[email protected]>
+
+- Update to 2.0.0
+ * Use size_t for marks in cython to handle large files.
+ * update .c to incorporate size_t change for marks
+
+-------------------------------------------------------------------
Old:
----
ruamel.yaml.clib-0.1.2.tar.gz
New:
----
ruamel.yaml.clib-0.2.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-ruamel.yaml.clib.spec ++++++
--- /var/tmp/diff_new_pack.sJis6Q/_old 2019-10-05 16:19:30.237562411 +0200
+++ /var/tmp/diff_new_pack.sJis6Q/_new 2019-10-05 16:19:30.249562379 +0200
@@ -18,7 +18,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-ruamel.yaml.clib
-Version: 0.1.2
+Version: 0.2.0
Release: 0
Summary: Python YAML parser c-library
License: MIT
@@ -26,7 +26,7 @@
URL: https://bitbucket.org/ruamel/yaml.clib
Source:
https://files.pythonhosted.org/packages/source/r/ruamel.yaml.clib/ruamel.yaml.clib-%{version}.tar.gz
BuildRequires: %{python_module devel}
-BuildRequires: %{python_module setuptools}
+BuildRequires: %{python_module setuptools >= 28.7.0}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
%python_subpackages
++++++ ruamel.yaml.clib-0.1.2.tar.gz -> ruamel.yaml.clib-0.2.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ruamel.yaml.clib-0.1.2/PKG-INFO
new/ruamel.yaml.clib-0.2.0/PKG-INFO
--- old/ruamel.yaml.clib-0.1.2/PKG-INFO 2019-08-07 22:01:59.000000000 +0200
+++ new/ruamel.yaml.clib-0.2.0/PKG-INFO 2019-09-27 08:04:09.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: ruamel.yaml.clib
-Version: 0.1.2
+Version: 0.2.0
Summary: C version of reader, parser and emitter for ruamel.yaml derived from
libyaml
Home-page: https://bitbucket.org/ruamel/yaml.clib
Author: Anthon van der Neut
@@ -12,8 +12,8 @@
``ruamel.yaml.clib`` is the C based reader/scanner and emitter for
ruamel.yaml
- :version: 0.1.0
- :updated: 2019-07-25
+ :version: 0.2.0
+ :updated: 2019-09-26
:documentation: http://yaml.readthedocs.io
:repository: https://bitbucket.org/ruamel/yaml.clib
:pypi: https://pypi.org/project/ruamel.yaml.clib/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ruamel.yaml.clib-0.1.2/README.rst
new/ruamel.yaml.clib-0.2.0/README.rst
--- old/ruamel.yaml.clib-0.1.2/README.rst 2019-07-25 11:52:21.000000000
+0200
+++ new/ruamel.yaml.clib-0.2.0/README.rst 2019-09-27 07:37:30.000000000
+0200
@@ -4,8 +4,8 @@
``ruamel.yaml.clib`` is the C based reader/scanner and emitter for ruamel.yaml
-:version: 0.1.0
-:updated: 2019-07-25
+:version: 0.2.0
+:updated: 2019-09-26
:documentation: http://yaml.readthedocs.io
:repository: https://bitbucket.org/ruamel/yaml.clib
:pypi: https://pypi.org/project/ruamel.yaml.clib/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ruamel.yaml.clib-0.1.2/__init__.py
new/ruamel.yaml.clib-0.2.0/__init__.py
--- old/ruamel.yaml.clib-0.1.2/__init__.py 2019-08-07 22:01:46.000000000
+0200
+++ new/ruamel.yaml.clib-0.2.0/__init__.py 2019-09-27 08:03:56.000000000
+0200
@@ -7,8 +7,8 @@
_package_data = dict(
full_package_name='ruamel.yaml.clib',
- version_info=(0, 1, 2),
- __version__='0.1.2',
+ version_info=(0, 2, 0),
+ __version__='0.2.0',
author='Anthon van der Neut',
author_email='[email protected]',
description='C version of reader, parser and emitter for ruamel.yaml
derived from libyaml',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ruamel.yaml.clib-0.1.2/_ruamel_yaml.c
new/ruamel.yaml.clib-0.2.0/_ruamel_yaml.c
--- old/ruamel.yaml.clib-0.1.2/_ruamel_yaml.c 2019-07-24 12:51:12.000000000
+0200
+++ new/ruamel.yaml.clib-0.2.0/_ruamel_yaml.c 2019-09-27 07:33:39.000000000
+0200
@@ -816,14 +816,14 @@
*
* cdef class Mark: # <<<<<<<<<<<<<<
* cdef readonly object name
- * cdef readonly int index
+ * cdef readonly size_t index
*/
struct __pyx_obj_12_ruamel_yaml_Mark {
PyObject_HEAD
PyObject *name;
- int index;
- int line;
- int column;
+ size_t index;
+ size_t line;
+ size_t column;
PyObject *buffer;
PyObject *pointer;
};
@@ -1341,11 +1341,14 @@
static CYTHON_INLINE PyObject* __Pyx_PyInt_From_long(long value);
/* CIntFromPy.proto */
-static CYTHON_INLINE int __Pyx_PyInt_As_int(PyObject *);
+static CYTHON_INLINE size_t __Pyx_PyInt_As_size_t(PyObject *);
/* CIntFromPy.proto */
static CYTHON_INLINE long __Pyx_PyInt_As_long(PyObject *);
+/* CIntFromPy.proto */
+static CYTHON_INLINE int __Pyx_PyInt_As_int(PyObject *);
+
/* FastTypeChecks.proto */
#if CYTHON_COMPILING_IN_CPYTHON
#define __Pyx_TypeCheck(obj, type) __Pyx_IsSubtype(Py_TYPE(obj), (PyTypeObject
*)type)
@@ -1765,7 +1768,7 @@
static PyObject *__pyx_n_s_write;
static PyObject *__pyx_pf_12_ruamel_yaml_get_version_string(CYTHON_UNUSED
PyObject *__pyx_self); /* proto */
static PyObject *__pyx_pf_12_ruamel_yaml_2get_version(CYTHON_UNUSED PyObject
*__pyx_self); /* proto */
-static int __pyx_pf_12_ruamel_yaml_4Mark___init__(struct
__pyx_obj_12_ruamel_yaml_Mark *__pyx_v_self, PyObject *__pyx_v_name, int
__pyx_v_index, int __pyx_v_line, int __pyx_v_column, PyObject *__pyx_v_buffer,
PyObject *__pyx_v_pointer); /* proto */
+static int __pyx_pf_12_ruamel_yaml_4Mark___init__(struct
__pyx_obj_12_ruamel_yaml_Mark *__pyx_v_self, PyObject *__pyx_v_name, size_t
__pyx_v_index, size_t __pyx_v_line, size_t __pyx_v_column, PyObject
*__pyx_v_buffer, PyObject *__pyx_v_pointer); /* proto */
static PyObject *__pyx_pf_12_ruamel_yaml_4Mark_2get_snippet(CYTHON_UNUSED
struct __pyx_obj_12_ruamel_yaml_Mark *__pyx_v_self); /* proto */
static PyObject *__pyx_pf_12_ruamel_yaml_4Mark_4__str__(struct
__pyx_obj_12_ruamel_yaml_Mark *__pyx_v_self); /* proto */
static PyObject *__pyx_pf_12_ruamel_yaml_4Mark_4name___get__(struct
__pyx_obj_12_ruamel_yaml_Mark *__pyx_v_self); /* proto */
@@ -2050,7 +2053,7 @@
/* "_ruamel_yaml.pyx":71
* cdef readonly pointer
*
- * def __init__(self, object name, int index, int line, int column,
# <<<<<<<<<<<<<<
+ * def __init__(self, object name, size_t index, size_t line, size_t
column, # <<<<<<<<<<<<<<
* object buffer, object pointer):
* self.name = name
*/
@@ -2059,9 +2062,9 @@
static int __pyx_pw_12_ruamel_yaml_4Mark_1__init__(PyObject *__pyx_v_self,
PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
static int __pyx_pw_12_ruamel_yaml_4Mark_1__init__(PyObject *__pyx_v_self,
PyObject *__pyx_args, PyObject *__pyx_kwds) {
PyObject *__pyx_v_name = 0;
- int __pyx_v_index;
- int __pyx_v_line;
- int __pyx_v_column;
+ size_t __pyx_v_index;
+ size_t __pyx_v_line;
+ size_t __pyx_v_column;
PyObject *__pyx_v_buffer = 0;
PyObject *__pyx_v_pointer = 0;
int __pyx_r;
@@ -2139,9 +2142,9 @@
values[5] = PyTuple_GET_ITEM(__pyx_args, 5);
}
__pyx_v_name = values[0];
- __pyx_v_index = __Pyx_PyInt_As_int(values[1]); if (unlikely((__pyx_v_index
== (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 71, __pyx_L3_error)
- __pyx_v_line = __Pyx_PyInt_As_int(values[2]); if (unlikely((__pyx_v_line
== (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 71, __pyx_L3_error)
- __pyx_v_column = __Pyx_PyInt_As_int(values[3]); if
(unlikely((__pyx_v_column == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 71,
__pyx_L3_error)
+ __pyx_v_index = __Pyx_PyInt_As_size_t(values[1]); if
(unlikely((__pyx_v_index == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 71,
__pyx_L3_error)
+ __pyx_v_line = __Pyx_PyInt_As_size_t(values[2]); if
(unlikely((__pyx_v_line == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 71,
__pyx_L3_error)
+ __pyx_v_column = __Pyx_PyInt_As_size_t(values[3]); if
(unlikely((__pyx_v_column == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 71,
__pyx_L3_error)
__pyx_v_buffer = values[4];
__pyx_v_pointer = values[5];
}
@@ -2160,13 +2163,13 @@
return __pyx_r;
}
-static int __pyx_pf_12_ruamel_yaml_4Mark___init__(struct
__pyx_obj_12_ruamel_yaml_Mark *__pyx_v_self, PyObject *__pyx_v_name, int
__pyx_v_index, int __pyx_v_line, int __pyx_v_column, PyObject *__pyx_v_buffer,
PyObject *__pyx_v_pointer) {
+static int __pyx_pf_12_ruamel_yaml_4Mark___init__(struct
__pyx_obj_12_ruamel_yaml_Mark *__pyx_v_self, PyObject *__pyx_v_name, size_t
__pyx_v_index, size_t __pyx_v_line, size_t __pyx_v_column, PyObject
*__pyx_v_buffer, PyObject *__pyx_v_pointer) {
int __pyx_r;
__Pyx_RefNannyDeclarations
__Pyx_RefNannySetupContext("__init__", 0);
/* "_ruamel_yaml.pyx":73
- * def __init__(self, object name, int index, int line, int column,
+ * def __init__(self, object name, size_t index, size_t line, size_t
column,
* object buffer, object pointer):
* self.name = name # <<<<<<<<<<<<<<
* self.index = index
@@ -2234,7 +2237,7 @@
/* "_ruamel_yaml.pyx":71
* cdef readonly pointer
*
- * def __init__(self, object name, int index, int line, int column,
# <<<<<<<<<<<<<<
+ * def __init__(self, object name, size_t index, size_t line, size_t
column, # <<<<<<<<<<<<<<
* object buffer, object pointer):
* self.name = name
*/
@@ -2334,9 +2337,9 @@
* return where
*
*/
- __pyx_t_1 = __Pyx_PyInt_From_long((__pyx_v_self->line + 1)); if
(unlikely(!__pyx_t_1)) __PYX_ERR(0, 85, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyInt_FromSize_t((__pyx_v_self->line + 1)); if
(unlikely(!__pyx_t_1)) __PYX_ERR(0, 85, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_2 = __Pyx_PyInt_From_long((__pyx_v_self->column + 1)); if
(unlikely(!__pyx_t_2)) __PYX_ERR(0, 85, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyInt_FromSize_t((__pyx_v_self->column + 1)); if
(unlikely(!__pyx_t_2)) __PYX_ERR(0, 85, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__pyx_t_3 = PyTuple_New(3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 85,
__pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
@@ -2393,8 +2396,8 @@
*
* cdef class Mark:
* cdef readonly object name # <<<<<<<<<<<<<<
- * cdef readonly int index
- * cdef readonly int line
+ * cdef readonly size_t index
+ * cdef readonly size_t line
*/
/* Python wrapper */
@@ -2429,9 +2432,9 @@
/* "_ruamel_yaml.pyx":65
* cdef class Mark:
* cdef readonly object name
- * cdef readonly int index # <<<<<<<<<<<<<<
- * cdef readonly int line
- * cdef readonly int column
+ * cdef readonly size_t index # <<<<<<<<<<<<<<
+ * cdef readonly size_t line
+ * cdef readonly size_t column
*/
/* Python wrapper */
@@ -2453,7 +2456,7 @@
PyObject *__pyx_t_1 = NULL;
__Pyx_RefNannySetupContext("__get__", 0);
__Pyx_XDECREF(__pyx_r);
- __pyx_t_1 = __Pyx_PyInt_From_int(__pyx_v_self->index); if
(unlikely(!__pyx_t_1)) __PYX_ERR(0, 65, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyInt_FromSize_t(__pyx_v_self->index); if
(unlikely(!__pyx_t_1)) __PYX_ERR(0, 65, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__pyx_r = __pyx_t_1;
__pyx_t_1 = 0;
@@ -2472,9 +2475,9 @@
/* "_ruamel_yaml.pyx":66
* cdef readonly object name
- * cdef readonly int index
- * cdef readonly int line # <<<<<<<<<<<<<<
- * cdef readonly int column
+ * cdef readonly size_t index
+ * cdef readonly size_t line # <<<<<<<<<<<<<<
+ * cdef readonly size_t column
* cdef readonly buffer
*/
@@ -2497,7 +2500,7 @@
PyObject *__pyx_t_1 = NULL;
__Pyx_RefNannySetupContext("__get__", 0);
__Pyx_XDECREF(__pyx_r);
- __pyx_t_1 = __Pyx_PyInt_From_int(__pyx_v_self->line); if
(unlikely(!__pyx_t_1)) __PYX_ERR(0, 66, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyInt_FromSize_t(__pyx_v_self->line); if
(unlikely(!__pyx_t_1)) __PYX_ERR(0, 66, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__pyx_r = __pyx_t_1;
__pyx_t_1 = 0;
@@ -2515,9 +2518,9 @@
}
/* "_ruamel_yaml.pyx":67
- * cdef readonly int index
- * cdef readonly int line
- * cdef readonly int column # <<<<<<<<<<<<<<
+ * cdef readonly size_t index
+ * cdef readonly size_t line
+ * cdef readonly size_t column # <<<<<<<<<<<<<<
* cdef readonly buffer
* cdef readonly pointer
*/
@@ -2541,7 +2544,7 @@
PyObject *__pyx_t_1 = NULL;
__Pyx_RefNannySetupContext("__get__", 0);
__Pyx_XDECREF(__pyx_r);
- __pyx_t_1 = __Pyx_PyInt_From_int(__pyx_v_self->column); if
(unlikely(!__pyx_t_1)) __PYX_ERR(0, 67, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyInt_FromSize_t(__pyx_v_self->column); if
(unlikely(!__pyx_t_1)) __PYX_ERR(0, 67, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__pyx_r = __pyx_t_1;
__pyx_t_1 = 0;
@@ -2559,8 +2562,8 @@
}
/* "_ruamel_yaml.pyx":68
- * cdef readonly int line
- * cdef readonly int column
+ * cdef readonly size_t line
+ * cdef readonly size_t column
* cdef readonly buffer # <<<<<<<<<<<<<<
* cdef readonly pointer
*
@@ -2596,11 +2599,11 @@
}
/* "_ruamel_yaml.pyx":69
- * cdef readonly int column
+ * cdef readonly size_t column
* cdef readonly buffer
* cdef readonly pointer # <<<<<<<<<<<<<<
*
- * def __init__(self, object name, int index, int line, int column,
+ * def __init__(self, object name, size_t index, size_t line, size_t
column,
*/
/* Python wrapper */
@@ -2673,11 +2676,11 @@
* _dict = getattr(self, '__dict__', None)
* if _dict is not None:
*/
- __pyx_t_1 = __Pyx_PyInt_From_int(__pyx_v_self->column); if
(unlikely(!__pyx_t_1)) __PYX_ERR(1, 5, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyInt_FromSize_t(__pyx_v_self->column); if
(unlikely(!__pyx_t_1)) __PYX_ERR(1, 5, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_2 = __Pyx_PyInt_From_int(__pyx_v_self->index); if
(unlikely(!__pyx_t_2)) __PYX_ERR(1, 5, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyInt_FromSize_t(__pyx_v_self->index); if
(unlikely(!__pyx_t_2)) __PYX_ERR(1, 5, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = __Pyx_PyInt_From_int(__pyx_v_self->line); if
(unlikely(!__pyx_t_3)) __PYX_ERR(1, 5, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyInt_FromSize_t(__pyx_v_self->line); if
(unlikely(!__pyx_t_3)) __PYX_ERR(1, 5, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__pyx_t_4 = PyTuple_New(6); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 5,
__pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
@@ -23513,7 +23516,7 @@
PyObject *__pyx_r = NULL;
__Pyx_RefNannyDeclarations
PyObject *__pyx_t_1 = NULL;
- int __pyx_t_2;
+ size_t __pyx_t_2;
int __pyx_t_3;
Py_ssize_t __pyx_t_4;
int __pyx_t_5;
@@ -23547,7 +23550,7 @@
}
__pyx_t_1 = __Pyx_GetItemInt_Tuple(__pyx_v___pyx_state, 1, long, 1,
__Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 12,
__pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_2 = __Pyx_PyInt_As_int(__pyx_t_1); if (unlikely((__pyx_t_2 ==
(int)-1) && PyErr_Occurred())) __PYX_ERR(1, 12, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyInt_As_size_t(__pyx_t_1); if (unlikely((__pyx_t_2 ==
(size_t)-1) && PyErr_Occurred())) __PYX_ERR(1, 12, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
__pyx_v___pyx_result->column = __pyx_t_2;
if (unlikely(__pyx_v___pyx_state == Py_None)) {
@@ -23556,7 +23559,7 @@
}
__pyx_t_1 = __Pyx_GetItemInt_Tuple(__pyx_v___pyx_state, 2, long, 1,
__Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 12,
__pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_2 = __Pyx_PyInt_As_int(__pyx_t_1); if (unlikely((__pyx_t_2 ==
(int)-1) && PyErr_Occurred())) __PYX_ERR(1, 12, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyInt_As_size_t(__pyx_t_1); if (unlikely((__pyx_t_2 ==
(size_t)-1) && PyErr_Occurred())) __PYX_ERR(1, 12, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
__pyx_v___pyx_result->index = __pyx_t_2;
if (unlikely(__pyx_v___pyx_state == Py_None)) {
@@ -23565,7 +23568,7 @@
}
__pyx_t_1 = __Pyx_GetItemInt_Tuple(__pyx_v___pyx_state, 3, long, 1,
__Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 12,
__pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_2 = __Pyx_PyInt_As_int(__pyx_t_1); if (unlikely((__pyx_t_2 ==
(int)-1) && PyErr_Occurred())) __PYX_ERR(1, 12, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyInt_As_size_t(__pyx_t_1); if (unlikely((__pyx_t_2 ==
(size_t)-1) && PyErr_Occurred())) __PYX_ERR(1, 12, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
__pyx_v___pyx_result->line = __pyx_t_2;
if (unlikely(__pyx_v___pyx_state == Py_None)) {
@@ -27803,6 +27806,28 @@
Py_XDECREF(py_frame);
}
+/* CIntFromPyVerify */
+#define __PYX_VERIFY_RETURN_INT(target_type, func_type, func_value)\
+ __PYX__VERIFY_RETURN_INT(target_type, func_type, func_value, 0)
+#define __PYX_VERIFY_RETURN_INT_EXC(target_type, func_type, func_value)\
+ __PYX__VERIFY_RETURN_INT(target_type, func_type, func_value, 1)
+#define __PYX__VERIFY_RETURN_INT(target_type, func_type, func_value, exc)\
+ {\
+ func_type value = func_value;\
+ if (sizeof(target_type) < sizeof(func_type)) {\
+ if (unlikely(value != (func_type) (target_type) value)) {\
+ func_type zero = 0;\
+ if (exc && unlikely(value == (func_type)-1 &&
PyErr_Occurred()))\
+ return (target_type) -1;\
+ if (is_unsigned && unlikely(value < zero))\
+ goto raise_neg_overflow;\
+ else\
+ goto raise_overflow;\
+ }\
+ }\
+ return (target_type) value;\
+ }
+
/* CIntToPy */
static CYTHON_INLINE PyObject* __Pyx_PyInt_From_int(int value) {
const int neg_one = (int) ((int) 0 - (int) 1), const_zero = (int) 0;
@@ -27834,28 +27859,6 @@
}
}
-/* CIntFromPyVerify */
-#define __PYX_VERIFY_RETURN_INT(target_type, func_type, func_value)\
- __PYX__VERIFY_RETURN_INT(target_type, func_type, func_value, 0)
-#define __PYX_VERIFY_RETURN_INT_EXC(target_type, func_type, func_value)\
- __PYX__VERIFY_RETURN_INT(target_type, func_type, func_value, 1)
-#define __PYX__VERIFY_RETURN_INT(target_type, func_type, func_value, exc)\
- {\
- func_type value = func_value;\
- if (sizeof(target_type) < sizeof(func_type)) {\
- if (unlikely(value != (func_type) (target_type) value)) {\
- func_type zero = 0;\
- if (exc && unlikely(value == (func_type)-1 &&
PyErr_Occurred()))\
- return (target_type) -1;\
- if (is_unsigned && unlikely(value < zero))\
- goto raise_neg_overflow;\
- else\
- goto raise_overflow;\
- }\
- }\
- return (target_type) value;\
- }
-
/* CIntToPy */
static CYTHON_INLINE PyObject* __Pyx_PyInt_From_long(long value) {
const long neg_one = (long) ((long) 0 - (long) 1), const_zero = (long) 0;
@@ -27888,19 +27891,19 @@
}
/* CIntFromPy */
-static CYTHON_INLINE int __Pyx_PyInt_As_int(PyObject *x) {
- const int neg_one = (int) ((int) 0 - (int) 1), const_zero = (int) 0;
+static CYTHON_INLINE size_t __Pyx_PyInt_As_size_t(PyObject *x) {
+ const size_t neg_one = (size_t) ((size_t) 0 - (size_t) 1), const_zero =
(size_t) 0;
const int is_unsigned = neg_one > const_zero;
#if PY_MAJOR_VERSION < 3
if (likely(PyInt_Check(x))) {
- if (sizeof(int) < sizeof(long)) {
- __PYX_VERIFY_RETURN_INT(int, long, PyInt_AS_LONG(x))
+ if (sizeof(size_t) < sizeof(long)) {
+ __PYX_VERIFY_RETURN_INT(size_t, long, PyInt_AS_LONG(x))
} else {
long val = PyInt_AS_LONG(x);
if (is_unsigned && unlikely(val < 0)) {
goto raise_neg_overflow;
}
- return (int) val;
+ return (size_t) val;
}
} else
#endif
@@ -27909,32 +27912,32 @@
#if CYTHON_USE_PYLONG_INTERNALS
const digit* digits = ((PyLongObject*)x)->ob_digit;
switch (Py_SIZE(x)) {
- case 0: return (int) 0;
- case 1: __PYX_VERIFY_RETURN_INT(int, digit, digits[0])
+ case 0: return (size_t) 0;
+ case 1: __PYX_VERIFY_RETURN_INT(size_t, digit, digits[0])
case 2:
- if (8 * sizeof(int) > 1 * PyLong_SHIFT) {
+ if (8 * sizeof(size_t) > 1 * PyLong_SHIFT) {
if (8 * sizeof(unsigned long) > 2 * PyLong_SHIFT) {
- __PYX_VERIFY_RETURN_INT(int, unsigned long,
(((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
- } else if (8 * sizeof(int) >= 2 * PyLong_SHIFT) {
- return (int) (((((int)digits[1]) << PyLong_SHIFT)
| (int)digits[0]));
+ __PYX_VERIFY_RETURN_INT(size_t, unsigned long,
(((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+ } else if (8 * sizeof(size_t) >= 2 * PyLong_SHIFT) {
+ return (size_t) (((((size_t)digits[1]) <<
PyLong_SHIFT) | (size_t)digits[0]));
}
}
break;
case 3:
- if (8 * sizeof(int) > 2 * PyLong_SHIFT) {
+ if (8 * sizeof(size_t) > 2 * PyLong_SHIFT) {
if (8 * sizeof(unsigned long) > 3 * PyLong_SHIFT) {
- __PYX_VERIFY_RETURN_INT(int, unsigned long,
(((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) <<
PyLong_SHIFT) | (unsigned long)digits[0])))
- } else if (8 * sizeof(int) >= 3 * PyLong_SHIFT) {
- return (int) (((((((int)digits[2]) <<
PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0]));
+ __PYX_VERIFY_RETURN_INT(size_t, unsigned long,
(((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) <<
PyLong_SHIFT) | (unsigned long)digits[0])))
+ } else if (8 * sizeof(size_t) >= 3 * PyLong_SHIFT) {
+ return (size_t) (((((((size_t)digits[2]) <<
PyLong_SHIFT) | (size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0]));
}
}
break;
case 4:
- if (8 * sizeof(int) > 3 * PyLong_SHIFT) {
+ if (8 * sizeof(size_t) > 3 * PyLong_SHIFT) {
if (8 * sizeof(unsigned long) > 4 * PyLong_SHIFT) {
- __PYX_VERIFY_RETURN_INT(int, unsigned long,
(((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2])
<< PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned
long)digits[0])))
- } else if (8 * sizeof(int) >= 4 * PyLong_SHIFT) {
- return (int) (((((((((int)digits[3]) <<
PyLong_SHIFT) | (int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) <<
PyLong_SHIFT) | (int)digits[0]));
+ __PYX_VERIFY_RETURN_INT(size_t, unsigned long,
(((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2])
<< PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned
long)digits[0])))
+ } else if (8 * sizeof(size_t) >= 4 * PyLong_SHIFT) {
+ return (size_t) (((((((((size_t)digits[3]) <<
PyLong_SHIFT) | (size_t)digits[2]) << PyLong_SHIFT) | (size_t)digits[1]) <<
PyLong_SHIFT) | (size_t)digits[0]));
}
}
break;
@@ -27948,86 +27951,86 @@
{
int result = PyObject_RichCompareBool(x, Py_False, Py_LT);
if (unlikely(result < 0))
- return (int) -1;
+ return (size_t) -1;
if (unlikely(result == 1))
goto raise_neg_overflow;
}
#endif
- if (sizeof(int) <= sizeof(unsigned long)) {
- __PYX_VERIFY_RETURN_INT_EXC(int, unsigned long,
PyLong_AsUnsignedLong(x))
+ if (sizeof(size_t) <= sizeof(unsigned long)) {
+ __PYX_VERIFY_RETURN_INT_EXC(size_t, unsigned long,
PyLong_AsUnsignedLong(x))
#ifdef HAVE_LONG_LONG
- } else if (sizeof(int) <= sizeof(unsigned PY_LONG_LONG)) {
- __PYX_VERIFY_RETURN_INT_EXC(int, unsigned PY_LONG_LONG,
PyLong_AsUnsignedLongLong(x))
+ } else if (sizeof(size_t) <= sizeof(unsigned PY_LONG_LONG)) {
+ __PYX_VERIFY_RETURN_INT_EXC(size_t, unsigned PY_LONG_LONG,
PyLong_AsUnsignedLongLong(x))
#endif
}
} else {
#if CYTHON_USE_PYLONG_INTERNALS
const digit* digits = ((PyLongObject*)x)->ob_digit;
switch (Py_SIZE(x)) {
- case 0: return (int) 0;
- case -1: __PYX_VERIFY_RETURN_INT(int, sdigit, (sdigit)
(-(sdigit)digits[0]))
- case 1: __PYX_VERIFY_RETURN_INT(int, digit, +digits[0])
+ case 0: return (size_t) 0;
+ case -1: __PYX_VERIFY_RETURN_INT(size_t, sdigit, (sdigit)
(-(sdigit)digits[0]))
+ case 1: __PYX_VERIFY_RETURN_INT(size_t, digit, +digits[0])
case -2:
- if (8 * sizeof(int) - 1 > 1 * PyLong_SHIFT) {
+ if (8 * sizeof(size_t) - 1 > 1 * PyLong_SHIFT) {
if (8 * sizeof(unsigned long) > 2 * PyLong_SHIFT) {
- __PYX_VERIFY_RETURN_INT(int, long, -(long)
(((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
- } else if (8 * sizeof(int) - 1 > 2 * PyLong_SHIFT) {
- return (int) (((int)-1)*(((((int)digits[1]) <<
PyLong_SHIFT) | (int)digits[0])));
+ __PYX_VERIFY_RETURN_INT(size_t, long, -(long)
(((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+ } else if (8 * sizeof(size_t) - 1 > 2 * PyLong_SHIFT) {
+ return (size_t)
(((size_t)-1)*(((((size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0])));
}
}
break;
case 2:
- if (8 * sizeof(int) > 1 * PyLong_SHIFT) {
+ if (8 * sizeof(size_t) > 1 * PyLong_SHIFT) {
if (8 * sizeof(unsigned long) > 2 * PyLong_SHIFT) {
- __PYX_VERIFY_RETURN_INT(int, unsigned long,
(((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
- } else if (8 * sizeof(int) - 1 > 2 * PyLong_SHIFT) {
- return (int) ((((((int)digits[1]) << PyLong_SHIFT)
| (int)digits[0])));
+ __PYX_VERIFY_RETURN_INT(size_t, unsigned long,
(((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+ } else if (8 * sizeof(size_t) - 1 > 2 * PyLong_SHIFT) {
+ return (size_t) ((((((size_t)digits[1]) <<
PyLong_SHIFT) | (size_t)digits[0])));
}
}
break;
case -3:
- if (8 * sizeof(int) - 1 > 2 * PyLong_SHIFT) {
+ if (8 * sizeof(size_t) - 1 > 2 * PyLong_SHIFT) {
if (8 * sizeof(unsigned long) > 3 * PyLong_SHIFT) {
- __PYX_VERIFY_RETURN_INT(int, long, -(long)
(((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) <<
PyLong_SHIFT) | (unsigned long)digits[0])))
- } else if (8 * sizeof(int) - 1 > 3 * PyLong_SHIFT) {
- return (int) (((int)-1)*(((((((int)digits[2]) <<
PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));
+ __PYX_VERIFY_RETURN_INT(size_t, long, -(long)
(((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) <<
PyLong_SHIFT) | (unsigned long)digits[0])))
+ } else if (8 * sizeof(size_t) - 1 > 3 * PyLong_SHIFT) {
+ return (size_t)
(((size_t)-1)*(((((((size_t)digits[2]) << PyLong_SHIFT) | (size_t)digits[1]) <<
PyLong_SHIFT) | (size_t)digits[0])));
}
}
break;
case 3:
- if (8 * sizeof(int) > 2 * PyLong_SHIFT) {
+ if (8 * sizeof(size_t) > 2 * PyLong_SHIFT) {
if (8 * sizeof(unsigned long) > 3 * PyLong_SHIFT) {
- __PYX_VERIFY_RETURN_INT(int, unsigned long,
(((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) <<
PyLong_SHIFT) | (unsigned long)digits[0])))
- } else if (8 * sizeof(int) - 1 > 3 * PyLong_SHIFT) {
- return (int) ((((((((int)digits[2]) <<
PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));
+ __PYX_VERIFY_RETURN_INT(size_t, unsigned long,
(((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) <<
PyLong_SHIFT) | (unsigned long)digits[0])))
+ } else if (8 * sizeof(size_t) - 1 > 3 * PyLong_SHIFT) {
+ return (size_t) ((((((((size_t)digits[2]) <<
PyLong_SHIFT) | (size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0])));
}
}
break;
case -4:
- if (8 * sizeof(int) - 1 > 3 * PyLong_SHIFT) {
+ if (8 * sizeof(size_t) - 1 > 3 * PyLong_SHIFT) {
if (8 * sizeof(unsigned long) > 4 * PyLong_SHIFT) {
- __PYX_VERIFY_RETURN_INT(int, long, -(long)
(((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2])
<< PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned
long)digits[0])))
- } else if (8 * sizeof(int) - 1 > 4 * PyLong_SHIFT) {
- return (int) (((int)-1)*(((((((((int)digits[3]) <<
PyLong_SHIFT) | (int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) <<
PyLong_SHIFT) | (int)digits[0])));
+ __PYX_VERIFY_RETURN_INT(size_t, long, -(long)
(((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2])
<< PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned
long)digits[0])))
+ } else if (8 * sizeof(size_t) - 1 > 4 * PyLong_SHIFT) {
+ return (size_t)
(((size_t)-1)*(((((((((size_t)digits[3]) << PyLong_SHIFT) | (size_t)digits[2])
<< PyLong_SHIFT) | (size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0])));
}
}
break;
case 4:
- if (8 * sizeof(int) > 3 * PyLong_SHIFT) {
+ if (8 * sizeof(size_t) > 3 * PyLong_SHIFT) {
if (8 * sizeof(unsigned long) > 4 * PyLong_SHIFT) {
- __PYX_VERIFY_RETURN_INT(int, unsigned long,
(((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2])
<< PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned
long)digits[0])))
- } else if (8 * sizeof(int) - 1 > 4 * PyLong_SHIFT) {
- return (int) ((((((((((int)digits[3]) <<
PyLong_SHIFT) | (int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) <<
PyLong_SHIFT) | (int)digits[0])));
+ __PYX_VERIFY_RETURN_INT(size_t, unsigned long,
(((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2])
<< PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned
long)digits[0])))
+ } else if (8 * sizeof(size_t) - 1 > 4 * PyLong_SHIFT) {
+ return (size_t) ((((((((((size_t)digits[3]) <<
PyLong_SHIFT) | (size_t)digits[2]) << PyLong_SHIFT) | (size_t)digits[1]) <<
PyLong_SHIFT) | (size_t)digits[0])));
}
}
break;
}
#endif
- if (sizeof(int) <= sizeof(long)) {
- __PYX_VERIFY_RETURN_INT_EXC(int, long, PyLong_AsLong(x))
+ if (sizeof(size_t) <= sizeof(long)) {
+ __PYX_VERIFY_RETURN_INT_EXC(size_t, long, PyLong_AsLong(x))
#ifdef HAVE_LONG_LONG
- } else if (sizeof(int) <= sizeof(PY_LONG_LONG)) {
- __PYX_VERIFY_RETURN_INT_EXC(int, PY_LONG_LONG,
PyLong_AsLongLong(x))
+ } else if (sizeof(size_t) <= sizeof(PY_LONG_LONG)) {
+ __PYX_VERIFY_RETURN_INT_EXC(size_t, PY_LONG_LONG,
PyLong_AsLongLong(x))
#endif
}
}
@@ -28036,7 +28039,7 @@
PyErr_SetString(PyExc_RuntimeError,
"_PyLong_AsByteArray() not available in PyPy,
cannot convert large numbers");
#else
- int val;
+ size_t val;
PyObject *v = __Pyx_PyNumber_IntOrLong(x);
#if PY_MAJOR_VERSION < 3
if (likely(v) && !PyLong_Check(v)) {
@@ -28056,24 +28059,24 @@
return val;
}
#endif
- return (int) -1;
+ return (size_t) -1;
}
} else {
- int val;
+ size_t val;
PyObject *tmp = __Pyx_PyNumber_IntOrLong(x);
- if (!tmp) return (int) -1;
- val = __Pyx_PyInt_As_int(tmp);
+ if (!tmp) return (size_t) -1;
+ val = __Pyx_PyInt_As_size_t(tmp);
Py_DECREF(tmp);
return val;
}
raise_overflow:
PyErr_SetString(PyExc_OverflowError,
- "value too large to convert to int");
- return (int) -1;
+ "value too large to convert to size_t");
+ return (size_t) -1;
raise_neg_overflow:
PyErr_SetString(PyExc_OverflowError,
- "can't convert negative value to int");
- return (int) -1;
+ "can't convert negative value to size_t");
+ return (size_t) -1;
}
/* CIntFromPy */
@@ -28265,6 +28268,195 @@
return (long) -1;
}
+/* CIntFromPy */
+static CYTHON_INLINE int __Pyx_PyInt_As_int(PyObject *x) {
+ const int neg_one = (int) ((int) 0 - (int) 1), const_zero = (int) 0;
+ const int is_unsigned = neg_one > const_zero;
+#if PY_MAJOR_VERSION < 3
+ if (likely(PyInt_Check(x))) {
+ if (sizeof(int) < sizeof(long)) {
+ __PYX_VERIFY_RETURN_INT(int, long, PyInt_AS_LONG(x))
+ } else {
+ long val = PyInt_AS_LONG(x);
+ if (is_unsigned && unlikely(val < 0)) {
+ goto raise_neg_overflow;
+ }
+ return (int) val;
+ }
+ } else
+#endif
+ if (likely(PyLong_Check(x))) {
+ if (is_unsigned) {
+#if CYTHON_USE_PYLONG_INTERNALS
+ const digit* digits = ((PyLongObject*)x)->ob_digit;
+ switch (Py_SIZE(x)) {
+ case 0: return (int) 0;
+ case 1: __PYX_VERIFY_RETURN_INT(int, digit, digits[0])
+ case 2:
+ if (8 * sizeof(int) > 1 * PyLong_SHIFT) {
+ if (8 * sizeof(unsigned long) > 2 * PyLong_SHIFT) {
+ __PYX_VERIFY_RETURN_INT(int, unsigned long,
(((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+ } else if (8 * sizeof(int) >= 2 * PyLong_SHIFT) {
+ return (int) (((((int)digits[1]) << PyLong_SHIFT)
| (int)digits[0]));
+ }
+ }
+ break;
+ case 3:
+ if (8 * sizeof(int) > 2 * PyLong_SHIFT) {
+ if (8 * sizeof(unsigned long) > 3 * PyLong_SHIFT) {
+ __PYX_VERIFY_RETURN_INT(int, unsigned long,
(((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) <<
PyLong_SHIFT) | (unsigned long)digits[0])))
+ } else if (8 * sizeof(int) >= 3 * PyLong_SHIFT) {
+ return (int) (((((((int)digits[2]) <<
PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0]));
+ }
+ }
+ break;
+ case 4:
+ if (8 * sizeof(int) > 3 * PyLong_SHIFT) {
+ if (8 * sizeof(unsigned long) > 4 * PyLong_SHIFT) {
+ __PYX_VERIFY_RETURN_INT(int, unsigned long,
(((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2])
<< PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned
long)digits[0])))
+ } else if (8 * sizeof(int) >= 4 * PyLong_SHIFT) {
+ return (int) (((((((((int)digits[3]) <<
PyLong_SHIFT) | (int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) <<
PyLong_SHIFT) | (int)digits[0]));
+ }
+ }
+ break;
+ }
+#endif
+#if CYTHON_COMPILING_IN_CPYTHON
+ if (unlikely(Py_SIZE(x) < 0)) {
+ goto raise_neg_overflow;
+ }
+#else
+ {
+ int result = PyObject_RichCompareBool(x, Py_False, Py_LT);
+ if (unlikely(result < 0))
+ return (int) -1;
+ if (unlikely(result == 1))
+ goto raise_neg_overflow;
+ }
+#endif
+ if (sizeof(int) <= sizeof(unsigned long)) {
+ __PYX_VERIFY_RETURN_INT_EXC(int, unsigned long,
PyLong_AsUnsignedLong(x))
+#ifdef HAVE_LONG_LONG
+ } else if (sizeof(int) <= sizeof(unsigned PY_LONG_LONG)) {
+ __PYX_VERIFY_RETURN_INT_EXC(int, unsigned PY_LONG_LONG,
PyLong_AsUnsignedLongLong(x))
+#endif
+ }
+ } else {
+#if CYTHON_USE_PYLONG_INTERNALS
+ const digit* digits = ((PyLongObject*)x)->ob_digit;
+ switch (Py_SIZE(x)) {
+ case 0: return (int) 0;
+ case -1: __PYX_VERIFY_RETURN_INT(int, sdigit, (sdigit)
(-(sdigit)digits[0]))
+ case 1: __PYX_VERIFY_RETURN_INT(int, digit, +digits[0])
+ case -2:
+ if (8 * sizeof(int) - 1 > 1 * PyLong_SHIFT) {
+ if (8 * sizeof(unsigned long) > 2 * PyLong_SHIFT) {
+ __PYX_VERIFY_RETURN_INT(int, long, -(long)
(((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+ } else if (8 * sizeof(int) - 1 > 2 * PyLong_SHIFT) {
+ return (int) (((int)-1)*(((((int)digits[1]) <<
PyLong_SHIFT) | (int)digits[0])));
+ }
+ }
+ break;
+ case 2:
+ if (8 * sizeof(int) > 1 * PyLong_SHIFT) {
+ if (8 * sizeof(unsigned long) > 2 * PyLong_SHIFT) {
+ __PYX_VERIFY_RETURN_INT(int, unsigned long,
(((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
+ } else if (8 * sizeof(int) - 1 > 2 * PyLong_SHIFT) {
+ return (int) ((((((int)digits[1]) << PyLong_SHIFT)
| (int)digits[0])));
+ }
+ }
+ break;
+ case -3:
+ if (8 * sizeof(int) - 1 > 2 * PyLong_SHIFT) {
+ if (8 * sizeof(unsigned long) > 3 * PyLong_SHIFT) {
+ __PYX_VERIFY_RETURN_INT(int, long, -(long)
(((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) <<
PyLong_SHIFT) | (unsigned long)digits[0])))
+ } else if (8 * sizeof(int) - 1 > 3 * PyLong_SHIFT) {
+ return (int) (((int)-1)*(((((((int)digits[2]) <<
PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));
+ }
+ }
+ break;
+ case 3:
+ if (8 * sizeof(int) > 2 * PyLong_SHIFT) {
+ if (8 * sizeof(unsigned long) > 3 * PyLong_SHIFT) {
+ __PYX_VERIFY_RETURN_INT(int, unsigned long,
(((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) <<
PyLong_SHIFT) | (unsigned long)digits[0])))
+ } else if (8 * sizeof(int) - 1 > 3 * PyLong_SHIFT) {
+ return (int) ((((((((int)digits[2]) <<
PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));
+ }
+ }
+ break;
+ case -4:
+ if (8 * sizeof(int) - 1 > 3 * PyLong_SHIFT) {
+ if (8 * sizeof(unsigned long) > 4 * PyLong_SHIFT) {
+ __PYX_VERIFY_RETURN_INT(int, long, -(long)
(((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2])
<< PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned
long)digits[0])))
+ } else if (8 * sizeof(int) - 1 > 4 * PyLong_SHIFT) {
+ return (int) (((int)-1)*(((((((((int)digits[3]) <<
PyLong_SHIFT) | (int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) <<
PyLong_SHIFT) | (int)digits[0])));
+ }
+ }
+ break;
+ case 4:
+ if (8 * sizeof(int) > 3 * PyLong_SHIFT) {
+ if (8 * sizeof(unsigned long) > 4 * PyLong_SHIFT) {
+ __PYX_VERIFY_RETURN_INT(int, unsigned long,
(((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2])
<< PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned
long)digits[0])))
+ } else if (8 * sizeof(int) - 1 > 4 * PyLong_SHIFT) {
+ return (int) ((((((((((int)digits[3]) <<
PyLong_SHIFT) | (int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) <<
PyLong_SHIFT) | (int)digits[0])));
+ }
+ }
+ break;
+ }
+#endif
+ if (sizeof(int) <= sizeof(long)) {
+ __PYX_VERIFY_RETURN_INT_EXC(int, long, PyLong_AsLong(x))
+#ifdef HAVE_LONG_LONG
+ } else if (sizeof(int) <= sizeof(PY_LONG_LONG)) {
+ __PYX_VERIFY_RETURN_INT_EXC(int, PY_LONG_LONG,
PyLong_AsLongLong(x))
+#endif
+ }
+ }
+ {
+#if CYTHON_COMPILING_IN_PYPY && !defined(_PyLong_AsByteArray)
+ PyErr_SetString(PyExc_RuntimeError,
+ "_PyLong_AsByteArray() not available in PyPy,
cannot convert large numbers");
+#else
+ int val;
+ PyObject *v = __Pyx_PyNumber_IntOrLong(x);
+ #if PY_MAJOR_VERSION < 3
+ if (likely(v) && !PyLong_Check(v)) {
+ PyObject *tmp = v;
+ v = PyNumber_Long(tmp);
+ Py_DECREF(tmp);
+ }
+ #endif
+ if (likely(v)) {
+ int one = 1; int is_little = (int)*(unsigned char *)&one;
+ unsigned char *bytes = (unsigned char *)&val;
+ int ret = _PyLong_AsByteArray((PyLongObject *)v,
+ bytes, sizeof(val),
+ is_little, !is_unsigned);
+ Py_DECREF(v);
+ if (likely(!ret))
+ return val;
+ }
+#endif
+ return (int) -1;
+ }
+ } else {
+ int val;
+ PyObject *tmp = __Pyx_PyNumber_IntOrLong(x);
+ if (!tmp) return (int) -1;
+ val = __Pyx_PyInt_As_int(tmp);
+ Py_DECREF(tmp);
+ return val;
+ }
+raise_overflow:
+ PyErr_SetString(PyExc_OverflowError,
+ "value too large to convert to int");
+ return (int) -1;
+raise_neg_overflow:
+ PyErr_SetString(PyExc_OverflowError,
+ "can't convert negative value to int");
+ return (int) -1;
+}
+
/* FastTypeChecks */
#if CYTHON_COMPILING_IN_CPYTHON
static int __Pyx_InBases(PyTypeObject *a, PyTypeObject *b) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ruamel.yaml.clib-0.1.2/ruamel.yaml.clib.egg-info/PKG-INFO
new/ruamel.yaml.clib-0.2.0/ruamel.yaml.clib.egg-info/PKG-INFO
--- old/ruamel.yaml.clib-0.1.2/ruamel.yaml.clib.egg-info/PKG-INFO
2019-08-07 22:01:59.000000000 +0200
+++ new/ruamel.yaml.clib-0.2.0/ruamel.yaml.clib.egg-info/PKG-INFO
2019-09-27 08:04:09.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: ruamel.yaml.clib
-Version: 0.1.2
+Version: 0.2.0
Summary: C version of reader, parser and emitter for ruamel.yaml derived from
libyaml
Home-page: https://bitbucket.org/ruamel/yaml.clib
Author: Anthon van der Neut
@@ -12,8 +12,8 @@
``ruamel.yaml.clib`` is the C based reader/scanner and emitter for
ruamel.yaml
- :version: 0.1.0
- :updated: 2019-07-25
+ :version: 0.2.0
+ :updated: 2019-09-26
:documentation: http://yaml.readthedocs.io
:repository: https://bitbucket.org/ruamel/yaml.clib
:pypi: https://pypi.org/project/ruamel.yaml.clib/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ruamel.yaml.clib-0.1.2/setup.py
new/ruamel.yaml.clib-0.2.0/setup.py
--- old/ruamel.yaml.clib-0.1.2/setup.py 2019-08-07 22:01:43.000000000 +0200
+++ new/ruamel.yaml.clib-0.2.0/setup.py 2019-09-27 08:04:08.000000000 +0200
@@ -1,6 +1,6 @@
# # header
# coding: utf-8
-# dd: 20190807
+# dd: 20190815
from __future__ import print_function, absolute_import, division,
unicode_literals
@@ -20,8 +20,13 @@
from setuptools.command import install_lib # NOQA
from setuptools.command.sdist import sdist as _sdist # NOQA
-from setuptools.namespaces import Installer as NameSpaceInstaller # NOQA
-
+try:
+ from setuptools.namespaces import Installer as NameSpaceInstaller # NOQA
+except ImportError:
+ msg = ('You should use the latest setuptools. The namespaces.py file that
this setup.py'
+ ' uses was added in setuptools 28.7.0 (Oct 2016)')
+ print(msg)
+ sys.exit()
if __name__ != '__main__':
raise NotImplementedError('should never include setup.py')
@@ -30,9 +35,6 @@
full_package_name = None
-if __name__ != '__main__':
- raise NotImplementedError('should never include setup.py')
-
if sys.version_info < (3,):
string_type = basestring
else:
