8000 Assorted _libs cleanups by jbrockmendel · Pull Request #19887 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

Assorted _libs cleanups #19887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Feb 28, 2018
Merged

Assorted _libs cleanups #19887

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c0f203b
remove unused lib.pxd
jbrockmendel Feb 24, 2018
dd2815d
implement libops; remove unnecessary util layer
jbrockmendel Feb 24, 2018
ee307e9
remove func moved to libops; change cpdef to cdef where possible
jbrockmendel Feb 24, 2018
5b7b841
update import
jbrockmendel Feb 24, 2018
933dfa7
fixup cut/paste
jbrockmendel Feb 24, 2018
1227517
remove semicolons
jbrockmendel Feb 24, 2018
12dfcc0
remove unused datetime dt declarations
jbrockmendel Feb 24, 2018
be7a199
Merge branch 'master' of https://github.com/pandas-dev/pandas into li…
jbrockmendel Feb 25, 2018
fe02b0f
just return
jbrockmendel Feb 25, 2018
14536c4
docstrings
jbrockmendel Feb 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixup cut/paste
  • Loading branch information
@jbrockmendel
jbrockmendel committed Feb 24, 2018
commit 933dfa7bd411a039c39ab676812fa5cde87201b2
6 changes: 3 additions & 3 deletions pandas/_libs/lib.pyx
V A7E1 iew file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,10 @@ def item_from_zerodim(object val):
array([1])

"""
if cnp.PyArray_IsZeroDim(arr):
return cnp.PyArray_ToScalar(cnp.PyArray_DATA(arr), arr)
if cnp.PyArray_IsZeroDim(val):
return cnp.PyArray_ToScalar(cnp.PyArray_DATA(val), val)
else:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just return

return arr
return val


@cython.wraparound(False)
Expand Down
0