diff options
| author | Christian Heimes <christian@cheimes.de> | 2007-12-11 01:06:40 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2007-12-11 01:06:40 (GMT) |
| commit | b76922a7be9196af9281cd2d167f1afd81d1fb6e (patch) | |
| tree | 5691f4e12412bad9256e621fee671b2c6465c321 /Lib | |
| parent | ad8dcd5f1af1b2a6b64040163d011628ab4f7691 (diff) | |
| download | cpython-b76922a7be9196af9281cd2d167f1afd81d1fb6e.zip cpython-b76922a7be9196af9281cd2d167f1afd81d1fb6e.tar.gz cpython-b76922a7be9196af9281cd2d167f1afd81d1fb6e.tar.bz2 | |
Merged revisions 59450-59464 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59455 | guido.van.rossum | 2007-12-10 21:42:53 +0100 (Mon, 10 Dec 2007) | 2 lines
Remove a 2.2-ism.
........
r59459 | christian.heimes | 2007-12-10 23:28:56 +0100 (Mon, 10 Dec 2007) | 4 lines
Backport of r59456:59458 from py3k to trunk
Issue #1580: New free format floating point representation based on "Floating-Point Printer Sample Code", by Robert G. Burger. For example repr(11./5) now returns '2.2' instead of '2.2000000000000002'.
Thanks to noam for the patch! I had to modify doubledigits.c slightly to support X64 and IA64 machines on Windows. I also added the new file to the three project files.
........
r59460 | guido.van.rossum | 2007-12-11 00:00:12 +0100 (Tue, 11 Dec 2007) | 4 lines
Patch #1643738 by Ulisses Furquim -- make the is_tripped variable
in signalmodule.c more robust. Includes Martin von Loewis's suggestion
to set is_tripped after .tripped.
........
r59463 | kurt.kaiser | 2007-12-11 01:04:57 +0100 (Tue, 11 Dec 2007) | 2 lines
format_paragraph_event wasn't returning 'break'
........
r59464 | christian.heimes | 2007-12-11 01:54:34 +0100 (Tue, 11 Dec 2007) | 3 lines
The new float repr causes too much trouble and pain. I'm disabling the feature until we have sorted out the issues on all machines. 64bit machines seem to have issues and Guido has reported even worse.
Guido: It's pretty bad actually -- repr(1e5) comes out as '1.0'... Ditto for
repr(1eN) for most N... Both in 2.6 and in 3.0...
........
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/DocXMLRPCServer.py | 3 | ||||
| -rw-r--r-- | Lib/idlelib/FormatParagraph.py | 1 | ||||
| -rw-r--r-- | Lib/test/test_float.py | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/Lib/DocXMLRPCServer.py b/Lib/DocXMLRPCServer.py index 86c7bfb..504b669 100644 --- a/Lib/DocXMLRPCServer.py +++ b/Lib/DocXMLRPCServer.py @@ -123,8 +123,7 @@ class ServerHTMLDoc(pydoc.HTMLDoc): result = result + '<p>%s</p>\n' % doc contents = [] - method_items = list(methods.items()) - method_items.sort() + method_items = sorted(methods.items()) for key, value in method_items: contents.append(self.docroutine(value, key, funcs=fdict)) result = result + self.bigsection( diff --git a/Lib/idlelib/FormatParagraph.py b/Lib/idlelib/FormatParagraph.py index 9b4b3cb..02f96d4 100644 --- a/Lib/idlelib/FormatParagraph.py +++ b/Lib/idlelib/FormatParagraph.py @@ -75,6 +75,7 @@ class FormatParagraph: else: text.mark_set("insert", last) text.see("insert") + return "break" def find_paragraph(text, mark): lineno, col = map(int, mark.split(".")) diff --git a/Lib/test/test_float.py b/Lib/test/test_float.py index 2ba6dbc..922de7a 100644 --- a/Lib/test/test_float.py +++ b/Lib/test/test_float.py @@ -166,7 +166,8 @@ def test_main(): UnknownFormatTestCase, IEEEFormatTestCase, FormatTestCase, - ReprTestCase) + #ReprTestCase + ) if __name__ == '__main__': test_main() |