From 1e20a5df70ffc0f827a51711cfc13a0855c32658 Mon Sep 17 00:00:00 2001 From: Noel Dawe Date: Mon, 7 Sep 2015 10:06:28 +1000 Subject: [PATCH] remove unused variable --- root_numpy/src/_librootnumpy.cpp | 22 +++++----------------- root_numpy/src/tree.pyx | 2 +- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/root_numpy/src/_librootnumpy.cpp b/root_numpy/src/_librootnumpy.cpp index 070e212..ef082be 100644 --- a/root_numpy/src/_librootnumpy.cpp +++ b/root_numpy/src/_librootnumpy.cpp @@ -15835,9 +15835,6 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec ; PyObject *__pyx_v_indices = NULL #line 118 "root_numpy/src/tree.pyx" -; - CYTHON_UNUSED PyObject *__pyx_v_ex = NULL -#line 118 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_idx = NULL #line 118 "root_numpy/src/tree.pyx" @@ -18972,7 +18969,7 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * # Initialize the array * try: # <<<<<<<<<<<<<< * arr = np.empty(num_entries, dtype=dtype) - * except MemoryError as ex: + * except MemoryError: */ #line 319 "root_numpy/src/tree.pyx" @@ -18989,7 +18986,7 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * # Initialize the array * try: * arr = np.empty(num_entries, dtype=dtype) # <<<<<<<<<<<<<< - * except MemoryError as ex: + * except MemoryError: * # Raise a more informative exception */ @@ -19110,7 +19107,7 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file /* "root_numpy/src/tree.pyx":321 * try: * arr = np.empty(num_entries, dtype=dtype) - * except MemoryError as ex: # <<<<<<<<<<<<<< + * except MemoryError: # <<<<<<<<<<<<<< * # Raise a more informative exception * raise MemoryError("failed to allocate memory for {0} array of {1} records with {2} fields".format( */ @@ -19136,14 +19133,8 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file #line 321 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 321 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_2); - -#line 321 "root_numpy/src/tree.pyx" - __pyx_v_ex = __pyx_t_2; - /* "root_numpy/src/tree.pyx":323 - * except MemoryError as ex: + * except MemoryError: * # Raise a more informative exception * raise MemoryError("failed to allocate memory for {0} array of {1} records with {2} fields".format( # <<<<<<<<<<<<<< * humanize_bytes(dtype.itemsize * num_entries), num_entries, len(dtype_fields))) @@ -19306,7 +19297,7 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; /* "root_numpy/src/tree.pyx":323 - * except MemoryError as ex: + * except MemoryError: * # Raise a more informative exception * raise MemoryError("failed to allocate memory for {0} array of {1} records with {2} fields".format( # <<<<<<<<<<<<<< * humanize_bytes(dtype.itemsize * num_entries), num_entries, len(dtype_fields))) @@ -20219,9 +20210,6 @@ __pyx_t_9 = PyObject_GetIter(__pyx_v_indices); if (unlikely(!__pyx_t_9)) {__pyx_ #line 118 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_indices); -#line 118 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_v_ex); - #line 118 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_idx); diff --git a/root_numpy/src/tree.pyx b/root_numpy/src/tree.pyx index f79f231..8aca90e 100644 --- a/root_numpy/src/tree.pyx +++ b/root_numpy/src/tree.pyx @@ -318,7 +318,7 @@ cdef object tree2array(TTree* tree, branches, string selection, # Initialize the array try: arr = np.empty(num_entries, dtype=dtype) - except MemoryError as ex: + except MemoryError: # Raise a more informative exception raise MemoryError("failed to allocate memory for {0} array of {1} records with {2} fields".format( humanize_bytes(dtype.itemsize * num_entries), num_entries, len(dtype_fields)))