Skip to content

Commit

Permalink
CLN: typo fixups (pandas-dev#25028)
Browse files Browse the repository at this point in the history
  • Loading branch information
jbrockmendel authored and Pingviinituutti committed Feb 28, 2019
1 parent 7abe82e commit 651d366
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 15 deletions.
1 change: 0 additions & 1 deletion pandas/_libs/interval.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ cnp.import_array()


cimport pandas._libs.util as util
util.import_array()

from pandas._libs.hashtable cimport Int64Vector, Int64VectorData

Expand Down
2 changes: 1 addition & 1 deletion pandas/_libs/tslibs/nattype.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ class NaTType(_NaT):
)
combine = _make_error_func('combine', # noqa:E128
"""
Timsetamp.combine(date, time)
Timestamp.combine(date, time)
date, time -> datetime with same date and time fields
"""
Expand Down
4 changes: 2 additions & 2 deletions pandas/_libs/tslibs/timestamps.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ def round_nsint64(values, mode, freq):

# This is PITA. Because we inherit from datetime, which has very specific
# construction requirements, we need to do object instantiation in python
# (see Timestamp class above). This will serve as a C extension type that
# (see Timestamp class below). This will serve as a C extension type that
# shadows the python class, where we do any heavy lifting.
cdef class _Timestamp(datetime):

Expand Down Expand Up @@ -670,7 +670,7 @@ class Timestamp(_Timestamp):
@classmethod
def combine(cls, date, time):
"""
Timsetamp.combine(date, time)
Timestamp.combine(date, time)
date, time -> datetime with same date and time fields
"""
Expand Down
14 changes: 3 additions & 11 deletions pandas/core/internals/blocks.py
Original file line number Diff line number Diff line change
Expand Up @@ -2072,17 +2072,9 @@ def get_values(self, dtype=None):
return object dtype as boxed values, such as Timestamps/Timedelta
"""
if is_object_dtype(dtype):
values = self.values

if self.ndim > 1:
values = values.ravel()

values = lib.map_infer(values, self._box_func)

if self.ndim > 1:
values = values.reshape(self.values.shape)

return values
values = self.values.ravel()
result = self._holder(values).astype(object)
return result.reshape(self.values.shape)
return self.values


Expand Down

0 comments on commit 651d366

Please sign in to comment.