Skip to content

BLD: fix time module import conflict #3098

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

Jump to bottom
Merged
1 commit merged into from
Mar 20, 2013
Merged

BLD: fix time module import conflict #3098

1 commit merged into from
Mar 20, 2013

Conversation

@cpcloud
Copy link
Member

@cpcloud cpcloud commented Mar 19, 2013

See #3097.
@ghost
Copy link

ghost commented Mar 19, 2013

Thanks for investigating this. I think it'd be better to replace the import * statement instead, though.

from cpython cimport ( PyTypeObject, PyFloat_Check, PyObject_RichCompareBool, PyString_Check )

seems to do the job.
If you can redo the commit, I'll merge it once travis passes.
@cpcloud
Copy link
Member Author

cpcloud commented Mar 19, 2013

So should I change it then git commit --amend?
@ghost
Copy link

ghost commented Mar 19, 2013

yep. or just add another commit and I'll take care of it.
@cpcloud
Copy link
Member Author

cpcloud commented Mar 19, 2013

Cool. Running the test suite on my machine and then I will push.
ghost pushed a commit that referenced this pull request Mar 20, 2013
Merge pull request #3098 from cpcloud/time-import-fix
4e0465d 
BLD: fix time module import conflict
@ghost ghost merged commit 4e0465d into pandas-dev:master Mar 20, 2013
@ghost
Copy link

ghost commented Mar 20, 2013

In it goes. thanks.
@cpcloud cpcloud deleted the time-import-fix branch March 20, 2013 01:14
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

1 participant

@cpcloud