Mailman 3 April 2008 - Python-checkins

r62605 - python/trunk/Lib/contextlib.py
by georg.brandl April 30, 2008

April 30, 2008

Author: georg.brandl Date: Wed Apr 30 23:08:42 2008 New Revision: 62605 Log: #1748: use functools.wraps instead of rolling own metadata update. Modified: python/trunk/Lib/contextlib.py Modified: python/trunk/Lib/contextlib.py ============================================================================== --- python/trunk/Lib/contextlib.py (original) +++ python/trunk/Lib/contextlib.py Wed Apr 30 23:08:42 2008 @@ -1,6 +1,7 @@ """Utilities for with-statement contexts. See PEP 343.""" import sys +from functools import wraps __all__ = ["contextmanager", "nested", "closing"] @@ -77,14 +78,9 @@ <cleanup> """ + @wraps(func) def helper(*args, **kwds): return GeneratorContextManager(func(*args, **kwds)) - try: - helper.__name__ = func.__name__ - helper.__doc__ = func.__doc__ - helper.__dict__ = func.__dict__ - except: - pass return helper

1 0

r62604 - python/trunk/Lib/test/test_support.py
by benjamin.peterson April 30, 2008

April 30, 2008

Author: benjamin.peterson Date: Wed Apr 30 23:03:58 2008 New Revision: 62604 Log: make test_support's catch_warning a bit more robust when exceptions happen Modified: python/trunk/Lib/test/test_support.py Modified: python/trunk/Lib/test/test_support.py ============================================================================== --- python/trunk/Lib/test/test_support.py (original) +++ python/trunk/Lib/test/test_support.py Wed Apr 30 23:03:58 2008 @@ -482,8 +482,10 @@ import StringIO orig_stdout = getattr(sys, stream_name) setattr(sys, stream_name, StringIO.StringIO()) - yield getattr(sys, stream_name) - setattr(sys, stream_name, orig_stdout) + try: + yield getattr(sys, stream_name) + finally: + setattr(sys, stream_name, orig_stdout) def captured_stdout(): return captured_output("stdout")

1 0

buildbot failure in AMD64 W2k8 3.0
by buildbot＠python.org April 30, 2008

April 30, 2008

The Buildbot has detected a new failure of AMD64 W2k8 3.0. Full details are available at: http://www.python.org/dev/buildbot/all/AMD64%20W2k8%203.0/builds/214 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: nelson-win64 Build Reason: Build Source Stamp: [branch branches/py3k] HEAD Blamelist: georg.brandl BUILD FAILED: failed test Excerpt from the test logfile: 1 test failed: test_asynchat sincerely, -The Buildbot

1 0

buildbot failure in x86 XP-3 3.0
by buildbot＠python.org April 30, 2008

April 30, 2008

The Buildbot has detected a new failure of x86 XP-3 3.0. Full details are available at: http://www.python.org/dev/buildbot/all/x86%20XP-3%203.0/builds/819 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: heller-windows Build Reason: Build Source Stamp: [branch branches/py3k] HEAD Blamelist: georg.brandl BUILD FAILED: failed compile sincerely, -The Buildbot

1 0

Python Regression Test Failures opt (1)
by Neal Norwitz April 30, 2008

April 30, 2008

321 tests OK. 1 test failed: test_subprocess 32 tests skipped: test_aepack test_al test_applesingle test_bsddb185 test_bsddb3 test_cd test_cl test_curses test_epoll test_gl test_imageop test_imgfile test_ioctl test_kqueue test_lib2to3 test_linuxaudiodev test_macostools test_ossaudiodev test_pep277 test_py3kwarn test_scriptpackages test_socketserver test_startfile test_sunaudiodev test_tcl test_timeout test_unicode_file test_urllib2net test_urllibnet test_winreg test_winsound test_zipfile64 3 skips unexpected on linux2: test_epoll test_lib2to3 test_ioctl test_grammar test_opcodes test_dict test_builtin test_exceptions test_types test_unittest test_doctest test_doctest2 test_MimeWriter test_SimpleHTTPServer test_StringIO test___all__ test___future__ test__locale test_abc test_abstract_numbers test_aepack test_aepack skipped -- No module named aepack test_al test_al skipped -- No module named al test_anydbm test_applesingle test_applesingle skipped -- No module named macostools test_array test_ast test_asynchat test_asyncore test_atexit test_audioop test_augassign test_base64 test_bastion test_bigaddrspace test_bigmem test_binascii test_binhex test_binop test_bisect test_bool test_bsddb test_bsddb185 test_bsddb185 skipped -- No module named bsddb185 test_bsddb3 test_bsddb3 skipped -- Use of the `bsddb' resource not enabled test_buffer test_bufio test_bytes test_bz2 test_calendar test_call test_capi test_cd test_cd skipped -- No module named cd test_cfgparser test_cgi test_charmapcodec test_cl test_cl skipped -- No module named cl test_class test_cmath test_cmd test_cmd_line test_cmd_line_script test_code test_codeccallbacks test_codecencodings_cn test_codecencodings_hk test_codecencodings_jp test_codecencodings_kr test_codecencodings_tw test_codecmaps_cn test_codecmaps_hk test_codecmaps_jp test_codecmaps_kr test_codecmaps_tw test_codecs test_codeop test_coding test_coercion test_collections test_colorsys test_commands test_compare test_compile test_compiler test_complex test_complex_args test_contains test_contextlib test_cookie test_cookielib test_copy test_copy_reg test_cpickle test_cprofile test_crypt test_csv test_ctypes test_curses test_curses skipped -- Use of the `curses' resource not enabled test_datetime test_dbm test_decimal test_decorators test_defaultdict test_deque test_descr test_descrtut test_difflib test_dircache test_dis test_distutils [12729 refs] test_dl test_docxmlrpc test_dumbdbm test_dummy_thread test_dummy_threading test_email test_email_codecs test_email_renamed test_enumerate test_eof test_epoll test_epoll skipped -- kernel doesn't support epoll() test_errno test_exception_variations test_extcall test_fcntl test_file test_filecmp test_fileinput test_float test_fnmatch test_fork1 test_format test_fpformat test_fractions test_frozen test_ftplib test_funcattrs test_functools test_future test_future3 test_future4 test_future_builtins test_gc test_gdbm test_generators test_genericpath test_genexps test_getargs test_getargs2 test_getopt test_gettext test_gl test_gl skipped -- No module named gl test_glob test_global test_grp test_gzip test_hash test_hashlib test_heapq test_hmac test_hotshot test_htmllib test_htmlparser test_httplib test_imageop test_imageop skipped -- No module named imgfile test_imaplib test_imgfile test_imgfile skipped -- No module named imgfile test_imp test_import test_importhooks test_index test_inspect test_int_literal test_io test_ioctl test_ioctl skipped -- Unable to open /dev/tty test_isinstance test_iter test_iterlen test_itertools test_kqueue test_kqueue skipped -- test works only on BSD test_largefile test_lib2to3 test_lib2to3 skipped -- No module named tests test_linuxaudiodev test_linuxaudiodev skipped -- Use of the `audio' resource not enabled test_list test_locale test_logging test_long test_long_future test_longexp test_macostools test_macostools skipped -- No module named macostools test_macpath test_mailbox test_marshal test_math test_md5 test_mhlib test_mimetools test_mimetypes test_minidom test_mmap test_module test_modulefinder test_multibytecodec test_multibytecodec_support test_multifile test_mutants test_mutex test_netrc test_new test_nis test_normalization test_ntpath test_old_mailbox test_openpty test_operator test_optparse test_os test_ossaudiodev test_ossaudiodev skipped -- Use of the `audio' resource not enabled test_parser Expecting 's_push: parser stack overflow' in next line s_push: parser stack overflow test_peepholer test_pep247 test_pep263 test_pep277 test_pep277 skipped -- test works only on NT+ test_pep292 test_pep352 test_pickle test_pickletools test_pipes test_pkg test_pkgimport test_pkgutil test_platform test_plistlib test_poll test_popen [8535 refs] [8535 refs] [8535 refs] test_popen2 test_poplib test_posix test_posixpath test_pow test_pprint test_print test_profile test_profilehooks test_property test_pstats test_pty test_pwd test_py3kwarn test_py3kwarn skipped -- test.test_py3kwarn must be run with the -3 flag test_pyclbr test_pydoc test_pyexpat test_queue test_quopri [11049 refs] [11049 refs] test_random test_re test_repr test_resource test_rfc822 test_richcmp test_robotparser test_runpy test_sax test_scope test_scriptpackages test_scriptpackages skipped -- No module named aetools test_select test_set test_sets test_sgmllib test_sha test_shelve test_shlex test_shutil test_signal test_site test_slice test_smtplib test_socket test_socket_ssl test_socketserver test_socketserver skipped -- Use of the `network' resource not enabled test_softspace test_sort test_sqlite test_ssl test_startfile test_startfile skipped -- cannot import name startfile test_str test_strftime test_string test_stringprep test_strop test_strptime test_struct test_structmembers test_structseq test_subprocess [8530 refs] [8532 refs] [8530 refs] [8530 refs] [8530 refs] [8530 refs] [8530 refs] [8530 refs] [8530 refs] [8530 refs] [8532 refs] [10455 refs] [8748 refs] [8532 refs] Traceback (most recent call last): File "<string>", line 1, in <module> EOFError: EOF when reading a line [8530 refs] [8530 refs] [8530 refs] [8530 refs] [8530 refs] [8530 refs] . [8530 refs] [8530 refs] this bit of output is from a test of stdout in a different process ... [8530 refs] Traceback (most recent call last): File "<string>", line 1, in <module> EOFError: EOF when reading a line [8530 refs] [8530 refs] [8748 refs] test test_subprocess failed -- errors occurred; run in verbose mode for details test_sunaudiodev test_sunaudiodev skipped -- No module named sunaudiodev test_sundry test_symtable test_syntax test_sys [8530 refs] [8530 refs] test_tarfile test_tcl test_tcl skipped -- No module named _tkinter test_telnetlib test_tempfile [8535 refs] test_textwrap test_thread test_threaded_import test_threadedtempfile test_threading [11734 refs] [14670 refs] test_threading_local test_threadsignals test_time test_timeout test_timeout skipped -- Use of the `network' resource not enabled test_tokenize test_trace test_traceback test_transformer test_tuple test_typechecks test_ucn test_unary test_undocumented_details test_unicode test_unicode_file test_unicode_file skipped -- No Unicode filesystem semantics on this platform. test_unicodedata test_univnewlines test_unpack test_urllib test_urllib2 test_urllib2_localnet test_urllib2net test_urllib2net skipped -- Use of the `network' resource not enabled test_urllibnet test_urllibnet skipped -- Use of the `network' resource not enabled test_urlparse test_userdict test_userlist test_userstring test_uu test_uuid WARNING: uuid.getnode is unreliable on many platforms. It is disabled until the code and/or test can be fixed properly. WARNING: uuid._ifconfig_getnode is unreliable on many platforms. It is disabled until the code and/or test can be fixed properly. WARNING: uuid._unixdll_getnode is unreliable on many platforms. It is disabled until the code and/or test can be fixed properly. test_wait3 test_wait4 test_warnings test_wave test_weakref test_whichdb test_winreg test_winreg skipped -- No module named _winreg test_winsound test_winsound skipped -- No module named winsound test_with test_wsgiref test_xdrlib test_xml_etree test_xml_etree_c test_xmllib test_xmlrpc test_xpickle test_xrange test_zipfile test_zipfile64 test_zipfile64 skipped -- test requires loads of disk-space bytes and a long time to run test_zipimport test_zlib 321 tests OK. 1 test failed: test_subprocess 32 tests skipped: test_aepack test_al test_applesingle test_bsddb185 test_bsddb3 test_cd test_cl test_curses test_epoll test_gl test_imageop test_imgfile test_ioctl test_kqueue test_lib2to3 test_linuxaudiodev test_macostools test_ossaudiodev test_pep277 test_py3kwarn test_scriptpackages test_socketserver test_startfile test_sunaudiodev test_tcl test_timeout test_unicode_file test_urllib2net test_urllibnet test_winreg test_winsound test_zipfile64 3 skips unexpected on linux2: test_epoll test_lib2to3 test_ioctl [592112 refs]

1 0

Python Regression Test Failures basics (1)
by Neal Norwitz April 30, 2008

April 30, 2008

321 tests OK. 1 test failed: test_subprocess 32 tests skipped: test_aepack test_al test_applesingle test_bsddb185 test_bsddb3 test_cd test_cl test_curses test_epoll test_gl test_imageop test_imgfile test_ioctl test_kqueue test_lib2to3 test_linuxaudiodev test_macostools test_ossaudiodev test_pep277 test_py3kwarn test_scriptpackages test_socketserver test_startfile test_sunaudiodev test_tcl test_timeout test_unicode_file test_urllib2net test_urllibnet test_winreg test_winsound test_zipfile64 3 skips unexpected on linux2: test_epoll test_lib2to3 test_ioctl test_grammar test_opcodes test_dict test_builtin test_exceptions test_types test_unittest test_doctest test_doctest2 test_MimeWriter test_SimpleHTTPServer test_StringIO test___all__ test___future__ test__locale test_abc test_abstract_numbers test_aepack test_aepack skipped -- No module named aepack test_al test_al skipped -- No module named al test_anydbm test_applesingle test_applesingle skipped -- No module named macostools test_array test_ast test_asynchat test_asyncore test_atexit test_audioop test_augassign test_base64 test_bastion test_bigaddrspace test_bigmem test_binascii test_binhex test_binop test_bisect test_bool test_bsddb test_bsddb185 test_bsddb185 skipped -- No module named bsddb185 test_bsddb3 test_bsddb3 skipped -- Use of the `bsddb' resource not enabled test_buffer test_bufio test_bytes test_bz2 test_calendar test_call test_capi test_cd test_cd skipped -- No module named cd test_cfgparser test_cgi test_charmapcodec test_cl test_cl skipped -- No module named cl test_class test_cmath test_cmd test_cmd_line test_cmd_line_script test_code test_codeccallbacks test_codecencodings_cn test_codecencodings_hk test_codecencodings_jp test_codecencodings_kr test_codecencodings_tw test_codecmaps_cn test_codecmaps_hk test_codecmaps_jp test_codecmaps_kr test_codecmaps_tw test_codecs test_codeop test_coding test_coercion test_collections test_colorsys test_commands test_compare test_compile test_compiler test_complex test_complex_args test_contains test_contextlib test_cookie test_cookielib test_copy test_copy_reg test_cpickle test_cprofile test_crypt test_csv test_ctypes test_curses test_curses skipped -- Use of the `curses' resource not enabled test_datetime test_dbm test_decimal test_decorators test_defaultdict test_deque test_descr test_descrtut test_difflib test_dircache test_dis test_distutils test_dl test_docxmlrpc test_dumbdbm test_dummy_thread test_dummy_threading test_email test_email_codecs test_email_renamed test_enumerate test_eof test_epoll test_epoll skipped -- kernel doesn't support epoll() test_errno test_exception_variations test_extcall test_fcntl test_file test_filecmp test_fileinput test_float test_fnmatch test_fork1 test_format test_fpformat test_fractions test_frozen test_ftplib test_funcattrs test_functools test_future test_future3 test_future4 test_future_builtins test_gc test_gdbm test_generators test_genericpath test_genexps test_getargs test_getargs2 test_getopt test_gettext test_gl test_gl skipped -- No module named gl test_glob test_global test_grp test_gzip test_hash test_hashlib test_heapq test_hmac test_hotshot test_htmllib test_htmlparser test_httplib test_imageop test_imageop skipped -- No module named imgfile test_imaplib test_imgfile test_imgfile skipped -- No module named imgfile test_imp test_import test_importhooks test_index test_inspect test_int_literal test_io test_ioctl test_ioctl skipped -- Unable to open /dev/tty test_isinstance test_iter test_iterlen test_itertools test_kqueue test_kqueue skipped -- test works only on BSD test_largefile test_lib2to3 test_lib2to3 skipped -- No module named tests test_linuxaudiodev test_linuxaudiodev skipped -- Use of the `audio' resource not enabled test_list test_locale test_logging test_long test_long_future test_longexp test_macostools test_macostools skipped -- No module named macostools test_macpath test_mailbox test_marshal test_math test_md5 test_mhlib test_mimetools test_mimetypes test_minidom test_mmap test_module test_modulefinder test_multibytecodec test_multibytecodec_support test_multifile test_mutants test_mutex test_netrc test_new test_nis test_normalization test_ntpath test_old_mailbox test_openpty test_operator test_optparse test_os test_ossaudiodev test_ossaudiodev skipped -- Use of the `audio' resource not enabled test_parser Expecting 's_push: parser stack overflow' in next line s_push: parser stack overflow test_peepholer test_pep247 test_pep263 test_pep277 test_pep277 skipped -- test works only on NT+ test_pep292 test_pep352 test_pickle test_pickletools test_pipes test_pkg test_pkgimport test_pkgutil test_platform test_plistlib test_poll test_popen [8535 refs] [8535 refs] [8535 refs] test_popen2 test_poplib test_posix test_posixpath test_pow test_pprint test_print test_profile test_profilehooks test_property test_pstats test_pty test_pwd test_py3kwarn test_py3kwarn skipped -- test.test_py3kwarn must be run with the -3 flag test_pyclbr test_pydoc test_pyexpat test_queue test_quopri [11049 refs] [11049 refs] test_random test_re test_repr test_resource test_rfc822 test_richcmp test_robotparser test_runpy test_sax test_scope test_scriptpackages test_scriptpackages skipped -- No module named aetools test_select test_set test_sets test_sgmllib test_sha test_shelve test_shlex test_shutil test_signal test_site test_slice test_smtplib test_socket test_socket_ssl test_socketserver test_socketserver skipped -- Use of the `network' resource not enabled test_softspace test_sort test_sqlite test_ssl test_startfile test_startfile skipped -- cannot import name startfile test_str test_strftime test_string test_stringprep test_strop test_strptime test_struct test_structmembers test_structseq test_subprocess [8530 refs] [8532 refs] [8530 refs] [8530 refs] [8530 refs] [8530 refs] [8530 refs] [8530 refs] [8530 refs] [8530 refs] [8532 refs] [10455 refs] Traceback (most recent call last): File "<string>", line 1, in <module> EOFError: EOF when reading a line [8530 refs] [8748 refs] [8532 refs] [8530 refs] [8530 refs] [8530 refs] [8530 refs] [8530 refs] . [8530 refs] [8530 refs] this bit of output is from a test of stdout in a different process ... [8530 refs] Traceback (most recent call last): File "<string>", line 1, in <module> EOFError: EOF when reading a line [8530 refs] [8530 refs] [8748 refs] test test_subprocess failed -- errors occurred; run in verbose mode for details test_sunaudiodev test_sunaudiodev skipped -- No module named sunaudiodev test_sundry test_symtable test_syntax test_sys [8530 refs] [8530 refs] test_tarfile test_tcl test_tcl skipped -- No module named _tkinter test_telnetlib test_tempfile [8535 refs] test_textwrap test_thread test_threaded_import test_threadedtempfile test_threading [11734 refs] [15513 refs] test_threading_local test_threadsignals test_time test_timeout test_timeout skipped -- Use of the `network' resource not enabled test_tokenize test_trace test_traceback test_transformer test_tuple test_typechecks test_ucn test_unary test_undocumented_details test_unicode test_unicode_file test_unicode_file skipped -- No Unicode filesystem semantics on this platform. test_unicodedata test_univnewlines test_unpack test_urllib test_urllib2 test_urllib2_localnet test_urllib2net test_urllib2net skipped -- Use of the `network' resource not enabled test_urllibnet test_urllibnet skipped -- Use of the `network' resource not enabled test_urlparse test_userdict test_userlist test_userstring test_uu test_uuid WARNING: uuid.getnode is unreliable on many platforms. It is disabled until the code and/or test can be fixed properly. WARNING: uuid._ifconfig_getnode is unreliable on many platforms. It is disabled until the code and/or test can be fixed properly. WARNING: uuid._unixdll_getnode is unreliable on many platforms. It is disabled until the code and/or test can be fixed properly. test_wait3 test_wait4 test_warnings test_wave test_weakref test_whichdb test_winreg test_winreg skipped -- No module named _winreg test_winsound test_winsound skipped -- No module named winsound test_with test_wsgiref test_xdrlib test_xml_etree test_xml_etree_c test_xmllib test_xmlrpc test_xpickle test_xrange test_zipfile test_zipfile64 test_zipfile64 skipped -- test requires loads of disk-space bytes and a long time to run test_zipimport test_zlib 321 tests OK. 1 test failed: test_subprocess 32 tests skipped: test_aepack test_al test_applesingle test_bsddb185 test_bsddb3 test_cd test_cl test_curses test_epoll test_gl test_imageop test_imgfile test_ioctl test_kqueue test_lib2to3 test_linuxaudiodev test_macostools test_ossaudiodev test_pep277 test_py3kwarn test_scriptpackages test_socketserver test_startfile test_sunaudiodev test_tcl test_timeout test_unicode_file test_urllib2net test_urllibnet test_winreg test_winsound test_zipfile64 3 skips unexpected on linux2: test_epoll test_lib2to3 test_ioctl [592620 refs]

1 0

r62602 - python/trunk/Doc/c-api/typeobj.rst
by georg.brandl April 30, 2008

April 30, 2008

Author: georg.brandl Date: Wed Apr 30 22:02:37 2008 New Revision: 62602 Log: #2727: clarify tp_iternext docs. Modified: python/trunk/Doc/c-api/typeobj.rst Modified: python/trunk/Doc/c-api/typeobj.rst ============================================================================== --- python/trunk/Doc/c-api/typeobj.rst (original) +++ python/trunk/Doc/c-api/typeobj.rst Wed Apr 30 22:02:37 2008 @@ -753,11 +753,12 @@ .. cmember:: iternextfunc PyTypeObject.tp_iternext - An optional pointer to a function that returns the next item in an iterator, or - raises :exc:`StopIteration` when the iterator is exhausted. Its presence - normally signals that the instances of this type are iterators (although classic - instances always have this function, even if they don't define a :meth:`next` - method). + An optional pointer to a function that returns the next item in an iterator. + When the iterator is exhausted, it must return *NULL*; a :exc:`StopIteration` + exception may or may not be set. When another error occurs, it must return + *NULL* too. Its presence normally signals that the instances of this type + are iterators (although classic instances always have this function, even if + they don't define a :meth:`next` method). Iterator types should also define the :attr:`tp_iter` function, and that function should return the iterator instance itself (not a new iterator

1 0

r62601 - in sandbox/trunk/ttk-gsoc: Doc/library/ttk.rst Lib/lib-tk/Ttk.py
by guilherme.polo April 30, 2008

April 30, 2008

Author: guilherme.polo Date: Wed Apr 30 21:54:13 2008 New Revision: 62601 Log: Improved Style's map wrapping and documented it Modified: sandbox/trunk/ttk-gsoc/Doc/library/ttk.rst sandbox/trunk/ttk-gsoc/Lib/lib-tk/Ttk.py Modified: sandbox/trunk/ttk-gsoc/Doc/library/ttk.rst ============================================================================== --- sandbox/trunk/ttk-gsoc/Doc/library/ttk.rst (original) +++ sandbox/trunk/ttk-gsoc/Doc/library/ttk.rst Wed Apr 30 21:54:13 2008 @@ -183,6 +183,47 @@ .. class:: Style + .. method:: map(style, **kw) + + Sets dynamic values of the specified option(s) in *style*. + + Each key in *kw* is an option and each value should be a sequence. + Each of these sequences have to have a state, or a group of states, + and a value, grouped in yet another sequence. Note that a group of + states is expected to be a sequence, otherwise a single string should be + passed as state. + + An example may make it more understandable:: + + import Tkinter + import Ttk + + root = Tkinter.Tk() + + style = Ttk.Style() + style.map("C.TButton", + foreground=[('pressed', 'red'), + ('active', 'blue')], + background=[(('pressed', '!disabled'), 'black'), + ('active', 'white')] + ) + + colored_btn = Ttk.Button(text="Test", style="C.TButton").pack() + + root.mainloop() + + + There are two things to note in this previous short example: + + * The order of the (state, value) sequences for an option does matter, + if you changed the order to [('active', 'blue'), ('pressed', 'red')] + for the foreground, for example, you would get a blue foreground when + the widget were in active or pressed states. + * In the background option, (('pressed', '!disabled'), 'black') was + especified for grouping the states 'pressed' and '!disabled', but it + has no different effect than using just 'pressed' for this example, + this was done just to explain the documentation. + Others new features ------------------- Modified: sandbox/trunk/ttk-gsoc/Lib/lib-tk/Ttk.py ============================================================================== --- sandbox/trunk/ttk-gsoc/Lib/lib-tk/Ttk.py (original) +++ sandbox/trunk/ttk-gsoc/Lib/lib-tk/Ttk.py Wed Apr 30 21:54:13 2008 @@ -63,9 +63,29 @@ return self.tk.call(self._name, "configure", style, *opts) - def map(self, style, statespec): - # XXX Missing docstring - self.tk.call(self._name, "map", style, statespec) + def map(self, style, **kw): + """Sets dynamic values of the specified option(s) in given style.""" + opts = [] + + # format kw to pass it to tk + for opt, value in kw.iteritems(): + + opt_val = [] + # each value in kw is expected to be a sequence, where each item + # is a another sequence containg a state (or several) and a value + # for it + for state, val in value: + if not isinstance(state, basestring): + # lets believe it is a sequence and format these multiple + # states according to Tk documentation + state = "{%s}" % ' '.join(state) + + opt_val.append("%s %s" % (state, val)) + + opts.append(("-%s" % opt, ' '.join(opt_val))) + + opts = Tkinter._flatten(opts) + self.tk.call(self._name, "map", style, *opts) def lookup(self, style, option, state=None, default=None):

1 0

r62599 - in python/trunk: Doc/library/functions.rst Lib/test/test_builtin.py Misc/NEWS Python/bltinmodule.c
by georg.brandl April 30, 2008

April 30, 2008

Author: georg.brandl Date: Wed Apr 30 21:47:09 2008 New Revision: 62599 Log: #2719: backport next() from 3k. Modified: python/trunk/Doc/library/functions.rst python/trunk/Lib/test/test_builtin.py python/trunk/Misc/NEWS python/trunk/Python/bltinmodule.c Modified: python/trunk/Doc/library/functions.rst ============================================================================== --- python/trunk/Doc/library/functions.rst (original) +++ python/trunk/Doc/library/functions.rst Wed Apr 30 21:47:09 2008 @@ -710,6 +710,15 @@ Added support for the optional *key* argument. +.. function:: next(iterator[, default]) + + Retrieve the next item from the *iterator* by calling its :meth:`next` + method. If *default* is given, it is returned if the iterator is exhausted, + otherwise :exc:`StopIteration` is raised. + + .. versionadded:: 2.6 + + .. function:: object() Return a new featureless object. :class:`object` is a base for all new style Modified: python/trunk/Lib/test/test_builtin.py ============================================================================== --- python/trunk/Lib/test/test_builtin.py (original) +++ python/trunk/Lib/test/test_builtin.py Wed Apr 30 21:47:09 2008 @@ -1539,6 +1539,33 @@ self.assertEqual(min(data, key=f), sorted(data, key=f)[0]) + def test_next(self): + it = iter(range(2)) + self.assertEqual(next(it), 0) + self.assertEqual(next(it), 1) + self.assertRaises(StopIteration, next, it) + self.assertRaises(StopIteration, next, it) + self.assertEquals(next(it, 42), 42) + + class Iter(object): + def __iter__(self): + return self + def next(self): + raise StopIteration + + it = iter(Iter()) + self.assertEquals(next(it, 42), 42) + self.assertRaises(StopIteration, next, it) + + def gen(): + yield 1 + return + + it = gen() + self.assertEquals(next(it), 1) + self.assertRaises(StopIteration, next, it) + self.assertEquals(next(it, 42), 42) + def test_oct(self): self.assertEqual(oct(100), '0144') self.assertEqual(oct(100L), '0144L') Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Wed Apr 30 21:47:09 2008 @@ -12,6 +12,8 @@ Core and builtins ----------------- +- Issue #2719: backported the ``next()`` builtin from Python 3. + - Issue #2681: The octal literal ``0o8`` was incorrecly acctepted. Now it properly raises a SyntaxError. Modified: python/trunk/Python/bltinmodule.c ============================================================================== --- python/trunk/Python/bltinmodule.c (original) +++ python/trunk/Python/bltinmodule.c Wed Apr 30 21:47:09 2008 @@ -1071,6 +1071,47 @@ static PyObject * +builtin_next(PyObject *self, PyObject *args) +{ + PyObject *it, *res; + PyObject *def = NULL; + + if (!PyArg_UnpackTuple(args, "next", 1, 2, &it, &def)) + return NULL; + if (!PyIter_Check(it)) { + PyErr_Format(PyExc_TypeError, + "%.200s object is not an iterator", + it->ob_type->tp_name); + return NULL; + } + + res = (*it->ob_type->tp_iternext)(it); + if (res != NULL) { + return res; + } else if (def != NULL) { + if (PyErr_Occurred()) { + if (!PyErr_ExceptionMatches(PyExc_StopIteration)) + return NULL; + PyErr_Clear(); + } + Py_INCREF(def); + return def; + } else if (PyErr_Occurred()) { + return NULL; + } else { + PyErr_SetNone(PyExc_StopIteration); + return NULL; + } +} + +PyDoc_STRVAR(next_doc, +"next(iterator[, default])\n\ +\n\ +Return the next item from the iterator. If default is given and the iterator\n\ +is exhausted, it is returned instead of raising StopIteration."); + + +static PyObject * builtin_setattr(PyObject *self, PyObject *args) { PyObject *v; @@ -2509,6 +2550,7 @@ {"map", builtin_map, METH_VARARGS, map_doc}, {"max", (PyCFunction)builtin_max, METH_VARARGS | METH_KEYWORDS, max_doc}, {"min", (PyCFunction)builtin_min, METH_VARARGS | METH_KEYWORDS, min_doc}, + {"next", builtin_next, METH_VARARGS, next_doc}, {"oct", builtin_oct, METH_O, oct_doc}, {"open", (PyCFunction)builtin_open, METH_VARARGS | METH_KEYWORDS, open_doc}, {"ord", builtin_ord, METH_O, ord_doc},

1 0

r62596 - sandbox/trunk/ttk-gsoc/Doc/library/ttk.rst
by guilherme.polo April 30, 2008

April 30, 2008

Author: guilherme.polo Date: Wed Apr 30 19:02:04 2008 New Revision: 62596 Log: Not sure what I had in mind when I set the style of a Label to the style of a Button, the example is corrected now. Modified: sandbox/trunk/ttk-gsoc/Doc/library/ttk.rst Modified: sandbox/trunk/ttk-gsoc/Doc/library/ttk.rst ============================================================================== --- sandbox/trunk/ttk-gsoc/Doc/library/ttk.rst (original) +++ sandbox/trunk/ttk-gsoc/Doc/library/ttk.rst Wed Apr 30 19:02:04 2008 @@ -76,10 +76,10 @@ Ttk code:: style = Ttk.Style() - style.configure("BW.TButton", foreground="black", background="white") + style.configure("BW.TLabel", foreground="black", background="white") - l1 = Ttk.Label(text="Test", style="BW.TButton") - l2 = Ttk.Label(text="Test", style="BW.TButton") + l1 = Ttk.Label(text="Test", style="BW.TLabel") + l2 = Ttk.Label(text="Test", style="BW.TLabel") .. class:: Widget

1 0