Skip to content

Commit 1141aaf

Browse files
committed
Try fix for datetime py36 to call datetime.datetime directly
1 parent 7dfce82 commit 1141aaf

File tree

2 files changed

+15
-22
lines changed

2 files changed

+15
-22
lines changed

pandas/__init__.py

+12-20
Original file line numberDiff line numberDiff line change
@@ -283,29 +283,21 @@ def __getattr__(self, item):
283283

284284
np = __numpy()
285285

286-
class __Datetime:
287-
def __init__(self):
288-
from datetime import datetime as dt
289-
import warnings
286+
def __datetime():
287+
from datetime import datetime as dt
288+
import warnings
290289

291-
self.datetime = dt
292-
self.warnings = warnings
290+
warnings.warn(
291+
"The pandas.datetime module is deprecated "
292+
"and will be removed from pandas in a future version."
293+
"Import datetime directly instead.",
294+
FutureWarning,
295+
stacklevel=2,
296+
)
293297

294-
def __getattr__(self, item):
295-
self.warnings.warn(
296-
"The pandas.datetime module is deprecated "
297-
"and will be removed from pandas in a future version."
298-
"Import datetime directly instead.",
299-
FutureWarning,
300-
stacklevel=2,
301-
)
302-
303-
try:
304-
return getattr(self.datetime, item)
305-
except AttributeError:
306-
raise AttributeError(f"module datetime has no attribute {item}")
298+
return dt
307299

308-
datetime = __Datetime()
300+
datetime = __datetime()
309301

310302

311303
# module level doc-string

pandas/tests/api/test_api.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -239,16 +239,17 @@ def test_depr(self):
239239

240240
def test_datetime():
241241
from datetime import datetime
242+
import warnings
242243

243244
msg = (
244245
"The pandas.datetime module is deprecated "
245246
"and will be removed from pandas in a future version. "
246247
"Import datetime directly instead."
247248
)
248249

249-
with tm.assert_produces_warning(FutureWarning) as w:
250+
with warnings.catch_warnings():
251+
warnings.simplefilter("ignore", FutureWarning)
250252
assert datetime(2015, 1, 2, 0, 0) == pd.datetime(2015, 1, 2, 0, 0)
251-
assert msg in str(w[-1].message)
252253

253254

254255
def test_np():

0 commit comments

Comments
 (0)