Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
2e5a160
BUG: Fix Timestamp type checks to work with subclassed datetime (#25851)
ArtificialQualia Mar 23, 2019
82b2420
increase spacing in comment
ArtificialQualia Mar 23, 2019
4447746
fix spacing
ArtificialQualia Mar 23, 2019
2d20375
fix import formatting
ArtificialQualia Mar 24, 2019
8e8d816
move _Timestamp to separate file to prevent circular import
ArtificialQualia Mar 28, 2019
4fd35ac
fix indenting
ArtificialQualia Mar 28, 2019
354d3a3
fix line spacing
ArtificialQualia Mar 28, 2019
600be4f
kickoff new build
ArtificialQualia Mar 28, 2019
7a60942
updates for PR review
ArtificialQualia Mar 29, 2019
dd5d492
Merge branch 'master' into update_timestamp_checks
ArtificialQualia Mar 29, 2019
46f306d
fix isort error
ArtificialQualia Mar 29, 2019
7268a91
Merge branch 'update_timestamp_checks' of https://github.com/Artifici…
ArtificialQualia Mar 29, 2019
ff0ddef
fix isort error
ArtificialQualia Mar 29, 2019
c54ee53
force rebuild
ArtificialQualia Mar 30, 2019
6dc805b
PR updates
ArtificialQualia Mar 30, 2019
789e121
Merge branch 'master' into update_timestamp_checks
ArtificialQualia Mar 30, 2019
6a66238
parameterize test
ArtificialQualia Mar 30, 2019
12a53be
Merge branch 'update_timestamp_checks' of https://github.com/Artifici…
ArtificialQualia Mar 30, 2019
7da7684
PR updates
ArtificialQualia Mar 31, 2019
dc0f806
fix namespace test for new api
ArtificialQualia Mar 31, 2019
0cad612
fix typo
ArtificialQualia Mar 31, 2019
a1cb913
Merge branch 'master' into update_timestamp_checks
ArtificialQualia Apr 5, 2019
ee9d2d5
merge changes into _timestamp
ArtificialQualia Apr 5, 2019
560ef6f
change _timestamp files to c_timestamp
ArtificialQualia Apr 5, 2019
92a9c52
Merge branch 'master' into update_timestamp_checks
ArtificialQualia Apr 5, 2019
b87aa99
use new tzconversion.tz_convert_single merged function
ArtificialQualia Apr 5, 2019
11a091a
move imports to fix import exceptions
ArtificialQualia Apr 5, 2019
4896568
change imports
ArtificialQualia Apr 5, 2019
43ec600
fix api test
ArtificialQualia Apr 5, 2019
9795807
force rebuild
ArtificialQualia Apr 5, 2019
ded5e69
force rebuild
ArtificialQualia Apr 5, 2019
File filter

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
move imports to fix import exceptions
  • Loading branch information
ArtificialQualia committed Apr 5, 2019
commit 11a091ab2491a4b78e5bd0b35a03a8fb5d6a5b3c
2 changes: 1 addition & 1 deletion pandas/_libs/tslibs/__init__.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# -*- coding: utf-8 -*-
# flake8: noqa

from .c_timestamp import maybe_integer_op_deprecated
from .conversion import normalize_date, localize_pydatetime
from .nattype import NaT, NaTType, iNaT, is_null_datetimelike
from .np_datetime import OutOfBoundsDatetime
from .period import Period, IncompatibleFrequency
from .timestamps import Timestamp
from .timedeltas import delta_to_nanoseconds, ints_to_pytimedelta, Timedelta
from .tzconversion import tz_convert_single
from .c_timestamp import maybe_integer_op_deprecated # isort:skip
Copy link
Contributor

Choose a reason for hiding this comment

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

do we really need this function here? this should not be exposed to the rest of the codebase (or directly imported if it actually is needed)

Copy link
Contributor

Choose a reason for hiding this comment

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

maybe just expose it in timestamp.pyx itself to make it easier to import

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It was exposed previously, and is only used in pandas/core/arrays/datetimelike.py. _Timestamp itself makes use of it, so it has to be in c_timestamp.pyx otherwise we would have a circular import.

I can change the import in datetimelike.py to directly import it if you want.

Copy link
Contributor

Choose a reason for hiding this comment

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

sorry made the comment in the wrong place. yes just import it directly in dateimelike.py and don't put it in tslibs/__init__.py