Skip to content
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.

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

Fix magic time #11716

Merged
merged 4 commits into from May 26, 2019

Conversation

@Pragnya02
Copy link
Contributor

commented May 9, 2019

In case of %%time with multi-lines in cell , eval the last line and display in output instead of suppressing it.

Refer Issue : #11707

@Carreau

This comment has been minimized.

Copy link
Member

commented May 10, 2019

Looks good to me,

I'll try to see if I can come up with test to make sure the behavior does not regress.

self.shell.showtraceback()
return
self.shell.showtraceback()
return

This comment has been minimized.

Copy link
@gpotter2

gpotter2 May 10, 2019

Contributor

If I'm not mistaken this only adds extra unneeded spaces.

This comment has been minimized.

Copy link
@Pragnya02

Pragnya02 May 10, 2019

Author Contributor

Did you mean showtraceback() ? That would be for the entire try block (from line 1301 to 1305)

This comment has been minimized.

Copy link
@gpotter2

gpotter2 May 10, 2019

Contributor

What I meant was that your diff is full of spacing changes 😄
B95A112B-B9A9-426A-BBE7-4396C0179C04

This comment has been minimized.

Copy link
@Pragnya02

Pragnya02 May 10, 2019

Author Contributor

Oops, thank you ! Fixed that now, should be fine.

@Carreau Carreau force-pushed the Pragnya02:fix_magic_time branch from 203afd0 to e7cc2e5 May 25, 2019

@Carreau Carreau force-pushed the Pragnya02:fix_magic_time branch from e7cc2e5 to 167e67e May 25, 2019

@Carreau

This comment has been minimized.

Copy link
Member

commented May 25, 2019

Thanks for your patience,

I rebased and squashed a few commits to not have the whitespaces changes in history, plus added a test.

Once test passes I'm happy to merge this.

Thanks.

@Carreau

This comment has been minimized.

Copy link
Member

commented May 26, 2019

Thanks @Pragnya02 !

@Carreau Carreau merged commit de0abd8 into ipython:master May 26, 2019

4 checks passed

codecov/patch 100% of diff hit (target 0%)
Details
codecov/project 68.99% (+0.02%) compared to 649f79b
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@Carreau Carreau added this to the 7.6 milestone May 26, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.