← Back to branch summary

~ubuntu-branches/ubuntu/raring/ipython/raring

« back to all changes in this revision

Viewing changes to IPython/core/magics/execution.py

  • Committer: Package Import Robot
  • Author(s): Julian Taylor
  • Date: 2013-02-02 11:14:27 UTC
  • mfrom: (1.2.21) (6.2.3 experimental)
  • Revision ID: package-import@ubuntu.com-20130202111427-nxxl7g1ulix8g9lg
Tags: 0.13.2~rc2-1
https://launchpad.net/bugs/1161818
https://launchpad.net/bugs/1162112
http://bugs.debian.org/695554
http://bugs.debian.org/693612
http://bugs.debian.org/697704
http://bugs.debian.org/701597
http://bugs.debian.org/701707
* New upstream release candidate (LP: #1161818, #1162112)
* pass -a to xvfb-run
* drop DM-Upload-Allowed, not needed anymore
* don't link documentation of ipython-doc so ipython3 does not depend on
  ipython (Closes: #695554)
  Requires ipython-doc.preinst to not lose copyright on upgrade
* add ipython3 and ipython3-qtconsole desktop files (Closes: #693612)
* fix detection of cython modules for multiarch python (Closes: #697704)
* don't install tests for notebook and qtconsole
* bump standard to 3.9.4, no changes required
* add autopkgtests running testsuite and testing tools, cython magics
  and incomplete install message
* fix crash on tracebacks without line numbers (Closes: #701597)
* add tkinter package to debianize-error-messages.patch (Closes: #701707)
* use canonical vcs fields in control

Show diffs side-by-side

added added

removed removed

Lines of Context:
IPython/core/magics/execution.py
557
557
                                return
558
558
                        # if we find a good linenumber, set the breakpoint
559
559
                        deb.do_break('%s:%s' % (filename, bp))
 
560
 
 
561
                        # Mimic Pdb._runscript(...)
 
562
                        deb._wait_for_mainpyfile = True
 
563
                        deb.mainpyfile = deb.canonic(filename)
 
564
 
560
565
                        # Start file run
561
566
                        print "NOTE: Enter 'c' at the",
562
567
                        print "%s prompt to start your script." % deb.prompt
606
611
                                t_sys = t1[1] - t0[1]
607
612
                                print "\nIPython CPU timings (estimated):"
608
613
                                print "Total runs performed:", nruns
609
 
                                print "  Times  : %10.2f    %10.2f" % ('Total', 'Per run')
 
614
                                print "  Times  : %10s   %10s" % ('Total', 'Per run')
610
615
                                print "  User   : %10.2f s, %10.2f s." % (t_usr, t_usr / nruns)
611
616
                                print "  System : %10.2f s, %10.2f s." % (t_sys, t_sys / nruns)
612
617
                            twall1 = time.time()