Skip to content

Commit e8e078f

Browse files
mroeschkejreback
authored andcommitted
CLN: Old helper functions (#22104)
1 parent 21cbca6 commit e8e078f

File tree

4 files changed

+6
-44
lines changed

4 files changed

+6
-44
lines changed

pandas/core/reshape/util.py

-7
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,9 @@
33
from pandas.core.dtypes.common import is_list_like
44

55
from pandas.compat import reduce
6-
from pandas.core.index import Index
76
from pandas.core import common as com
87

98

10-
def match(needles, haystack):
11-
haystack = Index(haystack)
12-
needles = Index(needles)
13-
return haystack.get_indexer(needles)
14-
15-
169
def cartesian_product(X):
1710
"""
1811
Numpy version of itertools.product or pandas.compat.product.

pandas/core/tools/datetimes.py

+1-22
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from functools import partial
2-
from datetime import datetime, timedelta, time
2+
from datetime import datetime, time
33
from collections import MutableMapping
44

55
import numpy as np
@@ -850,24 +850,3 @@ def _convert_listlike(arg, format):
850850
return _convert_listlike(arg, format)
851851

852852
return _convert_listlike(np.array([arg]), format)[0]
853-
854-
855-
def format(dt):
856-
"""Returns date in YYYYMMDD format."""
857-
return dt.strftime('%Y%m%d')
858-
859-
860-
OLE_TIME_ZERO = datetime(1899, 12, 30, 0, 0, 0)
861-
862-
863-
def ole2datetime(oledt):
864-
"""function for converting excel date to normal date format"""
865-
val = float(oledt)
866-
867-
# Excel has a bug where it thinks the date 2/29/1900 exists
868-
# we just reject any date before 3/1/1900.
869-
if val < 61:
870-
msg = "Value is outside of acceptable range: {value}".format(value=val)
871-
raise ValueError(msg)
872-
873-
return OLE_TIME_ZERO + timedelta(days=val)

pandas/tests/io/test_sql.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
from pandas import date_range, to_datetime, to_timedelta, Timestamp
3737
import pandas.compat as compat
3838
from pandas.compat import range, lrange, string_types, PY36
39-
from pandas.core.tools.datetimes import format as date_format
4039

4140
import pandas.io.sql as sql
4241
from pandas.io.sql import read_sql_table, read_sql_query
@@ -2094,6 +2093,11 @@ def test_illegal_names(self):
20942093
# -- Old tests from 0.13.1 (before refactor using sqlalchemy)
20952094

20962095

2096+
def date_format(dt):
2097+
"""Returns date in YYYYMMDD format."""
2098+
return dt.strftime('%Y%m%d')
2099+
2100+
20972101
_formatters = {
20982102
datetime: lambda dt: "'%s'" % date_format(dt),
20992103
str: lambda x: "'%s'" % x,

pandas/tests/tseries/offsets/test_offsets.py

-14
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
QuarterEnd, BusinessMonthEnd, FY5253,
3030
Nano, Easter, FY5253Quarter,
3131
LastWeekOfMonth, Tick)
32-
from pandas.core.tools.datetimes import format, ole2datetime
3332
import pandas.tseries.offsets as offsets
3433
from pandas.io.pickle import read_pickle
3534
from pandas._libs.tslibs import timezones
@@ -45,19 +44,6 @@
4544
####
4645

4746

48-
def test_format():
49-
actual = format(datetime(2008, 1, 15))
50-
assert actual == '20080115'
51-
52-
53-
def test_ole2datetime():
54-
actual = ole2datetime(60000)
55-
assert actual == datetime(2064, 4, 8)
56-
57-
with pytest.raises(ValueError):
58-
ole2datetime(60)
59-
60-
6147
def test_to_m8():
6248
valb = datetime(2007, 10, 1)
6349
valu = _to_m8(valb)

0 commit comments

Comments
 (0)