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
Merged

Fix magic time #11716

merged 4 commits into from May 26, 2019

Conversation

@Pragnya02
Copy link
Contributor

@Pragnya02 Pragnya02 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
Copy link
Member

@Carreau Carreau 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.

Loading

self.shell.showtraceback()
return
self.shell.showtraceback()
return
Copy link
Contributor

@gpotter2 gpotter2 May 10, 2019

Choose a reason for hiding this comment

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

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

Loading

Copy link
Contributor Author

@Pragnya02 Pragnya02 May 10, 2019

Choose a reason for hiding this comment

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

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

Loading

Copy link
Contributor

@gpotter2 gpotter2 May 10, 2019

Choose a reason for hiding this comment

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

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

Loading

Copy link
Contributor Author

@Pragnya02 Pragnya02 May 10, 2019

Choose a reason for hiding this comment

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

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

Loading

@Carreau Carreau force-pushed the fix_magic_time branch from 203afd0 to e7cc2e5 May 25, 2019
@Carreau Carreau force-pushed the fix_magic_time branch from e7cc2e5 to 167e67e May 25, 2019
@Carreau
Copy link
Member

@Carreau Carreau 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.

Loading

IPython/core/magics/execution.py Outdated Show resolved Hide resolved
Loading
@Carreau
Copy link
Member

@Carreau Carreau commented May 26, 2019

Thanks @Pragnya02 !

Loading

@Carreau Carreau merged commit de0abd8 into ipython:master May 26, 2019
4 checks passed
Loading
@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
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants