[python-scientific] 01/06: Imported Upstream version 2.9.4
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Sat Aug 2 16:52:40 UTC 2014
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch experimental
in repository python-scientific.
commit 0a259c1f76652db16524b2c3741362115730e82f
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Fri Jan 24 18:20:54 2014 +0100
Imported Upstream version 2.9.4
---
Doc/CHANGELOG | 16 ++++++-
Examples/netcdf_demo.py | 8 ++--
PKG-INFO | 2 +-
Scientific/BSP/RemoteObjects.py | 81 --------------------------------
Scientific/BSP/__init__.py | 1 -
Scientific/BSP/core.py | 10 +---
Scientific/Functions/Polynomial.py | 2 +-
Scientific/Physics/PhysicalQuantities.py | 8 ++--
Scientific/TkWidgets/TkPlotCanvas.py | 4 +-
Scientific/__pkginfo__.py | 2 +-
Scientific/_affinitypropagation.c | 39 ++++++++-------
Scientific/_interpolation.c | 27 ++++++-----
Scientific/_vector.c | 33 ++++++++-----
13 files changed, 84 insertions(+), 149 deletions(-)
diff --git a/Doc/CHANGELOG b/Doc/CHANGELOG
index a390903..5e3666d 100644
--- a/Doc/CHANGELOG
+++ b/Doc/CHANGELOG
@@ -1,3 +1,17 @@
+2.9.3 --> 2.9.4
+----------------
+
+Cleanup:
+
+ - The module Scientific.BSP.RemoteObjects was removed.
+ It was experimental and never fully functional.
+
+ - Tabs were replaced by spaces in two files.
+
+Bug fixes:
+
+ - Typos
+
2.9.2 --> 2.9.3
----------------
@@ -22,7 +36,7 @@ Bug fixes:
- Scientific.BSP: Some operations created nested ParValue objects.
(Thanks to Kelson Zawack!)
-
+
2.9.1 --> 2.9.2
----------------
diff --git a/Examples/netcdf_demo.py b/Examples/netcdf_demo.py
index f1e72d7..f3dbd70 100644
--- a/Examples/netcdf_demo.py
+++ b/Examples/netcdf_demo.py
@@ -5,20 +5,20 @@ import time
def getUserName():
try:
- import os, pwd, string
+ import os, pwd, string
except ImportError:
- return 'unknown user'
+ return 'unknown user'
pwd_entry = pwd.getpwuid(os.getuid())
name = string.strip(string.splitfields(pwd_entry[4], ',')[0])
if name == '':
- name = pwd_entry[0]
+ name = pwd_entry[0]
return name
#
# Creating a file
#
file = NetCDFFile('test.nc', 'w', 'Created ' + time.ctime(time.time())
- + ' by ' + getUserName())
+ + ' by ' + getUserName())
file.title = "Just some useless junk"
file.version = 42
diff --git a/PKG-INFO b/PKG-INFO
index 9b214d7..4c3c433 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: ScientificPython
-Version: 2.9.3
+Version: 2.9.4
Summary: Various Python modules for scientific computing
Home-page: http://dirac.cnrs-orleans.fr/ScientificPython/
Author: Konrad Hinsen
diff --git a/Scientific/BSP/RemoteObjects.py b/Scientific/BSP/RemoteObjects.py
deleted file mode 100644
index 5a84985..0000000
--- a/Scientific/BSP/RemoteObjects.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# Remote objects for BSP
-#
-# Written by Konrad Hinsen <hinsen at cnrs-orleans.fr>
-# last revision: 2005-9-27
-#
-
-# There is exactly one global RemoteObjectManager object, which keeps track
-# of both local objects for which proxies exist and local proxies to objects
-# on other processors. It is not used directly by applications.
-
-class RemoteObjectManager(object):
-
- def __parinit__(self, pid, nprocs):
- self.pid = pid
- self.nprocs = nprocs
- self.nprocs = nprocs
- self.local_objects = {}
- self.local_proxies = {}
- self.current_id = 0
-
- def registerLocalObject(self, local_object):
- remote_id = self.current_id
- self.current_id += 1
- self.local_objects[remote_id] = local_object
- local_object.__ro_remote_id__ = remote_id
- return (self.pid, remote_id)
-
- def retrieveLocalObject(self, remote_id):
- return self.local_object[remote_id]
-
-
-remote_object_manager = RemoteObjectManager()
-
-# The remote object base class and the Proxy class take care of
-# all the bookkeeping.
-
-class RemoteObject(object):
-
- def isLocal(self):
- return True
-
- def _getROProxy(self):
- try:
- return self.__ro_proxy__
- except AttributeError:
- self.__ro_proxy__ = Proxy(remote_object_manager
- .registerLocalObject(self))
- return self.__ro_proxy__
-
- def transferTo(self, pid):
- messages = []
- if pid != processorID:
- messages.append(([pid], self))
- try:
- proxy = self.__ro_proxy__
- messages.append((range(remote_object_manager.nprocs),
- TransferToken(proxy.pid, proxy.remote_id,
- other_pid)))
- except AttributeError:
- pass
- return messages
-
-class Proxy(object):
-
- def __init__(self, reference):
- self.pid, self.remote_id = reference
-
- def isLocal(self):
- return False
-
- def _getROLocalObject(self):
- if self.pid != remote_object_manager.pid:
- raise ValueError("wrong pid")
- return _manager.retrieveLocalObject(self.remote_id)
-
-class TransferToken(object):
-
- def __init__(self, from_pid, from_id, to_pid):
- self.from_pid = from_pid
- self.from_id = from_id
- self.to_pid = to_pid
diff --git a/Scientific/BSP/__init__.py b/Scientific/BSP/__init__.py
index 7603578..5cf24fc 100644
--- a/Scientific/BSP/__init__.py
+++ b/Scientific/BSP/__init__.py
@@ -13,7 +13,6 @@ return list can either be the sent object or a copy of it. Application
programs thus should not make any assumptions about received objects
being different from sent objects.
- at undocumented: RemoteObjects
@undocumented: Tasks
@undocumented: core
"""
diff --git a/Scientific/BSP/core.py b/Scientific/BSP/core.py
index 4717eac..2914a0e 100644
--- a/Scientific/BSP/core.py
+++ b/Scientific/BSP/core.py
@@ -3,7 +3,6 @@
# Written by Konrad Hinsen
#
-import RemoteObjects
from Scientific import N
import cPickle, operator, sys, types
@@ -225,14 +224,7 @@ else:
#
def retrieveMessages():
- messages = sync()
- filtered_messages = []
- for m in messages:
- if isinstance(m, RemoteObjects.TransferToken):
- RemoteObjects.remote_object_manager.handleTransfer(m)
- else:
- filtered_messages.append(m)
- return filtered_messages
+ return sync()
#
# The dictionary _wrappers stores the global class corresponding
diff --git a/Scientific/Functions/Polynomial.py b/Scientific/Functions/Polynomial.py
index 54ea191..54698c7 100644
--- a/Scientific/Functions/Polynomial.py
+++ b/Scientific/Functions/Polynomial.py
@@ -219,7 +219,7 @@ if __name__ == '__main__':
p2 = Polynomial([[1.,0.3],[-0.2,0.5]])
y = 0.3
print p2(x,y), 1. + 0.3*y - 0.2*x + 0.5*x*y
- fit = fitPolynomial(2, [1.,2.,3.,4.], [2.,4.,8.,14.])
+ fit = _fitPolynomial(2, [1.,2.,3.,4.], [2.,4.,8.,14.])
print fit.coeff
diff --git a/Scientific/Physics/PhysicalQuantities.py b/Scientific/Physics/PhysicalQuantities.py
index 060c22c..2578f17 100644
--- a/Scientific/Physics/PhysicalQuantities.py
+++ b/Scientific/Physics/PhysicalQuantities.py
@@ -625,11 +625,11 @@ _help = []
def _addUnit(name, unit, comment=''):
if _unit_table.has_key(name):
- raise KeyError, 'Unit ' + name + ' already defined'
+ raise KeyError, 'Unit ' + name + ' already defined'
if comment:
_help.append((name, comment, unit))
if type(unit) == type(''):
- unit = eval(unit, _unit_table)
+ unit = eval(unit, _unit_table)
for cruft in ['__builtins__', '__args__']:
try: del _unit_table[cruft]
except: pass
@@ -640,8 +640,8 @@ def _addPrefixed(unit):
_help.append('Prefixed units for %s:' % unit)
_prefixed_names = []
for prefix in _prefixes:
- name = prefix[0] + unit
- _addUnit(name, prefix[1]*_unit_table[unit])
+ name = prefix[0] + unit
+ _addUnit(name, prefix[1]*_unit_table[unit])
_prefixed_names.append(name)
_help.append(', '.join(_prefixed_names))
diff --git a/Scientific/TkWidgets/TkPlotCanvas.py b/Scientific/TkWidgets/TkPlotCanvas.py
index 9c4cb77..e66e953 100644
--- a/Scientific/TkWidgets/TkPlotCanvas.py
+++ b/Scientific/TkWidgets/TkPlotCanvas.py
@@ -731,8 +731,8 @@ class PlotCanvas(Tkinter.Frame):
point = (point-shift)/scale
text = "x = %f\ny = %f" % tuple(point)
self.label = self.canvas.create_window(x, y,
- window=Label(self.canvas,
- text=text))
+ window=Tkinter.Label(self.canvas,
+ text=text))
def _hideValue(self, event):
if self.label is not None:
diff --git a/Scientific/__pkginfo__.py b/Scientific/__pkginfo__.py
index d2f7b96..100bb16 100644
--- a/Scientific/__pkginfo__.py
+++ b/Scientific/__pkginfo__.py
@@ -1,3 +1,3 @@
# Data used both in the package and by setup.py
-__version__ = '2.9.3'
+__version__ = '2.9.4'
diff --git a/Scientific/_affinitypropagation.c b/Scientific/_affinitypropagation.c
index 6509c26..3107d8f 100644
--- a/Scientific/_affinitypropagation.c
+++ b/Scientific/_affinitypropagation.c
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.19.1 on Tue Oct 29 14:33:26 2013 */
+/* Generated by Cython 0.19.2 on Fri Jan 24 16:41:50 2014 */
#define PY_SSIZE_T_CLEAN
#ifndef CYTHON_USE_PYLONG_INTERNALS
@@ -264,7 +264,7 @@
#ifndef CYTHON_RESTRICT
#if defined(__GNUC__)
#define CYTHON_RESTRICT __restrict__
- #elif defined(_MSC_VER)
+ #elif defined(_MSC_VER) && _MSC_VER >= 1400
#define CYTHON_RESTRICT __restrict
#elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
#define CYTHON_RESTRICT restrict
@@ -808,6 +808,14 @@ typedef npy_cdouble __pyx_t_5numpy_complex_t;
#define __Pyx_XGOTREF(r)
#define __Pyx_XGIVEREF(r)
#endif /* CYTHON_REFNANNY */
+#define __Pyx_XDECREF_SET(r, v) do { \
+ PyObject *tmp = (PyObject *) r; \
+ r = v; __Pyx_XDECREF(tmp); \
+ } while (0)
+#define __Pyx_DECREF_SET(r, v) do { \
+ PyObject *tmp = (PyObject *) r; \
+ r = v; __Pyx_DECREF(tmp); \
+ } while (0)
#define __Pyx_CLEAR(r) do { PyObject* tmp = ((PyObject*)(r)); r = NULL; __Pyx_DECREF(tmp);} while(0)
#define __Pyx_XCLEAR(r) do { if((r) != NULL) {PyObject* tmp = ((PyObject*)(r)); r = NULL; __Pyx_DECREF(tmp);}} while(0)
@@ -1421,8 +1429,7 @@ static PyObject *__pyx_pf_10Scientific_20_affinitypropagation__affinityPropagati
__Pyx_GOTREF(__pyx_t_1);
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_XDECREF(((PyObject *)__pyx_v_ind_array));
- __pyx_v_ind_array = ((PyArrayObject *)__pyx_t_1);
+ __Pyx_XDECREF_SET(__pyx_v_ind_array, ((PyArrayObject *)__pyx_t_1));
__pyx_t_1 = 0;
/* "Scientific/_affinitypropagation.pyx":27
@@ -1526,8 +1533,7 @@ static PyObject *__pyx_pf_10Scientific_20_affinitypropagation__affinityPropagati
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
if (!(likely(((__pyx_t_2) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_DECREF(((PyObject *)__pyx_v_r));
- __pyx_v_r = ((PyArrayObject *)__pyx_t_2);
+ __Pyx_DECREF_SET(__pyx_v_r, ((PyArrayObject *)__pyx_t_2));
__pyx_t_2 = 0;
/* "Scientific/_affinitypropagation.pyx":36
@@ -1634,8 +1640,7 @@ static PyObject *__pyx_pf_10Scientific_20_affinitypropagation__affinityPropagati
__Pyx_GOTREF(__pyx_t_4);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
if (!(likely(((__pyx_t_4) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_4, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 40; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_XDECREF(((PyObject *)__pyx_v_ind_array));
- __pyx_v_ind_array = ((PyArrayObject *)__pyx_t_4);
+ __Pyx_XDECREF_SET(__pyx_v_ind_array, ((PyArrayObject *)__pyx_t_4));
__pyx_t_4 = 0;
/* "Scientific/_affinitypropagation.pyx":41
@@ -1769,8 +1774,7 @@ static PyObject *__pyx_pf_10Scientific_20_affinitypropagation__affinityPropagati
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
if (!(likely(((__pyx_t_4) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_4, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_DECREF(((PyObject *)__pyx_v_a));
- __pyx_v_a = ((PyArrayObject *)__pyx_t_4);
+ __Pyx_DECREF_SET(__pyx_v_a, ((PyArrayObject *)__pyx_t_4));
__pyx_t_4 = 0;
/* "Scientific/_affinitypropagation.pyx":50
@@ -2964,8 +2968,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx
#else
__pyx_t_3 = PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 794; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
#endif
- __Pyx_XDECREF(__pyx_v_childname);
- __pyx_v_childname = __pyx_t_3;
+ __Pyx_XDECREF_SET(__pyx_v_childname, __pyx_t_3);
__pyx_t_3 = 0;
/* "numpy.pxd":795
@@ -2978,8 +2981,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx
__pyx_t_3 = PyObject_GetItem(__pyx_v_descr->fields, __pyx_v_childname); if (!__pyx_t_3) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 795; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_3);
if (!(likely(PyTuple_CheckExact(__pyx_t_3))||((__pyx_t_3) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected tuple, got %.200s", Py_TYPE(__pyx_t_3)->tp_name), 0))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 795; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_XDECREF(((PyObject *)__pyx_v_fields));
- __pyx_v_fields = ((PyObject*)__pyx_t_3);
+ __Pyx_XDECREF_SET(__pyx_v_fields, ((PyObject*)__pyx_t_3));
__pyx_t_3 = 0;
/* "numpy.pxd":796
@@ -3036,11 +3038,9 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx
__pyx_L6_unpacking_done:;
}
if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_dtype))))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 796; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_XDECREF(((PyObject *)__pyx_v_child));
- __pyx_v_child = ((PyArray_Descr *)__pyx_t_3);
+ __Pyx_XDECREF_SET(__pyx_v_child, ((PyArray_Descr *)__pyx_t_3));
__pyx_t_3 = 0;
- __Pyx_XDECREF(__pyx_v_new_offset);
- __pyx_v_new_offset = __pyx_t_4;
+ __Pyx_XDECREF_SET(__pyx_v_new_offset, __pyx_t_4);
__pyx_t_4 = 0;
/* "numpy.pxd":798
@@ -3208,8 +3208,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx
*/
__pyx_t_3 = PyInt_FromLong(__pyx_v_child->type_num); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 821; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_3);
- __Pyx_XDECREF(__pyx_v_t);
- __pyx_v_t = __pyx_t_3;
+ __Pyx_XDECREF_SET(__pyx_v_t, __pyx_t_3);
__pyx_t_3 = 0;
/* "numpy.pxd":822
diff --git a/Scientific/_interpolation.c b/Scientific/_interpolation.c
index 6399c9d..dcb4280 100644
--- a/Scientific/_interpolation.c
+++ b/Scientific/_interpolation.c
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.19.1 on Tue Oct 29 14:33:26 2013 */
+/* Generated by Cython 0.19.2 on Fri Jan 24 16:41:50 2014 */
#define PY_SSIZE_T_CLEAN
#ifndef CYTHON_USE_PYLONG_INTERNALS
@@ -264,7 +264,7 @@
#ifndef CYTHON_RESTRICT
#if defined(__GNUC__)
#define CYTHON_RESTRICT __restrict__
- #elif defined(_MSC_VER)
+ #elif defined(_MSC_VER) && _MSC_VER >= 1400
#define CYTHON_RESTRICT __restrict
#elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
#define CYTHON_RESTRICT restrict
@@ -809,6 +809,14 @@ typedef npy_cdouble __pyx_t_5numpy_complex_t;
#define __Pyx_XGOTREF(r)
#define __Pyx_XGIVEREF(r)
#endif /* CYTHON_REFNANNY */
+#define __Pyx_XDECREF_SET(r, v) do { \
+ PyObject *tmp = (PyObject *) r; \
+ r = v; __Pyx_XDECREF(tmp); \
+ } while (0)
+#define __Pyx_DECREF_SET(r, v) do { \
+ PyObject *tmp = (PyObject *) r; \
+ r = v; __Pyx_DECREF(tmp); \
+ } while (0)
#define __Pyx_CLEAR(r) do { PyObject* tmp = ((PyObject*)(r)); r = NULL; __Pyx_DECREF(tmp);} while(0)
#define __Pyx_XCLEAR(r) do { if((r) != NULL) {PyObject* tmp = ((PyObject*)(r)); r = NULL; __Pyx_DECREF(tmp);}} while(0)
@@ -2829,8 +2837,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx
#else
__pyx_t_3 = PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 794; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
#endif
- __Pyx_XDECREF(__pyx_v_childname);
- __pyx_v_childname = __pyx_t_3;
+ __Pyx_XDECREF_SET(__pyx_v_childname, __pyx_t_3);
__pyx_t_3 = 0;
/* "numpy.pxd":795
@@ -2843,8 +2850,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx
__pyx_t_3 = PyObject_GetItem(__pyx_v_descr->fields, __pyx_v_childname); if (!__pyx_t_3) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 795; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_3);
if (!(likely(PyTuple_CheckExact(__pyx_t_3))||((__pyx_t_3) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected tuple, got %.200s", Py_TYPE(__pyx_t_3)->tp_name), 0))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 795; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_XDECREF(((PyObject *)__pyx_v_fields));
- __pyx_v_fields = ((PyObject*)__pyx_t_3);
+ __Pyx_XDECREF_SET(__pyx_v_fields, ((PyObject*)__pyx_t_3));
__pyx_t_3 = 0;
/* "numpy.pxd":796
@@ -2901,11 +2907,9 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx
__pyx_L6_unpacking_done:;
}
if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_dtype))))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 796; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_XDECREF(((PyObject *)__pyx_v_child));
- __pyx_v_child = ((PyArray_Descr *)__pyx_t_3);
+ __Pyx_XDECREF_SET(__pyx_v_child, ((PyArray_Descr *)__pyx_t_3));
__pyx_t_3 = 0;
- __Pyx_XDECREF(__pyx_v_new_offset);
- __pyx_v_new_offset = __pyx_t_4;
+ __Pyx_XDECREF_SET(__pyx_v_new_offset, __pyx_t_4);
__pyx_t_4 = 0;
/* "numpy.pxd":798
@@ -3073,8 +3077,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx
*/
__pyx_t_3 = PyInt_FromLong(__pyx_v_child->type_num); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 821; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_3);
- __Pyx_XDECREF(__pyx_v_t);
- __pyx_v_t = __pyx_t_3;
+ __Pyx_XDECREF_SET(__pyx_v_t, __pyx_t_3);
__pyx_t_3 = 0;
/* "numpy.pxd":822
diff --git a/Scientific/_vector.c b/Scientific/_vector.c
index 9001f03..45ea617 100644
--- a/Scientific/_vector.c
+++ b/Scientific/_vector.c
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.19.1 on Tue Oct 29 14:33:26 2013 */
+/* Generated by Cython 0.19.2 on Fri Jan 24 16:41:50 2014 */
#define PY_SSIZE_T_CLEAN
#ifndef CYTHON_USE_PYLONG_INTERNALS
@@ -264,7 +264,7 @@
#ifndef CYTHON_RESTRICT
#if defined(__GNUC__)
#define CYTHON_RESTRICT __restrict__
- #elif defined(_MSC_VER)
+ #elif defined(_MSC_VER) && _MSC_VER >= 1400
#define CYTHON_RESTRICT __restrict
#elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
#define CYTHON_RESTRICT restrict
@@ -867,6 +867,14 @@ static struct __pyx_vtabstruct_10Scientific_7_vector_Vector *__pyx_vtabptr_10Sci
#define __Pyx_XGOTREF(r)
#define __Pyx_XGIVEREF(r)
#endif /* CYTHON_REFNANNY */
+#define __Pyx_XDECREF_SET(r, v) do { \
+ PyObject *tmp = (PyObject *) r; \
+ r = v; __Pyx_XDECREF(tmp); \
+ } while (0)
+#define __Pyx_DECREF_SET(r, v) do { \
+ PyObject *tmp = (PyObject *) r; \
+ r = v; __Pyx_DECREF(tmp); \
+ } while (0)
#define __Pyx_CLEAR(r) do { PyObject* tmp = ((PyObject*)(r)); r = NULL; __Pyx_DECREF(tmp);} while(0)
#define __Pyx_XCLEAR(r) do { if((r) != NULL) {PyObject* tmp = ((PyObject*)(r)); r = NULL; __Pyx_DECREF(tmp);}} while(0)
@@ -6069,8 +6077,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx
#else
__pyx_t_3 = PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 794; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
#endif
- __Pyx_XDECREF(__pyx_v_childname);
- __pyx_v_childname = __pyx_t_3;
+ __Pyx_XDECREF_SET(__pyx_v_childname, __pyx_t_3);
__pyx_t_3 = 0;
/* "numpy.pxd":795
@@ -6083,8 +6090,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx
__pyx_t_3 = PyObject_GetItem(__pyx_v_descr->fields, __pyx_v_childname); if (!__pyx_t_3) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 795; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_3);
if (!(likely(PyTuple_CheckExact(__pyx_t_3))||((__pyx_t_3) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected tuple, got %.200s", Py_TYPE(__pyx_t_3)->tp_name), 0))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 795; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_XDECREF(((PyObject *)__pyx_v_fields));
- __pyx_v_fields = ((PyObject*)__pyx_t_3);
+ __Pyx_XDECREF_SET(__pyx_v_fields, ((PyObject*)__pyx_t_3));
__pyx_t_3 = 0;
/* "numpy.pxd":796
@@ -6141,11 +6147,9 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx
__pyx_L6_unpacking_done:;
}
if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_dtype))))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 796; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_XDECREF(((PyObject *)__pyx_v_child));
- __pyx_v_child = ((PyArray_Descr *)__pyx_t_3);
+ __Pyx_XDECREF_SET(__pyx_v_child, ((PyArray_Descr *)__pyx_t_3));
__pyx_t_3 = 0;
- __Pyx_XDECREF(__pyx_v_new_offset);
- __pyx_v_new_offset = __pyx_t_4;
+ __Pyx_XDECREF_SET(__pyx_v_new_offset, __pyx_t_4);
__pyx_t_4 = 0;
/* "numpy.pxd":798
@@ -6313,8 +6317,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx
*/
__pyx_t_3 = PyInt_FromLong(__pyx_v_child->type_num); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 821; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_3);
- __Pyx_XDECREF(__pyx_v_t);
- __pyx_v_t = __pyx_t_3;
+ __Pyx_XDECREF_SET(__pyx_v_t, __pyx_t_3);
__pyx_t_3 = 0;
/* "numpy.pxd":822
@@ -7062,6 +7065,9 @@ static PyTypeObject __pyx_type_10Scientific_7_vector_vector = {
#if PY_VERSION_HEX >= 0x02060000
0, /*tp_version_tag*/
#endif
+ #if PY_VERSION_HEX >= 0x030400a1 && defined(Py_TPFLAGS_HAVE_FINALIZE)
+ 0, /*tp_finalize*/
+ #endif
};
static struct __pyx_vtabstruct_10Scientific_7_vector_Vector __pyx_vtable_10Scientific_7_vector_Vector;
@@ -7149,6 +7155,9 @@ static PyTypeObject __pyx_type_10Scientific_7_vector_Vector = {
#if PY_VERSION_HEX >= 0x02060000
0, /*tp_version_tag*/
#endif
+ #if PY_VERSION_HEX >= 0x030400a1 && defined(Py_TPFLAGS_HAVE_FINALIZE)
+ 0, /*tp_finalize*/
+ #endif
};
static PyMethodDef __pyx_methods[] = {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-scientific.git
More information about the debian-science-commits
mailing list