##// END OF EJS Templates
Fernando Perez -
Show More
@@ -1800,7 +1800,24 b' Currently the magic system has the following functions:\\n"""'
1800 1800 import timeit
1801 1801 import math
1802 1802
1803 units = [u"s", u"ms", u"\xb5s", u"ns"]
1803 # XXX: Unfortunately the unicode 'micro' symbol can cause problems in
1804 # certain terminals. Until we figure out a robust way of
1805 # auto-detecting if the terminal can deal with it, use plain 'us' for
1806 # microseconds. Note: using
1807 #
1808 # s = u'\xb5'
1809 # s.encode(sys.getdefaultencoding())
1810 #
1811 # is not sufficient, as I've seen terminals where that fails but
1812 # print s
1813 #
1814 # succeeds
1815 #
1816 # See bug: https://bugs.launchpad.net/ipython/+bug/348466
1817
1818 #units = [u"s", u"ms",u'\xb5',"ns"]
1819 units = [u"s", u"ms",u'us',"ns"]
1820
1804 1821 scaling = [1, 1e3, 1e6, 1e9]
1805 1822
1806 1823 opts, stmt = self.parse_options(parameter_s,'n:r:tcp:',
General Comments 0
You need to be logged in to leave comments. Login now