[Python-checkins] r55972 - in python/branches/cpy_merge: Doc/api/exceptions.tex Doc/lib/libctypes.tex Doc/lib/libdecimal.tex Doc/lib/libexcs.tex Doc/lib/libftplib.tex Doc/lib/libfuncs.tex Doc/lib/libhttplib.tex Doc/lib/libpoplib.tex Doc/lib/libsmtplib.tex Doc/lib/libsocket.tex Doc/lib/libtelnetlib.tex Doc/lib/libthreading.tex Doc/lib/liburllib2.tex Doc/ref/ref2.tex Doc/ref/ref3.tex Doc/tut/tut.tex Doc/whatsnew/whatsnew26.tex Include/abstract.h Include/longobject.h Include/object.h Include/pyerrors.h Include/pyport.h Lib/CGIHTTPServer.py Lib/_strptime.py Lib/anydbm.py Lib/bsddb/__init__.py Lib/bsddb/dbshelve.py Lib/bsddb/dbtables.py Lib/bsddb/test/test_1413192.py Lib/bsddb/test/test_basics.py Lib/bsddb/test/test_env_close.py Lib/bsddb/test/test_sequence.py Lib/cgitb.py Lib/collections.py Lib/copy.py Lib/ctypes/__init__.py Lib/ctypes/_endian.py Lib/ctypes/test/test_init.py Lib/ctypes/test/test_numbers.py Lib/dbhash.py Lib/dis.py Lib/distutils/ccompiler.py Lib/distutils/cmd.py Lib/distutils/command/build_py.py Lib/distutils/command/build_scripts.py Lib/distutils/command/install_scripts.py Lib/distutils/command/register.py Lib/distutils/dir_util.py Lib/distutils/dist.py Lib/distutils/extension.py Lib/distutils/mwerkscompiler.py Lib/distutils/tests/support.py Lib/distutils/tests/test_build_py.py Lib/distutils/text_file.py Lib/distutils/unixccompiler.py Lib/dumbdbm.py Lib/encodings/uu_codec.py Lib/ftplib.py Lib/idlelib/CallTips.py Lib/idlelib/ObjectBrowser.py Lib/idlelib/rpc.py Lib/imputil.py Lib/inspect.py Lib/lib-tk/ScrolledText.py Lib/lib-tk/Tkinter.py Lib/logging/__init__.py Lib/logging/config.py Lib/logging/handlers.py Lib/mailbox.py Lib/mhlib.py Lib/new.py Lib/optparse.py Lib/os.py Lib/pickle.py Lib/pickletools.py Lib/plat-atheos/IN.py Lib/plat-mac/aepack.py Lib/plat-mac/aetypes.py Lib/plat-mac/bundlebuilder.py Lib/plat-mac/gensuitemodule.py Lib/plat-mac/macostools.py Lib/plat-mac/plistlib.py Lib/plat-sunos5/IN.py Lib/plat-sunos5/STROPTS.py Lib/plat-unixware7/IN.py Lib/plat-unixware7/STROPTS.py Lib/platform.py Lib/pty.py Lib/pydoc.py Lib/random.py Lib/repr.py Lib/sqlite3/test/dbapi.py Lib/sre_parse.py Lib/stat.py Lib/string.py Lib/subprocess.py Lib/tarfile.py Lib/tempfile.py Lib/test/exception_hierarchy.txt Lib/test/list_tests.py Lib/test/output/test_class Lib/test/output/test_tokenize Lib/test/regrtest.py Lib/test/string_tests.py Lib/test/test_array.py Lib/test/test_builtin.py Lib/test/test_bytes.py Lib/test/test_cgi.py Lib/test/test_class.py Lib/test/test_collections.py Lib/test/test_compile.py Lib/test/test_descr.py Lib/test/test_dumbdbm.py Lib/test/test_format.py Lib/test/test_grammar.py Lib/test/test_hexoct.py Lib/test/test_isinstance.py Lib/test/test_list.py Lib/test/test_logging.py Lib/test/test_long.py Lib/test/test_multibytecodec.py Lib/test/test_optparse.py Lib/test/test_peepholer.py Lib/test/test_pep352.py Lib/test/test_pyclbr.py Lib/test/test_repr.py Lib/test/test_str.py Lib/test/test_strptime.py Lib/test/test_structmembers.py Lib/test/test_subprocess.py Lib/test/test_sundry.py Lib/test/test_tarfile.py Lib/test/test_tempfile.py Lib/test/test_threading.py Lib/test/test_tuple.py Lib/test/test_unicode.py Lib/test/test_unicode_file.py Lib/test/test_unittest.py Lib/test/test_urllib2.py Lib/test/test_urllib2net.py Lib/test/test_userlist.py Lib/test/test_uu.py Lib/test/test_weakref.py Lib/test/test_xmlrpc.py Lib/test/test_zipimport.py Lib/test/tf_inherit_check.py Lib/test/tokenize_tests.txt Lib/threading.py Lib/tokenize.py Lib/types.py Lib/unittest.py Lib/urllib2.py Lib/uu.py Lib/warnings.py Lib/weakref.py Lib/wsgiref/headers.py Lib/wsgiref/validate.py Lib/xml/dom/domreg.py Lib/xml/sax/saxutils.py Lib/xmlrpclib.py Misc/ACKS Misc/NEWS Misc/Vim/python.vim Misc/build.sh Misc/cheatsheet Misc/python-mode.el Misc/valgrind-python.supp Modules/_bsddb.c Modules/_ctypes/_ctypes.c Modules/_ctypes/callbacks.c Modules/_ctypes/callproc.c Modules/_ctypes/cfield.c Modules/_ctypes/ctypes.h Modules/_ctypes/libffi/src/x86/ffi.c Modules/_ctypes/libffi/src/x86/ffi64.c Modules/_ctypes/stgdict.c Modules/_sqlite/cache.c Modules/_sqlite/module.c Modules/_testcapimodule.c Modules/cjkcodecs/multibytecodec.c Modules/getbuildinfo.c Modules/socketmodule.c Objects/abstract.c Objects/bufferobject.c Objects/exceptions.c Objects/intobject.c Objects/longobject.c Objects/stringobject.c Objects/typeobject.c Objects/unicodeobject.c PC/os2emx/python25.def PC/os2vacpp/python.def PC/pyconfig.h PCbuild/_bsddb.vcproj PCbuild/_ssl.mak PCbuild/build_ssl.bat PCbuild/build_ssl.py PCbuild/pcbuild.sln Parser/tokenizer.c Python/ast.c Python/bltinmodule.c Python/compile.c Python/mystrtoul.c Python/peephole.c Python/structmember.c Python/symtable.c README Tools/i18n/msgfmt.py Tools/pybench/Arithmetic.py Tools/pybench/CommandLine.py Tools/pybench/Numbers.py Tools/pybench/systimes.py Tools/scripts/classfix.py Tools/scripts/fixcid.py Tools/scripts/ftpmirror.py Tools/scripts/linktree.py Tools/scripts/methfix.py Tools/scripts/pathfix.py Tools/scripts/reindent.py Tools/scripts/which.py Tools/unicode/makeunicodedata.py Tools/versioncheck/pyversioncheck.py Tools/webchecker/websucker.py configure configure.in setup.py
alexandre.vassalotti
python-checkins at python.org
Thu Jun 14 21:07:57 CEST 2007
Author: alexandre.vassalotti
Date: Thu Jun 14 21:06:29 2007
New Revision: 55972
Modified:
python/branches/cpy_merge/Doc/api/exceptions.tex
python/branches/cpy_merge/Doc/lib/libctypes.tex
python/branches/cpy_merge/Doc/lib/libdecimal.tex
python/branches/cpy_merge/Doc/lib/libexcs.tex
python/branches/cpy_merge/Doc/lib/libftplib.tex
python/branches/cpy_merge/Doc/lib/libfuncs.tex
python/branches/cpy_merge/Doc/lib/libhttplib.tex
python/branches/cpy_merge/Doc/lib/libpoplib.tex
python/branches/cpy_merge/Doc/lib/libsmtplib.tex
python/branches/cpy_merge/Doc/lib/libsocket.tex
python/branches/cpy_merge/Doc/lib/libtelnetlib.tex
python/branches/cpy_merge/Doc/lib/libthreading.tex
python/branches/cpy_merge/Doc/lib/liburllib2.tex
python/branches/cpy_merge/Doc/ref/ref2.tex
python/branches/cpy_merge/Doc/ref/ref3.tex
python/branches/cpy_merge/Doc/tut/tut.tex
python/branches/cpy_merge/Doc/whatsnew/whatsnew26.tex
python/branches/cpy_merge/Include/abstract.h
python/branches/cpy_merge/Include/longobject.h
python/branches/cpy_merge/Include/object.h
python/branches/cpy_merge/Include/pyerrors.h
python/branches/cpy_merge/Include/pyport.h
python/branches/cpy_merge/Lib/CGIHTTPServer.py
python/branches/cpy_merge/Lib/_strptime.py
python/branches/cpy_merge/Lib/anydbm.py
python/branches/cpy_merge/Lib/bsddb/__init__.py
python/branches/cpy_merge/Lib/bsddb/dbshelve.py
python/branches/cpy_merge/Lib/bsddb/dbtables.py
python/branches/cpy_merge/Lib/bsddb/test/test_1413192.py
python/branches/cpy_merge/Lib/bsddb/test/test_basics.py
python/branches/cpy_merge/Lib/bsddb/test/test_env_close.py
python/branches/cpy_merge/Lib/bsddb/test/test_sequence.py
python/branches/cpy_merge/Lib/cgitb.py
python/branches/cpy_merge/Lib/collections.py
python/branches/cpy_merge/Lib/copy.py
python/branches/cpy_merge/Lib/ctypes/__init__.py
python/branches/cpy_merge/Lib/ctypes/_endian.py
python/branches/cpy_merge/Lib/ctypes/test/test_init.py
python/branches/cpy_merge/Lib/ctypes/test/test_numbers.py
python/branches/cpy_merge/Lib/dbhash.py
python/branches/cpy_merge/Lib/dis.py
python/branches/cpy_merge/Lib/distutils/ccompiler.py
python/branches/cpy_merge/Lib/distutils/cmd.py
python/branches/cpy_merge/Lib/distutils/command/build_py.py
python/branches/cpy_merge/Lib/distutils/command/build_scripts.py
python/branches/cpy_merge/Lib/distutils/command/install_scripts.py
python/branches/cpy_merge/Lib/distutils/command/register.py
python/branches/cpy_merge/Lib/distutils/dir_util.py
python/branches/cpy_merge/Lib/distutils/dist.py
python/branches/cpy_merge/Lib/distutils/extension.py
python/branches/cpy_merge/Lib/distutils/mwerkscompiler.py
python/branches/cpy_merge/Lib/distutils/tests/support.py
python/branches/cpy_merge/Lib/distutils/tests/test_build_py.py
python/branches/cpy_merge/Lib/distutils/text_file.py
python/branches/cpy_merge/Lib/distutils/unixccompiler.py
python/branches/cpy_merge/Lib/dumbdbm.py
python/branches/cpy_merge/Lib/encodings/uu_codec.py
python/branches/cpy_merge/Lib/ftplib.py
python/branches/cpy_merge/Lib/idlelib/CallTips.py
python/branches/cpy_merge/Lib/idlelib/ObjectBrowser.py
python/branches/cpy_merge/Lib/idlelib/rpc.py
python/branches/cpy_merge/Lib/imputil.py
python/branches/cpy_merge/Lib/inspect.py
python/branches/cpy_merge/Lib/lib-tk/ScrolledText.py
python/branches/cpy_merge/Lib/lib-tk/Tkinter.py
python/branches/cpy_merge/Lib/logging/__init__.py
python/branches/cpy_merge/Lib/logging/config.py
python/branches/cpy_merge/Lib/logging/handlers.py
python/branches/cpy_merge/Lib/mailbox.py
python/branches/cpy_merge/Lib/mhlib.py
python/branches/cpy_merge/Lib/new.py
python/branches/cpy_merge/Lib/optparse.py
python/branches/cpy_merge/Lib/os.py
python/branches/cpy_merge/Lib/pickle.py
python/branches/cpy_merge/Lib/pickletools.py
python/branches/cpy_merge/Lib/plat-atheos/IN.py
python/branches/cpy_merge/Lib/plat-mac/aepack.py
python/branches/cpy_merge/Lib/plat-mac/aetypes.py
python/branches/cpy_merge/Lib/plat-mac/bundlebuilder.py
python/branches/cpy_merge/Lib/plat-mac/gensuitemodule.py
python/branches/cpy_merge/Lib/plat-mac/macostools.py
python/branches/cpy_merge/Lib/plat-mac/plistlib.py
python/branches/cpy_merge/Lib/plat-sunos5/IN.py
python/branches/cpy_merge/Lib/plat-sunos5/STROPTS.py
python/branches/cpy_merge/Lib/plat-unixware7/IN.py
python/branches/cpy_merge/Lib/plat-unixware7/STROPTS.py
python/branches/cpy_merge/Lib/platform.py
python/branches/cpy_merge/Lib/pty.py
python/branches/cpy_merge/Lib/pydoc.py
python/branches/cpy_merge/Lib/random.py
python/branches/cpy_merge/Lib/repr.py
python/branches/cpy_merge/Lib/sqlite3/test/dbapi.py
python/branches/cpy_merge/Lib/sre_parse.py
python/branches/cpy_merge/Lib/stat.py
python/branches/cpy_merge/Lib/string.py
python/branches/cpy_merge/Lib/subprocess.py
python/branches/cpy_merge/Lib/tarfile.py
python/branches/cpy_merge/Lib/tempfile.py
python/branches/cpy_merge/Lib/test/exception_hierarchy.txt
python/branches/cpy_merge/Lib/test/list_tests.py
python/branches/cpy_merge/Lib/test/output/test_class
python/branches/cpy_merge/Lib/test/output/test_tokenize
python/branches/cpy_merge/Lib/test/regrtest.py
python/branches/cpy_merge/Lib/test/string_tests.py
python/branches/cpy_merge/Lib/test/test_array.py
python/branches/cpy_merge/Lib/test/test_builtin.py
python/branches/cpy_merge/Lib/test/test_bytes.py
python/branches/cpy_merge/Lib/test/test_cgi.py
python/branches/cpy_merge/Lib/test/test_class.py
python/branches/cpy_merge/Lib/test/test_collections.py
python/branches/cpy_merge/Lib/test/test_compile.py
python/branches/cpy_merge/Lib/test/test_descr.py
python/branches/cpy_merge/Lib/test/test_dumbdbm.py
python/branches/cpy_merge/Lib/test/test_format.py
python/branches/cpy_merge/Lib/test/test_grammar.py
python/branches/cpy_merge/Lib/test/test_hexoct.py
python/branches/cpy_merge/Lib/test/test_isinstance.py
python/branches/cpy_merge/Lib/test/test_list.py
python/branches/cpy_merge/Lib/test/test_logging.py
python/branches/cpy_merge/Lib/test/test_long.py
python/branches/cpy_merge/Lib/test/test_multibytecodec.py
python/branches/cpy_merge/Lib/test/test_optparse.py
python/branches/cpy_merge/Lib/test/test_peepholer.py
python/branches/cpy_merge/Lib/test/test_pep352.py
python/branches/cpy_merge/Lib/test/test_pyclbr.py
python/branches/cpy_merge/Lib/test/test_repr.py
python/branches/cpy_merge/Lib/test/test_str.py
python/branches/cpy_merge/Lib/test/test_strptime.py
python/branches/cpy_merge/Lib/test/test_structmembers.py
python/branches/cpy_merge/Lib/test/test_subprocess.py
python/branches/cpy_merge/Lib/test/test_sundry.py
python/branches/cpy_merge/Lib/test/test_tarfile.py
python/branches/cpy_merge/Lib/test/test_tempfile.py
python/branches/cpy_merge/Lib/test/test_threading.py
python/branches/cpy_merge/Lib/test/test_tuple.py
python/branches/cpy_merge/Lib/test/test_unicode.py
python/branches/cpy_merge/Lib/test/test_unicode_file.py
python/branches/cpy_merge/Lib/test/test_unittest.py
python/branches/cpy_merge/Lib/test/test_urllib2.py
python/branches/cpy_merge/Lib/test/test_urllib2net.py
python/branches/cpy_merge/Lib/test/test_userlist.py
python/branches/cpy_merge/Lib/test/test_uu.py
python/branches/cpy_merge/Lib/test/test_weakref.py
python/branches/cpy_merge/Lib/test/test_xmlrpc.py
python/branches/cpy_merge/Lib/test/test_zipimport.py
python/branches/cpy_merge/Lib/test/tf_inherit_check.py
python/branches/cpy_merge/Lib/test/tokenize_tests.txt
python/branches/cpy_merge/Lib/threading.py
python/branches/cpy_merge/Lib/tokenize.py
python/branches/cpy_merge/Lib/types.py
python/branches/cpy_merge/Lib/unittest.py
python/branches/cpy_merge/Lib/urllib2.py
python/branches/cpy_merge/Lib/uu.py
python/branches/cpy_merge/Lib/warnings.py
python/branches/cpy_merge/Lib/weakref.py
python/branches/cpy_merge/Lib/wsgiref/headers.py
python/branches/cpy_merge/Lib/wsgiref/validate.py
python/branches/cpy_merge/Lib/xml/dom/domreg.py
python/branches/cpy_merge/Lib/xml/sax/saxutils.py
python/branches/cpy_merge/Lib/xmlrpclib.py
python/branches/cpy_merge/Misc/ACKS
python/branches/cpy_merge/Misc/NEWS
python/branches/cpy_merge/Misc/Vim/python.vim
python/branches/cpy_merge/Misc/build.sh
python/branches/cpy_merge/Misc/cheatsheet
python/branches/cpy_merge/Misc/python-mode.el
python/branches/cpy_merge/Misc/valgrind-python.supp
python/branches/cpy_merge/Modules/_bsddb.c
python/branches/cpy_merge/Modules/_ctypes/_ctypes.c
python/branches/cpy_merge/Modules/_ctypes/callbacks.c
python/branches/cpy_merge/Modules/_ctypes/callproc.c
python/branches/cpy_merge/Modules/_ctypes/cfield.c
python/branches/cpy_merge/Modules/_ctypes/ctypes.h
python/branches/cpy_merge/Modules/_ctypes/libffi/src/x86/ffi.c
python/branches/cpy_merge/Modules/_ctypes/libffi/src/x86/ffi64.c
python/branches/cpy_merge/Modules/_ctypes/stgdict.c
python/branches/cpy_merge/Modules/_sqlite/cache.c
python/branches/cpy_merge/Modules/_sqlite/module.c
python/branches/cpy_merge/Modules/_testcapimodule.c
python/branches/cpy_merge/Modules/cjkcodecs/multibytecodec.c
python/branches/cpy_merge/Modules/getbuildinfo.c
python/branches/cpy_merge/Modules/socketmodule.c
python/branches/cpy_merge/Objects/abstract.c
python/branches/cpy_merge/Objects/bufferobject.c
python/branches/cpy_merge/Objects/exceptions.c
python/branches/cpy_merge/Objects/intobject.c
python/branches/cpy_merge/Objects/longobject.c
python/branches/cpy_merge/Objects/stringobject.c
python/branches/cpy_merge/Objects/typeobject.c
python/branches/cpy_merge/Objects/unicodeobject.c
python/branches/cpy_merge/PC/os2emx/python25.def
python/branches/cpy_merge/PC/os2vacpp/python.def
python/branches/cpy_merge/PC/pyconfig.h
python/branches/cpy_merge/PCbuild/_bsddb.vcproj
python/branches/cpy_merge/PCbuild/_ssl.mak
python/branches/cpy_merge/PCbuild/build_ssl.bat
python/branches/cpy_merge/PCbuild/build_ssl.py
python/branches/cpy_merge/PCbuild/pcbuild.sln
python/branches/cpy_merge/Parser/tokenizer.c
python/branches/cpy_merge/Python/ast.c
python/branches/cpy_merge/Python/bltinmodule.c
python/branches/cpy_merge/Python/compile.c
python/branches/cpy_merge/Python/mystrtoul.c
python/branches/cpy_merge/Python/peephole.c
python/branches/cpy_merge/Python/structmember.c
python/branches/cpy_merge/Python/symtable.c
python/branches/cpy_merge/README
python/branches/cpy_merge/Tools/i18n/msgfmt.py
python/branches/cpy_merge/Tools/pybench/Arithmetic.py
python/branches/cpy_merge/Tools/pybench/CommandLine.py
python/branches/cpy_merge/Tools/pybench/Numbers.py
python/branches/cpy_merge/Tools/pybench/systimes.py
python/branches/cpy_merge/Tools/scripts/classfix.py
python/branches/cpy_merge/Tools/scripts/fixcid.py
python/branches/cpy_merge/Tools/scripts/ftpmirror.py
python/branches/cpy_merge/Tools/scripts/linktree.py
python/branches/cpy_merge/Tools/scripts/methfix.py
python/branches/cpy_merge/Tools/scripts/pathfix.py
python/branches/cpy_merge/Tools/scripts/reindent.py (props changed)
python/branches/cpy_merge/Tools/scripts/which.py
python/branches/cpy_merge/Tools/unicode/makeunicodedata.py
python/branches/cpy_merge/Tools/versioncheck/pyversioncheck.py
python/branches/cpy_merge/Tools/webchecker/websucker.py
python/branches/cpy_merge/configure
python/branches/cpy_merge/configure.in
python/branches/cpy_merge/setup.py
Log:
Merged revisions 55756-55971 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55794 | guido.van.rossum | 2007-06-06 18:29:22 -0400 (Wed, 06 Jun 2007) | 3 lines
Make this compile in GCC 2.96, which does not allow interspersing
declarations and code.
................
r55797 | neal.norwitz | 2007-06-07 03:00:57 -0400 (Thu, 07 Jun 2007) | 3 lines
Get rid of some remnants of classic classes. types.ClassType == type.
Also get rid of almost all uses of the types module and use the builtin name.
................
r55798 | neal.norwitz | 2007-06-07 03:12:36 -0400 (Thu, 07 Jun 2007) | 1 line
Remove a use of types, verify commit hook works
................
r55809 | guido.van.rossum | 2007-06-07 14:11:29 -0400 (Thu, 07 Jun 2007) | 2 lines
Fix syntax error introduced by Neal in last checkin.
................
r55837 | guido.van.rossum | 2007-06-08 19:04:42 -0400 (Fri, 08 Jun 2007) | 2 lines
PEP 3119 -- the abc module.
................
r55838 | guido.van.rossum | 2007-06-08 20:38:55 -0400 (Fri, 08 Jun 2007) | 2 lines
Implement part of PEP 3119 -- One Trick Ponies.
................
r55847 | guido.van.rossum | 2007-06-09 11:28:06 -0400 (Sat, 09 Jun 2007) | 2 lines
Different way to do one trick ponies, allowing registration (per PEP strawman).
................
r55849 | guido.van.rossum | 2007-06-09 21:06:38 -0400 (Sat, 09 Jun 2007) | 3 lines
Make sure that the magic looking for __hash__ (etc.) doesn't apply to
real subclasses of Hashable.
................
r55852 | guido.van.rossum | 2007-06-10 11:29:51 -0400 (Sun, 10 Jun 2007) | 2 lines
Add some more examples, e.g. generators and dict views.
................
r55853 | guido.van.rossum | 2007-06-10 11:31:59 -0400 (Sun, 10 Jun 2007) | 2 lines
keys() and items() *are* containers -- just values() isn't.
................
r55864 | georg.brandl | 2007-06-10 18:29:40 -0400 (Sun, 10 Jun 2007) | 2 lines
PEP 3127: new octal literals, binary literals.
................
r55865 | georg.brandl | 2007-06-10 18:31:37 -0400 (Sun, 10 Jun 2007) | 2 lines
Some octal literal fixes in Tools.
................
r55866 | georg.brandl | 2007-06-10 18:37:43 -0400 (Sun, 10 Jun 2007) | 2 lines
Tokenizer changes for PEP 3127.
................
r55867 | georg.brandl | 2007-06-10 18:37:55 -0400 (Sun, 10 Jun 2007) | 2 lines
Some docs for PEP 3127.
................
r55868 | georg.brandl | 2007-06-10 18:44:39 -0400 (Sun, 10 Jun 2007) | 2 lines
Missed a place in intobject.c. Is that used anymore anyway?
................
r55871 | neal.norwitz | 2007-06-10 21:31:49 -0400 (Sun, 10 Jun 2007) | 182 lines
Merged revisions 55729-55868 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55731 | neal.norwitz | 2007-06-01 00:29:12 -0700 (Fri, 01 Jun 2007) | 7 lines
SF 1668596/1720897: distutils now copies data files
even if package_dir is empty.
This needs to be backported. I'm too tired tonight. It would be great
if someone backports this if the buildbots are ok with it. Otherwise,
I will try to get to it tomorrow.
........
r55732 | georg.brandl | 2007-06-01 04:33:33 -0700 (Fri, 01 Jun 2007) | 2 lines
Bug #1722484: remove docstrings again when running with -OO.
........
r55735 | georg.brandl | 2007-06-01 12:20:27 -0700 (Fri, 01 Jun 2007) | 2 lines
Fix wrong issue number.
........
r55739 | brett.cannon | 2007-06-01 20:02:29 -0700 (Fri, 01 Jun 2007) | 3 lines
Have configure raise an error when building on AtheOS. Code specific to AtheOS
will be removed in Python 2.7.
........
r55746 | neal.norwitz | 2007-06-02 11:33:53 -0700 (Sat, 02 Jun 2007) | 1 line
Update expected birthday of 2.6
........
r55751 | neal.norwitz | 2007-06-03 13:32:50 -0700 (Sun, 03 Jun 2007) | 10 lines
Backout the original 'fix' to 1721309 which had no effect.
Different versions of Berkeley DB handle this differently.
The comments and bug report should have the details. Memory is allocated
in 4.4 (and presumably earlier), but not in 4.5. Thus
4.5 has the free error, but not earlier versions.
Mostly update comments, plus make the free conditional.
This fix was already applied to the 2.5 branch.
........
r55752 | brett.cannon | 2007-06-03 16:13:41 -0700 (Sun, 03 Jun 2007) | 6 lines
Make _strptime.TimeRE().pattern() use ``\s+`` for matching whitespace instead
of ``\s*``. This prevents patterns from "stealing" bits from other patterns in
order to make a match work.
Closes bug #1730389. Will be backported.
........
r55766 | hyeshik.chang | 2007-06-05 11:16:52 -0700 (Tue, 05 Jun 2007) | 4 lines
Fix build on FreeBSD. Bluetooth HCI API in FreeBSD is quite different
from Linux's. Just fix the build for now but the code doesn't
support the complete capability of HCI on FreeBSD yet.
........
r55770 | hyeshik.chang | 2007-06-05 11:58:51 -0700 (Tue, 05 Jun 2007) | 4 lines
Bug #1728403: Fix a bug that CJKCodecs StreamReader hangs when it
reads a file that ends with incomplete sequence and sizehint argument
for .read() is specified.
........
r55775 | hyeshik.chang | 2007-06-05 12:28:15 -0700 (Tue, 05 Jun 2007) | 2 lines
Fix for Windows: close a temporary file before trying to delete it.
........
r55783 | guido.van.rossum | 2007-06-05 14:24:47 -0700 (Tue, 05 Jun 2007) | 2 lines
Patch by Tim Delany (missing DECREF). SF #1731330.
........
r55785 | collin.winter | 2007-06-05 17:17:35 -0700 (Tue, 05 Jun 2007) | 3 lines
Patch #1731049: make threading.py use a proper "raise" when checking internal state, rather than assert statements (which get stripped out by -O).
........
r55786 | facundo.batista | 2007-06-06 08:13:37 -0700 (Wed, 06 Jun 2007) | 4 lines
FTP.ntransfercmd method now uses create_connection when passive,
using the timeout received in connection time.
........
r55792 | facundo.batista | 2007-06-06 10:15:23 -0700 (Wed, 06 Jun 2007) | 7 lines
Added an optional timeout parameter to function urllib2.urlopen,
with tests in test_urllib2net.py (must have network resource
enabled to execute them). Also modified test_urllib2.py because
testing mock classes must take it into acount. Docs are also
updated.
........
r55793 | thomas.heller | 2007-06-06 13:19:19 -0700 (Wed, 06 Jun 2007) | 1 line
Build _ctypes and _ctypes_test in the ReleaseAMD64 configuration.
........
r55802 | georg.brandl | 2007-06-07 06:23:24 -0700 (Thu, 07 Jun 2007) | 3 lines
Disallow function calls like foo(None=1).
Backport from py3k rev. 55708 by Guido.
........
r55804 | georg.brandl | 2007-06-07 06:30:24 -0700 (Thu, 07 Jun 2007) | 2 lines
Make reindent.py executable.
........
r55805 | georg.brandl | 2007-06-07 06:34:10 -0700 (Thu, 07 Jun 2007) | 2 lines
Patch #1667860: Fix UnboundLocalError in urllib2.
........
r55821 | kristjan.jonsson | 2007-06-07 16:53:49 -0700 (Thu, 07 Jun 2007) | 1 line
Fixing changes to getbuildinfo.c that broke linux builds
........
r55828 | thomas.heller | 2007-06-08 09:10:27 -0700 (Fri, 08 Jun 2007) | 1 line
Make this test work with older Python releases where struct has no 't' format character.
........
r55829 | martin.v.loewis | 2007-06-08 10:29:20 -0700 (Fri, 08 Jun 2007) | 3 lines
Bug #1733488: Fix compilation of bufferobject.c on AIX.
Will backport to 2.5.
........
r55831 | thomas.heller | 2007-06-08 11:20:09 -0700 (Fri, 08 Jun 2007) | 2 lines
[ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur
with small modifications.
........
r55832 | thomas.heller | 2007-06-08 12:01:06 -0700 (Fri, 08 Jun 2007) | 1 line
Fix gcc warnings intruduced by passing Py_ssize_t to PyErr_Format calls.
........
r55833 | thomas.heller | 2007-06-08 12:08:31 -0700 (Fri, 08 Jun 2007) | 2 lines
Fix wrong documentation, and correct the punktuation.
Closes [1700455].
........
r55834 | thomas.heller | 2007-06-08 12:14:23 -0700 (Fri, 08 Jun 2007) | 1 line
Fix warnings by using proper function prototype.
........
r55839 | neal.norwitz | 2007-06-08 20:36:34 -0700 (Fri, 08 Jun 2007) | 7 lines
Prevent expandtabs() on string and unicode objects from causing a segfault when
a large width is passed on 32-bit platforms. Found by Google.
It would be good for people to review this especially carefully and verify
I don't have an off by one error and there is no other way to cause overflow.
........
r55841 | neal.norwitz | 2007-06-08 21:48:22 -0700 (Fri, 08 Jun 2007) | 1 line
Use macro version of GET_SIZE to avoid Coverity warning (#150) about a possible error.
........
r55842 | martin.v.loewis | 2007-06-09 00:42:52 -0700 (Sat, 09 Jun 2007) | 3 lines
Patch #1733960: Allow T_LONGLONG to accept ints.
Will backport to 2.5.
........
r55843 | martin.v.loewis | 2007-06-09 00:58:05 -0700 (Sat, 09 Jun 2007) | 2 lines
Fix Windows build.
........
r55845 | martin.v.loewis | 2007-06-09 03:10:26 -0700 (Sat, 09 Jun 2007) | 2 lines
Provide LLONG_MAX for S390.
........
r55854 | thomas.heller | 2007-06-10 08:59:17 -0700 (Sun, 10 Jun 2007) | 4 lines
First version of build scripts for Windows/AMD64 (no external
components are built yet, and 'kill_python' is disabled).
........
r55855 | thomas.heller | 2007-06-10 10:55:51 -0700 (Sun, 10 Jun 2007) | 3 lines
For now, disable the _bsddb, _sqlite3, _ssl, _testcapi, _tkinter
modules in the ReleaseAMD64 configuration because they do not compile.
........
r55856 | thomas.heller | 2007-06-10 11:27:54 -0700 (Sun, 10 Jun 2007) | 1 line
Need to set the environment variables, otherwise devenv.com is not found.
........
r55860 | thomas.heller | 2007-06-10 14:01:17 -0700 (Sun, 10 Jun 2007) | 1 line
Revert commit 55855.
........
................
r55880 | neal.norwitz | 2007-06-11 01:07:36 -0400 (Mon, 11 Jun 2007) | 5 lines
Fix the refleak counter on test_collections. The ABC metaclass creates
a registry which must be cleared on each run. Otherwise, there *seem*
to be refleaks when there really aren't any. (The class is held within
the registry even though it's no longer needed.)
................
r55884 | neal.norwitz | 2007-06-11 01:46:33 -0400 (Mon, 11 Jun 2007) | 1 line
These tests have been removed, so they are no longer needed here
................
r55886 | georg.brandl | 2007-06-11 03:26:37 -0400 (Mon, 11 Jun 2007) | 3 lines
Optimize access to True and False in the compiler (if True)
and the peepholer (LOAD_NAME True).
................
r55905 | georg.brandl | 2007-06-11 13:02:26 -0400 (Mon, 11 Jun 2007) | 5 lines
Remove __oct__ and __hex__ and use __index__ for converting
non-ints before formatting in a base.
Add a bin() builtin.
................
r55906 | georg.brandl | 2007-06-11 13:04:44 -0400 (Mon, 11 Jun 2007) | 2 lines
int(x, 0) does not "guess".
................
r55907 | georg.brandl | 2007-06-11 13:05:47 -0400 (Mon, 11 Jun 2007) | 2 lines
Add a comment to explain that nb_oct and nb_hex are nonfunctional.
................
r55908 | guido.van.rossum | 2007-06-11 13:49:18 -0400 (Mon, 11 Jun 2007) | 2 lines
Get rid of unused imports and comment.
................
r55910 | guido.van.rossum | 2007-06-11 16:05:17 -0400 (Mon, 11 Jun 2007) | 2 lines
_Abstract.__new__ now requires either no arguments or __init__ overridden.
................
r55911 | guido.van.rossum | 2007-06-11 16:07:49 -0400 (Mon, 11 Jun 2007) | 7 lines
Move the collections ABCs to a separate file, _abcoll.py, in order to avoid
needing to import _collections.so during the bootstrap (this will become
apparent in the next submit of os.py).
Add (plain and mutable) ABCs for Set, Mapping, Sequence.
................
r55912 | guido.van.rossum | 2007-06-11 16:09:31 -0400 (Mon, 11 Jun 2007) | 2 lines
Rewrite the _Environ class to use the new collections ABCs.
................
r55913 | guido.van.rossum | 2007-06-11 16:59:45 -0400 (Mon, 11 Jun 2007) | 72 lines
Merged revisions 55869-55912 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55869 | neal.norwitz | 2007-06-10 17:42:11 -0700 (Sun, 10 Jun 2007) | 1 line
Add Atul Varma for patch # 1667860
........
r55870 | neal.norwitz | 2007-06-10 18:22:03 -0700 (Sun, 10 Jun 2007) | 1 line
Ignore valgrind problems on Ubuntu from ld
........
r55872 | neal.norwitz | 2007-06-10 18:48:46 -0700 (Sun, 10 Jun 2007) | 2 lines
Ignore config.status.lineno which seems new (new autoconf?)
........
r55873 | neal.norwitz | 2007-06-10 19:14:39 -0700 (Sun, 10 Jun 2007) | 1 line
Prevent these tests from running on Win64 since they don\'t apply there either
........
r55874 | neal.norwitz | 2007-06-10 19:16:10 -0700 (Sun, 10 Jun 2007) | 5 lines
Fix a bug when there was a newline in the string expandtabs was called on.
This also catches another condition that can overflow.
Will backport.
........
r55879 | neal.norwitz | 2007-06-10 21:52:37 -0700 (Sun, 10 Jun 2007) | 1 line
Prevent hang if the port cannot be opened.
........
r55881 | neal.norwitz | 2007-06-10 22:28:45 -0700 (Sun, 10 Jun 2007) | 4 lines
Add all of the distuils modules that don't seem to have explicit tests. :-(
Move an import in mworkscompiler so that this module can be imported on
any platform. Hopefully this works on all platforms.
........
r55882 | neal.norwitz | 2007-06-10 22:35:10 -0700 (Sun, 10 Jun 2007) | 4 lines
SF #1734732, lower case the module names per PEP 8.
Will backport.
........
r55885 | neal.norwitz | 2007-06-10 23:16:48 -0700 (Sun, 10 Jun 2007) | 4 lines
Not sure why this only fails sometimes on Unix machines. Better
to disable it and only import msvccompiler on Windows since that's
the only place it can work anyways.
........
r55887 | neal.norwitz | 2007-06-11 00:29:43 -0700 (Mon, 11 Jun 2007) | 4 lines
Bug #1734723: Fix repr.Repr() so it doesn't ignore the maxtuple attribute.
Will backport
........
r55889 | neal.norwitz | 2007-06-11 00:36:24 -0700 (Mon, 11 Jun 2007) | 1 line
Reflow long line
........
r55896 | thomas.heller | 2007-06-11 08:58:33 -0700 (Mon, 11 Jun 2007) | 3 lines
Use "O&" in calls to PyArg_Parse when we need a 'void*' instead of "k"
or "K" codes.
........
r55901 | facundo.batista | 2007-06-11 09:27:08 -0700 (Mon, 11 Jun 2007) | 5 lines
Added versionchanged flag to all the methods which received
a new optional timeout parameter, and a versionadded flag to
the socket.create_connection function.
........
................
r55914 | guido.van.rossum | 2007-06-11 17:19:50 -0400 (Mon, 11 Jun 2007) | 3 lines
New super() implementation, for PEP 3135 (though the PEP is not yet updated
to this design, and small tweaks may still be made later).
................
r55923 | guido.van.rossum | 2007-06-12 00:15:24 -0400 (Tue, 12 Jun 2007) | 4 lines
I'm guessing this module broke when Neal ripped out the types module --
it used 'list' both as a local variable and as the built-in list type.
Renamed the local variable since that was easier.
................
r55924 | guido.van.rossum | 2007-06-12 00:20:05 -0400 (Tue, 12 Jun 2007) | 5 lines
Change all occurrences of super(<thisclass>, <firstarg>) to super().
Seems to have worked, all the tests still pass.
Exception: test_descr and test_descrtut, which have tons of these
and are there to test the various usages.
................
r55939 | collin.winter | 2007-06-12 16:57:33 -0400 (Tue, 12 Jun 2007) | 1 line
Patch #1735485: remove StandardError from the exception hierarchy.
................
r55954 | neal.norwitz | 2007-06-13 00:56:32 -0400 (Wed, 13 Jun 2007) | 51 lines
Merged revisions 55913-55950 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55926 | marc-andre.lemburg | 2007-06-12 02:09:58 -0700 (Tue, 12 Jun 2007) | 3 lines
Apply patch #1734945 to support TurboLinux as distribution.
........
r55927 | marc-andre.lemburg | 2007-06-12 02:26:49 -0700 (Tue, 12 Jun 2007) | 3 lines
Add patch #1726668: Windows Vista support.
........
r55929 | thomas.heller | 2007-06-12 08:36:22 -0700 (Tue, 12 Jun 2007) | 1 line
Checkout, but do not yet try to build, exernal sources.
........
r55930 | thomas.heller | 2007-06-12 09:08:27 -0700 (Tue, 12 Jun 2007) | 6 lines
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
Set the /XP64 /RETAIL build enviroment in the makefile when building
ReleaseAMD64.
........
r55931 | thomas.heller | 2007-06-12 09:23:19 -0700 (Tue, 12 Jun 2007) | 5 lines
Revert this change, since it breaks the win32 build:
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
........
r55934 | thomas.heller | 2007-06-12 10:28:31 -0700 (Tue, 12 Jun 2007) | 3 lines
Specify the bufferoverflowU.lib to the makefile on the command line
(for ReleaseAMD64 builds).
........
r55937 | thomas.heller | 2007-06-12 12:02:59 -0700 (Tue, 12 Jun 2007) | 3 lines
Add bufferoverflowU.lib to PCBuild\_bsddb.vcproj.
Build sqlite3.dll and bsddb.
........
r55938 | thomas.heller | 2007-06-12 12:56:12 -0700 (Tue, 12 Jun 2007) | 2 lines
Don't rebuild Berkeley DB if not needed (this was committed by accident).
........
r55948 | martin.v.loewis | 2007-06-12 20:42:19 -0700 (Tue, 12 Jun 2007) | 3 lines
Provide PY_LLONG_MAX on all systems having long long.
Will backport to 2.5.
........
................
r55959 | guido.van.rossum | 2007-06-13 12:22:41 -0400 (Wed, 13 Jun 2007) | 2 lines
Fix a compilation warning.
................
Modified: python/branches/cpy_merge/Doc/api/exceptions.tex
==============================================================================
--- python/branches/cpy_merge/Doc/api/exceptions.tex (original)
+++ python/branches/cpy_merge/Doc/api/exceptions.tex Thu Jun 14 21:06:29 2007
@@ -381,7 +381,6 @@
\begin{tableiii}{l|l|c}{cdata}{C Name}{Python Name}{Notes}
\lineiii{PyExc_BaseException\ttindex{PyExc_BaseException}}{\exception{BaseException}}{(1), (4)}
\lineiii{PyExc_Exception\ttindex{PyExc_Exception}}{\exception{Exception}}{(1)}
- \lineiii{PyExc_StandardError\ttindex{PyExc_StandardError}}{\exception{StandardError}}{(1)}
\lineiii{PyExc_ArithmeticError\ttindex{PyExc_ArithmeticError}}{\exception{ArithmeticError}}{(1)}
\lineiii{PyExc_LookupError\ttindex{PyExc_LookupError}}{\exception{LookupError}}{(1)}
\lineiii{PyExc_AssertionError\ttindex{PyExc_AssertionError}}{\exception{AssertionError}}{}
Modified: python/branches/cpy_merge/Doc/lib/libctypes.tex
==============================================================================
--- python/branches/cpy_merge/Doc/lib/libctypes.tex (original)
+++ python/branches/cpy_merge/Doc/lib/libctypes.tex Thu Jun 14 21:06:29 2007
@@ -437,8 +437,8 @@
expecting pointers to mutable memory. If you need mutable memory
blocks, ctypes has a \code{create{\_}string{\_}buffer} function which creates
these in various ways. The current memory block contents can be
-accessed (or changed) with the \code{raw} property, if you want to access
-it as NUL terminated string, use the \code{string} property:
+accessed (or changed) with the \code{raw} property; if you want to access
+it as NUL terminated string, use the \code{value} property:
\begin{verbatim}
>>> from ctypes import *
>>> p = create_string_buffer(3) # create a 3 byte buffer, initialized to NUL bytes
Modified: python/branches/cpy_merge/Doc/lib/libdecimal.tex
==============================================================================
--- python/branches/cpy_merge/Doc/lib/libdecimal.tex (original)
+++ python/branches/cpy_merge/Doc/lib/libdecimal.tex Thu Jun 14 21:06:29 2007
@@ -845,7 +845,7 @@
The following table summarizes the hierarchy of signals:
\begin{verbatim}
- exceptions.ArithmeticError(exceptions.StandardError)
+ exceptions.ArithmeticError(exceptions.Exception)
DecimalException
Clamped
DivisionByZero(DecimalException, exceptions.ZeroDivisionError)
Modified: python/branches/cpy_merge/Doc/lib/libexcs.tex
==============================================================================
--- python/branches/cpy_merge/Doc/lib/libexcs.tex (original)
+++ python/branches/cpy_merge/Doc/lib/libexcs.tex Thu Jun 14 21:06:29 2007
@@ -64,13 +64,6 @@
\versionchanged[Changed to inherit from \exception{BaseException}]{2.5}
\end{excdesc}
-\begin{excdesc}{StandardError}
-The base class for all built-in exceptions except
-\exception{StopIteration}, \exception{GeneratorExit},
-\exception{KeyboardInterrupt} and \exception{SystemExit}.
-\exception{StandardError} itself is derived from \exception{Exception}.
-\end{excdesc}
-
\begin{excdesc}{ArithmeticError}
The base class for those built-in exceptions that are raised for
various arithmetic errors: \exception{OverflowError},
@@ -143,9 +136,9 @@
\begin{excdesc}{GeneratorExit}
Raise when a generator's \method{close()} method is called.
- It directly inherits from \exception{Exception} instead of
- \exception{StandardError} since it is technically not an error.
\versionadded{2.5}
+ \versionchanged[Changed to inherit from Exception instead of
+ StandardError]{3.0}
\end{excdesc}
\begin{excdesc}{IOError}
@@ -257,10 +250,9 @@
\begin{excdesc}{StopIteration}
Raised by builtin \function{next()} and an iterator's \method{__next__()}
method to signal that there are no further values.
- This is derived from \exception{Exception} rather than
- \exception{StandardError}, since this is not considered an error in
- its normal application.
\versionadded{2.2}
+ \versionchanged[Changed to inherit from Exception instead of
+ StandardError]{3.0}
\end{excdesc}
@@ -304,7 +296,7 @@
Instances have an attribute \member{code} which is set to the
proposed exit status or error message (defaulting to \code{None}).
Also, this exception derives directly from \exception{BaseException} and
- not \exception{StandardError}, since it is not technically an error.
+ not \exception{Exception}, since it is not technically an error.
A call to \function{sys.exit()} is translated into an exception so that
clean-up handlers (\keyword{finally} clauses of \keyword{try} statements)
@@ -315,7 +307,7 @@
\function{fork()}).
The exception inherits from \exception{BaseException} instead of
- \exception{StandardError} or \exception{Exception} so that it is not
+ \exception{Exception} so that it is not
accidentally caught by code that catches \exception{Exception}. This allows
the exception to properly propagate up and cause the interpreter to exit.
\versionchanged[Changed to inherit from \exception{BaseException}]{2.5}
Modified: python/branches/cpy_merge/Doc/lib/libftplib.tex
==============================================================================
--- python/branches/cpy_merge/Doc/lib/libftplib.tex (original)
+++ python/branches/cpy_merge/Doc/lib/libftplib.tex Thu Jun 14 21:06:29 2007
@@ -46,6 +46,7 @@
The optional \var{timeout} parameter specifies a timeout in seconds for the
connection attempt (if is not specified, or passed as None, the global
default timeout setting will be used).
+\versionchanged[\var{timeout} was added]{2.6}
\end{classdesc}
\begin{datadesc}{all_errors}
@@ -117,6 +118,8 @@
object timeout is used (the timeout that you passed when instantiating the
class); if the object timeout is also None, the global default timeout
setting will be used.
+
+\versionchanged[\var{timeout} was added]{2.6}
\end{methoddesc}
\begin{methoddesc}[FTP]{getwelcome}{}
Modified: python/branches/cpy_merge/Doc/lib/libfuncs.tex
==============================================================================
--- python/branches/cpy_merge/Doc/lib/libfuncs.tex (original)
+++ python/branches/cpy_merge/Doc/lib/libfuncs.tex Thu Jun 14 21:06:29 2007
@@ -104,6 +104,14 @@
\versionadded{2.3}
\end{funcdesc}
+\begin{funcdesc}{bin}{x}
+ Convert an integer number to a binary string.
+ The result is a valid Python expression. If \var{x} is not a Python
+ \class{int} object, it has to define an \method{__index__} method
+ that returns an integer.
+ \versionadded{3.0}
+\end{funcdesc}
+
\begin{funcdesc}{bool}{\optional{x}}
Convert a value to a Boolean, using the standard truth testing
procedure. If \var{x} is false or omitted, this returns
@@ -540,8 +548,10 @@
\end{funcdesc}
\begin{funcdesc}{hex}{x}
- Convert an integer number (of any size) to a hexadecimal string.
- The result is a valid Python expression.
+ Convert an integer number to a hexadecimal string.
+ The result is a valid Python expression. If \var{x} is not a Python
+ \class{int} object, it has to define an \method{__index__} method
+ that returns an integer.
\versionchanged[Formerly only returned an unsigned literal]{2.4}
\end{funcdesc}
@@ -559,8 +569,7 @@
representable as a Python integer, possibly embedded in whitespace.
The \var{radix} parameter gives the base for the
conversion and may be any integer in the range [2, 36], or zero. If
- \var{radix} is zero, the proper radix is guessed based on the
- contents of string; the interpretation is the same as for integer
+ \var{radix} is zero, the interpretation is the same as for integer
literals. If \var{radix} is specified and \var{x} is not a string,
\exception{TypeError} is raised.
Otherwise, the argument may be a plain or
@@ -707,8 +716,10 @@
\end{funcdesc}
\begin{funcdesc}{oct}{x}
- Convert an integer number (of any size) to an octal string. The
- result is a valid Python expression.
+ Convert an integer number to an octal string. The
+ result is a valid Python expression. If \var{x} is not a Python
+ \class{int} object, it has to define an \method{__index__} method
+ that returns an integer.
\versionchanged[Formerly only returned an unsigned literal]{2.4}
\end{funcdesc}
Modified: python/branches/cpy_merge/Doc/lib/libhttplib.tex
==============================================================================
--- python/branches/cpy_merge/Doc/lib/libhttplib.tex (original)
+++ python/branches/cpy_merge/Doc/lib/libhttplib.tex Thu Jun 14 21:06:29 2007
@@ -49,6 +49,7 @@
>>> h3 = httplib.HTTPConnection('www.cwi.nl', 80, timeout=10)
\end{verbatim}
\versionadded{2.0}
+\versionchanged[\var{timeout} was added]{2.6}
\end{classdesc}
\begin{classdesc}{HTTPSConnection}{host\optional{, port\optional{,
@@ -63,6 +64,7 @@
\warning{This does not do any certificate verification!}
\versionadded{2.0}
+\versionchanged[\var{timeout} was added]{2.6}
\end{classdesc}
\begin{classdesc}{HTTPResponse}{sock\optional{, debuglevel=0}\optional{, strict=0}}
Modified: python/branches/cpy_merge/Doc/lib/libpoplib.tex
==============================================================================
--- python/branches/cpy_merge/Doc/lib/libpoplib.tex (original)
+++ python/branches/cpy_merge/Doc/lib/libpoplib.tex Thu Jun 14 21:06:29 2007
@@ -35,6 +35,8 @@
The optional \var{timeout} parameter specifies a timeout in seconds for the
connection attempt (if not specified, or passed as None, the global default
timeout setting will be used).
+
+\versionchanged[\var{timeout} was added]{2.6}
\end{classdesc}
\begin{classdesc}{POP3_SSL}{host\optional{, port\optional{, keyfile\optional{, certfile}}}}
Modified: python/branches/cpy_merge/Doc/lib/libsmtplib.tex
==============================================================================
--- python/branches/cpy_merge/Doc/lib/libsmtplib.tex (original)
+++ python/branches/cpy_merge/Doc/lib/libsmtplib.tex Thu Jun 14 21:06:29 2007
@@ -29,6 +29,8 @@
For normal use, you should only require the initialization/connect,
\method{sendmail()}, and \method{quit()} methods. An example is
included below.
+
+\versionchanged[\var{timeout} was added]{2.6}
\end{classdesc}
\begin{classdesc}{SMTP_SSL}{\optional{host\optional{, port\optional{,
@@ -45,6 +47,8 @@
The optional \var{timeout} parameter specifies a timeout in seconds for the
connection attempt (if not specified, or passed as None, the global
default timeout setting will be used).
+
+\versionchanged[\var{timeout} was added]{2.6}
\end{classdesc}
\begin{classdesc}{LMTP}{\optional{host\optional{, port\optional{,
Modified: python/branches/cpy_merge/Doc/lib/libsocket.tex
==============================================================================
--- python/branches/cpy_merge/Doc/lib/libsocket.tex (original)
+++ python/branches/cpy_merge/Doc/lib/libsocket.tex Thu Jun 14 21:06:29 2007
@@ -177,6 +177,7 @@
application-level code. Passing the optional \var{timeout} parameter
will set the timeout on the socket instance (if it is not given or
\code{None}, the global default timeout setting is used).
+\versionadded{2.6}
\end{funcdesc}
\begin{funcdesc}{getaddrinfo}{host, port\optional{, family\optional{,
Modified: python/branches/cpy_merge/Doc/lib/libtelnetlib.tex
==============================================================================
--- python/branches/cpy_merge/Doc/lib/libtelnetlib.tex (original)
+++ python/branches/cpy_merge/Doc/lib/libtelnetlib.tex Thu Jun 14 21:06:29 2007
@@ -40,6 +40,7 @@
raise \exception{EOFError} when the end of the connection is read,
because they can return an empty string for other reasons. See the
individual descriptions below.
+\versionchanged[\var{timeout} was added]{2.6}
\end{classdesc}
@@ -123,6 +124,7 @@
timeout setting will be used).
Do not try to reopen an already connected instance.
+\versionchanged[\var{timeout} was added]{2.6}
\end{methoddesc}
\begin{methoddesc}[Telnet]{msg}{msg\optional{, *args}}
Modified: python/branches/cpy_merge/Doc/lib/libthreading.tex
==============================================================================
--- python/branches/cpy_merge/Doc/lib/libthreading.tex (original)
+++ python/branches/cpy_merge/Doc/lib/libthreading.tex Thu Jun 14 21:06:29 2007
@@ -174,11 +174,14 @@
unlocked, then the \method{acquire()} call resets it to locked and
returns. The \method{release()} method should only be called in the
locked state; it changes the state to unlocked and returns
-immediately. When more than one thread is blocked in
-\method{acquire()} waiting for the state to turn to unlocked, only one
-thread proceeds when a \method{release()} call resets the state to
-unlocked; which one of the waiting threads proceeds is not defined,
-and may vary across implementations.
+immediately. If an attempt is made to release an unlocked lock, a
+\exception{RuntimeError} will be raised.
+
+When more than one thread is blocked in \method{acquire()} waiting for
+the state to turn to unlocked, only one thread proceeds when a
+\method{release()} call resets the state to unlocked; which one of the
+waiting threads proceeds is not defined, and may vary across
+implementations.
All methods are executed atomically.
@@ -257,8 +260,9 @@
decrement the recursion level is still nonzero, the lock remains
locked and owned by the calling thread.
-Only call this method when the calling thread owns the lock.
-Do not call this method when the lock is unlocked.
+Only call this method when the calling thread owns the lock. A
+\exception{RuntimeError} is raised if this method is called when the
+lock is unlocked.
There is no return value.
\end{methoddesc}
@@ -275,7 +279,8 @@
methods that call the corresponding methods of the associated lock.
It also has a \method{wait()} method, and \method{notify()} and
\method{notifyAll()} methods. These three must only be called when
-the calling thread has acquired the lock.
+the calling thread has acquired the lock, otherwise a
+\exception{RuntimeError} is raised.
The \method{wait()} method releases the lock, and then blocks until it
is awakened by a \method{notify()} or \method{notifyAll()} call for
@@ -343,9 +348,9 @@
\end{methoddesc}
\begin{methoddesc}{wait}{\optional{timeout}}
-Wait until notified or until a timeout occurs.
-This must only be called when the calling thread has acquired the
-lock.
+Wait until notified or until a timeout occurs. If the calling thread
+has not acquired the lock when this method is called, a
+\exception{RuntimeError} is raised.
This method releases the underlying lock, and then blocks until it is
awakened by a \method{notify()} or \method{notifyAll()} call for the
@@ -367,9 +372,10 @@
\end{methoddesc}
\begin{methoddesc}{notify}{}
-Wake up a thread waiting on this condition, if any.
-This must only be called when the calling thread has acquired the
-lock.
+Wake up a thread waiting on this condition, if any. Wait until
+notified or until a timeout occurs. If the calling thread has not
+acquired the lock when this method is called, a
+\exception{RuntimeError} is raised.
This method wakes up one of the threads waiting for the condition
variable, if any are waiting; it is a no-op if no threads are waiting.
@@ -386,7 +392,9 @@
\begin{methoddesc}{notifyAll}{}
Wake up all threads waiting on this condition. This method acts like
-\method{notify()}, but wakes up all waiting threads instead of one.
+\method{notify()}, but wakes up all waiting threads instead of one. If
+the calling thread has not acquired the lock when this method is
+called, a \exception{RuntimeError} is raised.
\end{methoddesc}
@@ -404,8 +412,9 @@
calls \method{release()}.
\begin{classdesc}{Semaphore}{\optional{value}}
-The optional argument gives the initial value for the internal
-counter; it defaults to \code{1}.
+The optional argument gives the initial \var{value} for the internal
+counter; it defaults to \code{1}. If the \var{value} given is less
+than 0, \exception{ValueError} is raised.
\end{classdesc}
\begin{methoddesc}{acquire}{\optional{blocking}}
@@ -586,9 +595,12 @@
\begin{methoddesc}{start}{}
Start the thread's activity.
-This must be called at most once per thread object. It
-arranges for the object's \method{run()} method to be invoked in a
-separate thread of control.
+It must be called at most once per thread object. It arranges for the
+object's \method{run()} method to be invoked in a separate thread of
+control.
+
+This method will raise a \exception{RuntimeException} if called more
+than once on the same thread object.
\end{methoddesc}
\begin{methoddesc}{run}{}
@@ -618,11 +630,10 @@
A thread can be \method{join()}ed many times.
-A thread cannot join itself because this would cause a
-deadlock.
-
-It is an error to attempt to \method{join()} a thread before it has
-been started.
+\method{join()} may throw a \exception{RuntimeError}, if an attempt is
+made to join the current thread as that would cause a deadlock. It is
+also an error to \method{join()} a thread before it has been started
+and attempts to do so raises same exception.
\end{methoddesc}
\begin{methoddesc}{getName}{}
@@ -651,7 +662,8 @@
\begin{methoddesc}{setDaemon}{daemonic}
Set the thread's daemon flag to the Boolean value \var{daemonic}.
-This must be called before \method{start()} is called.
+This must be called before \method{start()} is called, otherwise
+\exception{RuntimeError} is raised.
The initial value is inherited from the creating thread.
Modified: python/branches/cpy_merge/Doc/lib/liburllib2.tex
==============================================================================
--- python/branches/cpy_merge/Doc/lib/liburllib2.tex (original)
+++ python/branches/cpy_merge/Doc/lib/liburllib2.tex Thu Jun 14 21:06:29 2007
@@ -14,7 +14,7 @@
The \module{urllib2} module defines the following functions:
-\begin{funcdesc}{urlopen}{url\optional{, data}}
+\begin{funcdesc}{urlopen}{url\optional{, data}\optional{, timeout}}
Open the URL \var{url}, which can be either a string or a \class{Request}
object.
@@ -27,6 +27,11 @@
\function{urllib.urlencode()} function takes a mapping or sequence of
2-tuples and returns a string in this format.
+The optional \var{timeout} parameter specifies a timeout in seconds for the
+connection attempt (if not specified, or passed as None, the global default
+timeout setting will be used). This actually only work for HTTP, HTTPS, FTP
+and FTPS connections.
+
This function returns a file-like object with two additional methods:
\begin{itemize}
@@ -40,6 +45,8 @@
Note that \code{None} may be returned if no handler handles the
request (though the default installed global \class{OpenerDirector}
uses \class{UnknownHandler} to ensure this never happens).
+
+\versionchanged[\var{timeout} was added]{2.6}
\end{funcdesc}
\begin{funcdesc}{install_opener}{opener}
@@ -351,12 +358,18 @@
\end{itemize}
\end{methoddesc}
-\begin{methoddesc}[OpenerDirector]{open}{url\optional{, data}}
+\begin{methoddesc}[OpenerDirector]{open}{url\optional{, data}{\optional{, timeout}}}
Open the given \var{url} (which can be a request object or a string),
optionally passing the given \var{data}.
Arguments, return values and exceptions raised are the same as those
of \function{urlopen()} (which simply calls the \method{open()} method
-on the currently installed global \class{OpenerDirector}).
+on the currently installed global \class{OpenerDirector}). The optional
+\var{timeout} parameter specifies a timeout in seconds for the connection
+attempt (if not specified, or passed as None, the global default timeout
+setting will be used; this actually only work for HTTP, HTTPS, FTP
+and FTPS connections).
+
+\versionchanged[\var{timeout} was added]{2.6}
\end{methoddesc}
\begin{methoddesc}[OpenerDirector]{error}{proto\optional{,
Modified: python/branches/cpy_merge/Doc/ref/ref2.tex
==============================================================================
--- python/branches/cpy_merge/Doc/ref/ref2.tex (original)
+++ python/branches/cpy_merge/Doc/ref/ref2.tex Thu Jun 14 21:06:29 2007
@@ -565,6 +565,7 @@
\index{floating point literal}
\index{hexadecimal literal}
\index{octal literal}
+\index{binary literal}
\index{decimal literal}
\index{imaginary literal}
\index{complex!literal}
@@ -574,35 +575,32 @@
`\code{-}' and the literal \code{1}.
-\subsection{Integer and long integer literals\label{integers}}
+\subsection{Integer literals\label{integers}}
-Integer and long integer literals are described by the following
+Integer literals are described by the following
lexical definitions:
\begin{productionlist}
- \production{longinteger}
- {\token{integer} ("l" | "L")}
\production{integer}
{\token{decimalinteger} | \token{octinteger} | \token{hexinteger}}
\production{decimalinteger}
- {\token{nonzerodigit} \token{digit}* | "0"}
+ {\token{nonzerodigit} \token{digit}* | "0"+}
\production{octinteger}
- {"0" \token{octdigit}+}
+ {"0" ("o" | "O") \token{octdigit}+}
\production{hexinteger}
{"0" ("x" | "X") \token{hexdigit}+}
+ \production{bininteger}
+ {"0" ("b" | "B") \token{bindigit}+}
\production{nonzerodigit}
{"1"..."9"}
\production{octdigit}
{"0"..."7"}
\production{hexdigit}
{\token{digit} | "a"..."f" | "A"..."F"}
+ \production{bindigit}
+ {"0"..."1"}
\end{productionlist}
-Although both lower case \character{l} and upper case \character{L} are
-allowed as suffix for long integers, it is strongly recommended to always
-use \character{L}, since the letter \character{l} looks too much like the
-digit \character{1}.
-
Plain integer literals that are above the largest representable plain
integer (e.g., 2147483647 when using 32-bit arithmetic) are accepted
as if they were long integers instead.\footnote{In versions of Python
@@ -613,13 +611,16 @@
from their unsigned value.} There is no limit for long integer
literals apart from what can be stored in available memory.
-Some examples of plain integer literals (first row) and long integer
-literals (second and third rows):
+Note that leading zeros in a non-zero decimal number are not allowed.
+This is for disambiguation with C-style octal literals, which Python
+used before version 3.0.
+
+Some examples of integer literals:
\begin{verbatim}
-7 2147483647 0177
-3L 79228162514264337593543950336L 0377L 0x100000000L
- 79228162514264337593543950336 0xdeadbeef
+7 2147483647 0o177 0b100110111
+3 79228162514264337593543950336 0o377 0x100000000
+ 79228162514264337593543950336 0xdeadbeef
\end{verbatim}
@@ -644,12 +645,10 @@
{("e" | "E") ["+" | "-"] \token{digit}+}
\end{productionlist}
-Note that the integer and exponent parts of floating point numbers
-can look like octal integers, but are interpreted using radix 10. For
-example, \samp{077e010} is legal, and denotes the same number
-as \samp{77e10}.
-The allowed range of floating point literals is
-implementation-dependent.
+Note that the integer and exponent parts are always interpreted using
+radix 10. For example, \samp{077e010} is legal, and denotes the same
+number as \samp{77e10}.
+The allowed range of floating point literals is implementation-dependent.
Some examples of floating point literals:
\begin{verbatim}
Modified: python/branches/cpy_merge/Doc/ref/ref3.tex
==============================================================================
--- python/branches/cpy_merge/Doc/ref/ref3.tex (original)
+++ python/branches/cpy_merge/Doc/ref/ref3.tex Thu Jun 14 21:06:29 2007
@@ -2033,17 +2033,11 @@
the appropriate type.
\end{methoddesc}
-\begin{methoddesc}[numeric object]{__oct__}{self}
-\methodline[numeric object]{__hex__}{self}
-Called to implement the built-in functions
-\function{oct()}\bifuncindex{oct} and
-\function{hex()}\bifuncindex{hex}. Should return a string value.
-\end{methoddesc}
-
\begin{methoddesc}[numeric object]{__index__}{self}
Called to implement \function{operator.index()}. Also called whenever
-Python needs an integer object (such as in slicing). Must return an
-integer (int or long).
+Python needs an integer object (such as in slicing, or in the built-in
+\function{bin()}, \function{hex()} and \function{oct()} functions).
+Must return an integer (int or long).
\versionadded{2.5}
\end{methoddesc}
Modified: python/branches/cpy_merge/Doc/tut/tut.tex
==============================================================================
--- python/branches/cpy_merge/Doc/tut/tut.tex (original)
+++ python/branches/cpy_merge/Doc/tut/tut.tex Thu Jun 14 21:06:29 2007
@@ -2689,7 +2689,7 @@
'LookupError', 'MemoryError', 'NameError', 'None', 'NotImplemented',
'NotImplementedError', 'OSError', 'OverflowError',
'PendingDeprecationWarning', 'ReferenceError', 'RuntimeError',
- 'RuntimeWarning', 'StandardError', 'StopIteration', 'SyntaxError',
+ 'RuntimeWarning', 'StopIteration', 'SyntaxError',
'SyntaxWarning', 'SystemError', 'SystemExit', 'TabError', 'True',
'TypeError', 'UnboundLocalError', 'UnicodeDecodeError',
'UnicodeEncodeError', 'UnicodeError', 'UnicodeTranslateError',
@@ -2734,9 +2734,9 @@
hierarchical filesystem):
\begin{verbatim}
-Sound/ Top-level package
+sound/ Top-level package
__init__.py Initialize the sound package
- Formats/ Subpackage for file format conversions
+ formats/ Subpackage for file format conversions
__init__.py
wavread.py
wavwrite.py
@@ -2745,13 +2745,13 @@
auread.py
auwrite.py
...
- Effects/ Subpackage for sound effects
+ effects/ Subpackage for sound effects
__init__.py
echo.py
surround.py
reverse.py
...
- Filters/ Subpackage for filters
+ filters/ Subpackage for filters
__init__.py
equalizer.py
vocoder.py
@@ -2774,20 +2774,20 @@
package, for example:
\begin{verbatim}
-import Sound.Effects.echo
+import sound.effects.echo
\end{verbatim}
-This loads the submodule \module{Sound.Effects.echo}. It must be referenced
+This loads the submodule \module{sound.effects.echo}. It must be referenced
with its full name.
\begin{verbatim}
-Sound.Effects.echo.echofilter(input, output, delay=0.7, atten=4)
+sound.effects.echo.echofilter(input, output, delay=0.7, atten=4)
\end{verbatim}
An alternative way of importing the submodule is:
\begin{verbatim}
-from Sound.Effects import echo
+from sound.effects import echo
\end{verbatim}
This also loads the submodule \module{echo}, and makes it available without
@@ -2800,7 +2800,7 @@
Yet another variation is to import the desired function or variable directly:
\begin{verbatim}
-from Sound.Effects.echo import echofilter
+from sound.effects.echo import echofilter
\end{verbatim}
Again, this loads the submodule \module{echo}, but this makes its function
@@ -2827,7 +2827,7 @@
%The \code{__all__} Attribute
\ttindex{__all__}
-Now what happens when the user writes \code{from Sound.Effects import
+Now what happens when the user writes \code{from sound.effects import
*}? Ideally, one would hope that this somehow goes out to the
filesystem, finds which submodules are present in the package, and
imports them all. Unfortunately, this operation does not work very
@@ -2849,19 +2849,19 @@
up-to-date when a new version of the package is released. Package
authors may also decide not to support it, if they don't see a use for
importing * from their package. For example, the file
-\file{Sounds/Effects/__init__.py} could contain the following code:
+\file{sounds/effects/__init__.py} could contain the following code:
\begin{verbatim}
__all__ = ["echo", "surround", "reverse"]
\end{verbatim}
-This would mean that \code{from Sound.Effects import *} would
-import the three named submodules of the \module{Sound} package.
+This would mean that \code{from sound.effects import *} would
+import the three named submodules of the \module{sound} package.
-If \code{__all__} is not defined, the statement \code{from Sound.Effects
+If \code{__all__} is not defined, the statement \code{from sound.effects
import *} does \emph{not} import all submodules from the package
-\module{Sound.Effects} into the current namespace; it only ensures that the
-package \module{Sound.Effects} has been imported (possibly running any
+\module{sound.effects} into the current namespace; it only ensures that the
+package \module{sound.effects} has been imported (possibly running any
initialization code in \file{__init__.py}) and then imports whatever names are
defined in the package. This includes any names defined (and
submodules explicitly loaded) by \file{__init__.py}. It also includes any
@@ -2869,14 +2869,14 @@
import statements. Consider this code:
\begin{verbatim}
-import Sound.Effects.echo
-import Sound.Effects.surround
-from Sound.Effects import *
+import sound.effects.echo
+import sound.effects.surround
+from sound.effects import *
\end{verbatim}
In this example, the echo and surround modules are imported in the
current namespace because they are defined in the
-\module{Sound.Effects} package when the \code{from...import} statement
+\module{sound.effects} package when the \code{from...import} statement
is executed. (This also works when \code{__all__} is defined.)
Note that in general the practice of importing \code{*} from a module or
@@ -2904,12 +2904,12 @@
statement looks for a top-level module with the given name.
When packages are structured into subpackages (as with the
-\module{Sound} package in the example), there's no shortcut to refer
+\module{sound} package in the example), there's no shortcut to refer
to submodules of sibling packages - the full name of the subpackage
must be used. For example, if the module
-\module{Sound.Filters.vocoder} needs to use the \module{echo} module
-in the \module{Sound.Effects} package, it can use \code{from
-Sound.Effects import echo}.
+\module{sound.filters.vocoder} needs to use the \module{echo} module
+in the \module{sound.effects} package, it can use \code{from
+sound.effects import echo}.
Starting with Python 2.5, in addition to the implicit relative imports
described above, you can write explicit relative imports with the
@@ -2920,8 +2920,8 @@
\begin{verbatim}
from . import echo
-from .. import Formats
-from ..Filters import equalizer
+from .. import formats
+from ..filters import equalizer
\end{verbatim}
Note that both explicit and implicit relative imports are based on the
Modified: python/branches/cpy_merge/Doc/whatsnew/whatsnew26.tex
==============================================================================
--- python/branches/cpy_merge/Doc/whatsnew/whatsnew26.tex (original)
+++ python/branches/cpy_merge/Doc/whatsnew/whatsnew26.tex Thu Jun 14 21:06:29 2007
@@ -53,7 +53,7 @@
\tableofcontents
This article explains the new features in Python 2.6. No release date
-for Python 2.6 has been set; it will probably be released in late 2007.
+for Python 2.6 has been set; it will probably be released in mid 2008.
% Compare with previous release in 2 - 3 sentences here.
Modified: python/branches/cpy_merge/Include/abstract.h
==============================================================================
--- python/branches/cpy_merge/Include/abstract.h (original)
+++ python/branches/cpy_merge/Include/abstract.h Thu Jun 14 21:06:29 2007
@@ -851,6 +851,14 @@
expression: o1 |= o2.
*/
+ PyAPI_FUNC(PyObject *) PyNumber_ToBase(PyObject *n, int base);
+
+ /*
+ Returns the integer n converted to a string with a base, with a base
+ marker of 0b, 0o or 0x prefixed if applicable.
+ If n is not an int object, it is converted with PyNumber_Index first.
+ */
+
/* Sequence protocol:*/
Modified: python/branches/cpy_merge/Include/longobject.h
==============================================================================
--- python/branches/cpy_merge/Include/longobject.h (original)
+++ python/branches/cpy_merge/Include/longobject.h Thu Jun 14 21:06:29 2007
@@ -111,6 +111,11 @@
unsigned char* bytes, size_t n,
int little_endian, int is_signed);
+
+/* _PyLong_Format: Convert the long to a string object with given base,
+ appending a base prefix of 0[box] if base is 2, 8 or 16. */
+PyAPI_FUNC(PyObject *) _PyLong_Format(PyObject *aa, int base);
+
#ifdef __cplusplus
}
#endif
Modified: python/branches/cpy_merge/Include/object.h
==============================================================================
--- python/branches/cpy_merge/Include/object.h (original)
+++ python/branches/cpy_merge/Include/object.h Thu Jun 14 21:06:29 2007
@@ -171,6 +171,7 @@
unaryfunc nb_int;
unaryfunc nb_long;
unaryfunc nb_float;
+ /* NB: nb_oct and nb_hex are not used anymore. */
unaryfunc nb_oct;
unaryfunc nb_hex;
Modified: python/branches/cpy_merge/Include/pyerrors.h
==============================================================================
--- python/branches/cpy_merge/Include/pyerrors.h (original)
+++ python/branches/cpy_merge/Include/pyerrors.h Thu Jun 14 21:06:29 2007
@@ -107,7 +107,6 @@
PyAPI_DATA(PyObject *) PyExc_Exception;
PyAPI_DATA(PyObject *) PyExc_StopIteration;
PyAPI_DATA(PyObject *) PyExc_GeneratorExit;
-PyAPI_DATA(PyObject *) PyExc_StandardError;
PyAPI_DATA(PyObject *) PyExc_ArithmeticError;
PyAPI_DATA(PyObject *) PyExc_LookupError;
Modified: python/branches/cpy_merge/Include/pyport.h
==============================================================================
--- python/branches/cpy_merge/Include/pyport.h (original)
+++ python/branches/cpy_merge/Include/pyport.h Thu Jun 14 21:06:29 2007
@@ -50,6 +50,22 @@
#ifdef HAVE_LONG_LONG
#ifndef PY_LONG_LONG
#define PY_LONG_LONG long long
+#if defined(LLONG_MAX)
+/* If LLONG_MAX is defined in limits.h, use that. */
+#define PY_LLONG_MIN LLONG_MIN
+#define PY_LLONG_MAX LLONG_MAX
+#define PY_ULLONG_MAX ULLONG_MAX
+#elif defined(__LONG_LONG_MAX__)
+/* Otherwise, if GCC has a builtin define, use that. */
+#define PY_LLONG_MAX __LONG_LONG_MAX__
+#define PY_LLONG_MIN (-PY_LLONG_MAX-1)
+#define PY_ULLONG_MAX (__LONG_LONG_MAX__*2ULL + 1ULL)
+#else
+/* Otherwise, rely on two's complement. */
+#define PY_ULLONG_MAX (~0ULL)
+#define PY_LLONG_MAX ((long long)(PY_ULLONG_MAX>>1))
+#define PY_LLONG_MIN (-PY_LLONG_MAX-1)
+#endif /* LLONG_MAX */
#endif
#endif /* HAVE_LONG_LONG */
Modified: python/branches/cpy_merge/Lib/CGIHTTPServer.py
==============================================================================
--- python/branches/cpy_merge/Lib/CGIHTTPServer.py (original)
+++ python/branches/cpy_merge/Lib/CGIHTTPServer.py Thu Jun 14 21:06:29 2007
@@ -353,7 +353,7 @@
st = os.stat(path)
except os.error:
return False
- return st.st_mode & 0111 != 0
+ return st.st_mode & 0o111 != 0
def test(HandlerClass = CGIHTTPRequestHandler,
Modified: python/branches/cpy_merge/Lib/_strptime.py
==============================================================================
--- python/branches/cpy_merge/Lib/_strptime.py (original)
+++ python/branches/cpy_merge/Lib/_strptime.py Thu Jun 14 21:06:29 2007
@@ -107,7 +107,7 @@
# magical; just happened to have used it everywhere else where a
# static date was needed.
am_pm = []
- for hour in (01,22):
+ for hour in (1, 22):
time_tuple = time.struct_time((1999,3,17,hour,44,55,2,76,0))
am_pm.append(time.strftime("%p", time_tuple).lower())
self.am_pm = am_pm
@@ -186,7 +186,7 @@
self.locale_time = locale_time
else:
self.locale_time = LocaleTime()
- base = super(TimeRE, self)
+ base = super()
base.__init__({
# The " \d" part of the regex is to make %c from ANSI C work
'd': r"(?P<d>3[0-1]|[1-2]\d|0[1-9]|[1-9]| [1-9])",
@@ -250,7 +250,7 @@
regex_chars = re_compile(r"([\\.^$*+?\(\){}\[\]|])")
format = regex_chars.sub(r"\\\1", format)
whitespace_replacement = re_compile('\s+')
- format = whitespace_replacement.sub('\s*', format)
+ format = whitespace_replacement.sub('\s+', format)
while '%' in format:
directive_index = format.index('%')+1
processed_format = "%s%s%s" % (processed_format,
Modified: python/branches/cpy_merge/Lib/anydbm.py
==============================================================================
--- python/branches/cpy_merge/Lib/anydbm.py (original)
+++ python/branches/cpy_merge/Lib/anydbm.py Thu Jun 14 21:06:29 2007
@@ -3,7 +3,7 @@
Instead of
import dbm
- d = dbm.open(file, 'w', 0666)
+ d = dbm.open(file, 'w', 0o666)
use
@@ -63,7 +63,7 @@
error = tuple(_errors)
-def open(file, flag = 'r', mode = 0666):
+def open(file, flag = 'r', mode = 0o666):
# guess the type of an existing database
from whichdb import whichdb
result=whichdb(file)
Modified: python/branches/cpy_merge/Lib/bsddb/__init__.py
==============================================================================
--- python/branches/cpy_merge/Lib/bsddb/__init__.py (original)
+++ python/branches/cpy_merge/Lib/bsddb/__init__.py Thu Jun 14 21:06:29 2007
@@ -294,7 +294,7 @@
#----------------------------------------------------------------------
# Compatibility object factory functions
-def hashopen(file, flag='c', mode=0666, pgsize=None, ffactor=None, nelem=None,
+def hashopen(file, flag='c', mode=0o666, pgsize=None, ffactor=None, nelem=None,
cachesize=None, lorder=None, hflags=0):
flags = _checkflag(flag, file)
@@ -310,7 +310,7 @@
#----------------------------------------------------------------------
-def btopen(file, flag='c', mode=0666,
+def btopen(file, flag='c', mode=0o666,
btflags=0, cachesize=None, maxkeypage=None, minkeypage=None,
pgsize=None, lorder=None):
@@ -328,7 +328,7 @@
#----------------------------------------------------------------------
-def rnopen(file, flag='c', mode=0666,
+def rnopen(file, flag='c', mode=0o666,
rnflags=0, cachesize=None, pgsize=None, lorder=None,
rlen=None, delim=None, source=None, pad=None):
Modified: python/branches/cpy_merge/Lib/bsddb/dbshelve.py
==============================================================================
--- python/branches/cpy_merge/Lib/bsddb/dbshelve.py (original)
+++ python/branches/cpy_merge/Lib/bsddb/dbshelve.py Thu Jun 14 21:06:29 2007
@@ -40,7 +40,7 @@
#------------------------------------------------------------------------
-def open(filename, flags=db.DB_CREATE, mode=0660, filetype=db.DB_HASH,
+def open(filename, flags=db.DB_CREATE, mode=0o660, filetype=db.DB_HASH,
dbenv=None, dbname=None):
"""
A simple factory function for compatibility with the standard
Modified: python/branches/cpy_merge/Lib/bsddb/dbtables.py
==============================================================================
--- python/branches/cpy_merge/Lib/bsddb/dbtables.py (original)
+++ python/branches/cpy_merge/Lib/bsddb/dbtables.py Thu Jun 14 21:06:29 2007
@@ -22,7 +22,6 @@
import copy
import xdrlib
import random
-from types import ListType, StringType
import cPickle as pickle
try:
@@ -39,7 +38,7 @@
class DBIncompleteError(Exception):
pass
-class TableDBError(StandardError):
+class TableDBError(Exception):
pass
class TableAlreadyExists(TableDBError):
pass
@@ -135,9 +134,9 @@
class bsdTableDB :
- def __init__(self, filename, dbhome, create=0, truncate=0, mode=0600,
+ def __init__(self, filename, dbhome, create=0, truncate=0, mode=0o600,
recover=0, dbflags=0):
- """bsdTableDB(filename, dbhome, create=0, truncate=0, mode=0600)
+ """bsdTableDB(filename, dbhome, create=0, truncate=0, mode=0o600)
Open database name in the dbhome BerkeleyDB directory.
Use keyword arguments when calling this constructor.
@@ -229,7 +228,7 @@
raises TableDBError if it already exists or for other DB errors.
"""
- assert isinstance(columns, ListType)
+ assert isinstance(columns, list)
txn = None
try:
# checking sanity of the table and column names here on
@@ -270,7 +269,7 @@
"""Return a list of columns in the given table.
[] if the table doesn't exist.
"""
- assert isinstance(table, StringType)
+ assert isinstance(table, str)
if contains_metastrings(table):
raise ValueError, "bad table name: contains reserved metastrings"
@@ -300,7 +299,7 @@
additional columns present in the given list as well as
all of its current columns.
"""
- assert isinstance(columns, ListType)
+ assert isinstance(columns, list)
try:
self.CreateTable(table, columns)
except TableAlreadyExists:
Modified: python/branches/cpy_merge/Lib/bsddb/test/test_1413192.py
==============================================================================
--- python/branches/cpy_merge/Lib/bsddb/test/test_1413192.py (original)
+++ python/branches/cpy_merge/Lib/bsddb/test/test_1413192.py Thu Jun 14 21:06:29 2007
@@ -18,4 +18,4 @@
the_txn = env.txn_begin()
map = db.DB(env)
-map.open('xxx.db', "p", db.DB_HASH, db.DB_CREATE, 0666, txn=the_txn)
+map.open('xxx.db', "p", db.DB_HASH, db.DB_CREATE, 0o666, txn=the_txn)
Modified: python/branches/cpy_merge/Lib/bsddb/test/test_basics.py
==============================================================================
--- python/branches/cpy_merge/Lib/bsddb/test/test_basics.py (original)
+++ python/branches/cpy_merge/Lib/bsddb/test/test_basics.py Thu Jun 14 21:06:29 2007
@@ -44,7 +44,7 @@
dbtype = db.DB_UNKNOWN # must be set in derived class
dbopenflags = 0
dbsetflags = 0
- dbmode = 0660
+ dbmode = 0o660
dbname = None
useEnv = 0
envflags = 0
Modified: python/branches/cpy_merge/Lib/bsddb/test/test_env_close.py
==============================================================================
--- python/branches/cpy_merge/Lib/bsddb/test/test_env_close.py (original)
+++ python/branches/cpy_merge/Lib/bsddb/test/test_env_close.py Thu Jun 14 21:06:29 2007
@@ -50,10 +50,10 @@
dbenv = db.DBEnv()
dbenv.open(self.homeDir,
db.DB_INIT_CDB| db.DB_CREATE |db.DB_THREAD|db.DB_INIT_MPOOL,
- 0666)
+ 0o666)
d = db.DB(dbenv)
- d.open(self.filename, db.DB_BTREE, db.DB_CREATE | db.DB_THREAD, 0666)
+ d.open(self.filename, db.DB_BTREE, db.DB_CREATE | db.DB_THREAD, 0o666)
try:
dbenv.close()
@@ -75,10 +75,10 @@
dbenv = db.DBEnv()
dbenv.open(self.homeDir,
db.DB_INIT_CDB| db.DB_CREATE |db.DB_THREAD|db.DB_INIT_MPOOL,
- 0666)
+ 0o666)
d = db.DB(dbenv)
- d.open(self.filename, db.DB_BTREE, db.DB_CREATE | db.DB_THREAD, 0666)
+ d.open(self.filename, db.DB_BTREE, db.DB_CREATE | db.DB_THREAD, 0o666)
try:
dbenv.close()
Modified: python/branches/cpy_merge/Lib/bsddb/test/test_sequence.py
==============================================================================
--- python/branches/cpy_merge/Lib/bsddb/test/test_sequence.py (original)
+++ python/branches/cpy_merge/Lib/bsddb/test/test_sequence.py Thu Jun 14 21:06:29 2007
@@ -26,9 +26,9 @@
tempfile.tempdir = None
self.dbenv = db.DBEnv()
- self.dbenv.open(self.homeDir, db.DB_CREATE | db.DB_INIT_MPOOL, 0666)
+ self.dbenv.open(self.homeDir, db.DB_CREATE | db.DB_INIT_MPOOL, 0o666)
self.d = db.DB(self.dbenv)
- self.d.open(self.filename, db.DB_BTREE, db.DB_CREATE, 0666)
+ self.d.open(self.filename, db.DB_BTREE, db.DB_CREATE, 0o666)
def tearDown(self):
if hasattr(self, 'seq'):
Modified: python/branches/cpy_merge/Lib/cgitb.py
==============================================================================
--- python/branches/cpy_merge/Lib/cgitb.py (original)
+++ python/branches/cpy_merge/Lib/cgitb.py Thu Jun 14 21:06:29 2007
@@ -96,10 +96,10 @@
def html(einfo, context=5):
"""Return a nice HTML document describing a given traceback."""
- import os, types, time, traceback, linecache, inspect, pydoc
+ import os, time, traceback, linecache, inspect, pydoc
etype, evalue, etb = einfo
- if type(etype) is types.ClassType:
+ if isinstance(etype, type):
etype = etype.__name__
pyver = 'Python ' + sys.version.split()[0] + ': ' + sys.executable
date = time.ctime(time.time())
@@ -188,10 +188,10 @@
def text(einfo, context=5):
"""Return a plain text document describing a given traceback."""
- import os, types, time, traceback, linecache, inspect, pydoc
+ import os, time, traceback, linecache, inspect, pydoc
etype, evalue, etb = einfo
- if type(etype) is types.ClassType:
+ if isinstance(etype, type):
etype = etype.__name__
pyver = 'Python ' + sys.version.split()[0] + ': ' + sys.executable
date = time.ctime(time.time())
Modified: python/branches/cpy_merge/Lib/collections.py
==============================================================================
--- python/branches/cpy_merge/Lib/collections.py (original)
+++ python/branches/cpy_merge/Lib/collections.py Thu Jun 14 21:06:29 2007
@@ -4,6 +4,13 @@
from operator import itemgetter as _itemgetter
import sys as _sys
+# For bootstrapping reasons, the collection ABCs are defined in _abcoll.py.
+# They should however be considered an integral part of collections.py.
+from _abcoll import *
+import _abcoll
+__all__ += _abcoll.__all__
+
+
def NamedTuple(typename, s):
"""Returns a new subclass of tuple with named fields.
Modified: python/branches/cpy_merge/Lib/copy.py
==============================================================================
--- python/branches/cpy_merge/Lib/copy.py (original)
+++ python/branches/cpy_merge/Lib/copy.py Thu Jun 14 21:06:29 2007
@@ -100,12 +100,15 @@
def _copy_immutable(x):
return x
for t in (type(None), int, float, bool, str, tuple,
- frozenset, type, range, types.ClassType,
+ frozenset, type, range,
types.BuiltinFunctionType,
types.FunctionType):
d[t] = _copy_immutable
-for name in ("ComplexType", "UnicodeType", "CodeType"):
- t = getattr(types, name, None)
+t = getattr(types, "CodeType", None)
+if t is not None:
+ d[t] = _copy_immutable
+for name in ("complex", "unicode"):
+ t = globals()['__builtins__'].get(name)
if t is not None:
d[t] = _copy_immutable
@@ -195,7 +198,6 @@
pass
d[type] = _deepcopy_atomic
d[range] = _deepcopy_atomic
-d[types.ClassType] = _deepcopy_atomic
d[types.BuiltinFunctionType] = _deepcopy_atomic
d[types.FunctionType] = _deepcopy_atomic
Modified: python/branches/cpy_merge/Lib/ctypes/__init__.py
==============================================================================
--- python/branches/cpy_merge/Lib/ctypes/__init__.py (original)
+++ python/branches/cpy_merge/Lib/ctypes/__init__.py Thu Jun 14 21:06:29 2007
@@ -149,7 +149,7 @@
_type_ = "O"
def __repr__(self):
try:
- return super(py_object, self).__repr__()
+ return super().__repr__()
except ValueError:
return "%s(<NULL>)" % type(self).__name__
_check_size(py_object, "P")
Modified: python/branches/cpy_merge/Lib/ctypes/_endian.py
==============================================================================
--- python/branches/cpy_merge/Lib/ctypes/_endian.py (original)
+++ python/branches/cpy_merge/Lib/ctypes/_endian.py Thu Jun 14 21:06:29 2007
@@ -29,7 +29,7 @@
rest = desc[2:]
fields.append((name, _other_endian(typ)) + rest)
value = fields
- super(_swapped_meta, self).__setattr__(attrname, value)
+ super().__setattr__(attrname, value)
################################################################
Modified: python/branches/cpy_merge/Lib/ctypes/test/test_init.py
==============================================================================
--- python/branches/cpy_merge/Lib/ctypes/test/test_init.py (original)
+++ python/branches/cpy_merge/Lib/ctypes/test/test_init.py Thu Jun 14 21:06:29 2007
@@ -7,7 +7,7 @@
new_was_called = False
def __new__(cls):
- result = super(X, cls).__new__(cls)
+ result = super().__new__(cls)
result.new_was_called = True
return result
Modified: python/branches/cpy_merge/Lib/ctypes/test/test_numbers.py
==============================================================================
--- python/branches/cpy_merge/Lib/ctypes/test/test_numbers.py (original)
+++ python/branches/cpy_merge/Lib/ctypes/test/test_numbers.py Thu Jun 14 21:06:29 2007
@@ -117,7 +117,10 @@
def test_sizes(self):
for t in signed_types + unsigned_types + float_types + bool_types:
- size = struct.calcsize(t._type_)
+ try:
+ size = struct.calcsize(t._type_)
+ except struct.error:
+ continue
# sizeof of the type...
self.failUnlessEqual(sizeof(t), size)
# and sizeof of an instance
Modified: python/branches/cpy_merge/Lib/dbhash.py
==============================================================================
--- python/branches/cpy_merge/Lib/dbhash.py (original)
+++ python/branches/cpy_merge/Lib/dbhash.py Thu Jun 14 21:06:29 2007
@@ -12,5 +12,5 @@
error = bsddb.error # Exported for anydbm
-def open(file, flag = 'r', mode=0666):
+def open(file, flag = 'r', mode=0o666):
return bsddb.hashopen(file, flag, mode)
Modified: python/branches/cpy_merge/Lib/dis.py
==============================================================================
--- python/branches/cpy_merge/Lib/dis.py (original)
+++ python/branches/cpy_merge/Lib/dis.py Thu Jun 14 21:06:29 2007
@@ -26,7 +26,7 @@
items = sorted(x.__dict__.items())
for name, x1 in items:
if isinstance(x1, (types.MethodType, types.FunctionType,
- types.CodeType, types.ClassType, type)):
+ types.CodeType, type)):
print("Disassembly of %s:" % name)
try:
dis(x1)
Modified: python/branches/cpy_merge/Lib/distutils/ccompiler.py
==============================================================================
--- python/branches/cpy_merge/Lib/distutils/ccompiler.py (original)
+++ python/branches/cpy_merge/Lib/distutils/ccompiler.py Thu Jun 14 21:06:29 2007
@@ -1040,7 +1040,7 @@
def move_file (self, src, dst):
return move_file (src, dst, dry_run=self.dry_run)
- def mkpath (self, name, mode=0777):
+ def mkpath (self, name, mode=0o777):
mkpath (name, mode, self.dry_run)
Modified: python/branches/cpy_merge/Lib/distutils/cmd.py
==============================================================================
--- python/branches/cpy_merge/Lib/distutils/cmd.py (original)
+++ python/branches/cpy_merge/Lib/distutils/cmd.py Thu Jun 14 21:06:29 2007
@@ -9,7 +9,6 @@
__revision__ = "$Id$"
import sys, os, re
-from types import *
from distutils.errors import *
from distutils import util, dir_util, file_util, archive_util, dep_util
from distutils import log
@@ -222,7 +221,7 @@
if val is None:
setattr(self, option, default)
return default
- elif type(val) is not StringType:
+ elif not isinstance(val, str):
raise DistutilsOptionError, \
"'%s' must be a %s (got `%s`)" % (option, what, val)
return val
@@ -242,12 +241,12 @@
val = getattr(self, option)
if val is None:
return
- elif type(val) is StringType:
+ elif isinstance(val, str):
setattr(self, option, re.split(r',\s*|\s+', val))
else:
- if type(val) is ListType:
+ if isinstance(val, list):
types = map(type, val)
- ok = (types == [StringType] * len(val))
+ ok = (types == [str] * len(val))
else:
ok = 0
@@ -358,7 +357,7 @@
util.execute(func, args, msg, dry_run=self.dry_run)
- def mkpath (self, name, mode=0777):
+ def mkpath (self, name, mode=0o777):
dir_util.mkpath(name, mode, dry_run=self.dry_run)
@@ -421,9 +420,9 @@
# Allow 'infiles' to be a single string
- if type(infiles) is StringType:
+ if isinstance(infiles, str):
infiles = (infiles,)
- elif type(infiles) not in (ListType, TupleType):
+ elif not isinstance(infiles, (list, tuple)):
raise TypeError, \
"'infiles' must be a string, or a list or tuple of strings"
Modified: python/branches/cpy_merge/Lib/distutils/command/build_py.py
==============================================================================
--- python/branches/cpy_merge/Lib/distutils/command/build_py.py (original)
+++ python/branches/cpy_merge/Lib/distutils/command/build_py.py Thu Jun 14 21:06:29 2007
@@ -114,7 +114,9 @@
build_dir = os.path.join(*([self.build_lib] + package.split('.')))
# Length of path to strip from found files
- plen = len(src_dir)+1
+ plen = 0
+ if src_dir:
+ plen = len(src_dir)+1
# Strip directory from globbed filenames
filenames = [
Modified: python/branches/cpy_merge/Lib/distutils/command/build_scripts.py
==============================================================================
--- python/branches/cpy_merge/Lib/distutils/command/build_scripts.py (original)
+++ python/branches/cpy_merge/Lib/distutils/command/build_scripts.py Thu Jun 14 21:06:29 2007
@@ -119,8 +119,8 @@
if self.dry_run:
log.info("changing mode of %s", file)
else:
- oldmode = os.stat(file)[ST_MODE] & 07777
- newmode = (oldmode | 0555) & 07777
+ oldmode = os.stat(file)[ST_MODE] & 0o7777
+ newmode = (oldmode | 0o555) & 0o7777
if newmode != oldmode:
log.info("changing mode of %s from %o to %o",
file, oldmode, newmode)
Modified: python/branches/cpy_merge/Lib/distutils/command/install_scripts.py
==============================================================================
--- python/branches/cpy_merge/Lib/distutils/command/install_scripts.py (original)
+++ python/branches/cpy_merge/Lib/distutils/command/install_scripts.py Thu Jun 14 21:06:29 2007
@@ -53,7 +53,7 @@
if self.dry_run:
log.info("changing mode of %s", file)
else:
- mode = ((os.stat(file)[ST_MODE]) | 0555) & 07777
+ mode = ((os.stat(file)[ST_MODE]) | 0o555) & 0o7777
log.info("changing mode of %s to %o", file, mode)
os.chmod(file, mode)
Modified: python/branches/cpy_merge/Lib/distutils/command/register.py
==============================================================================
--- python/branches/cpy_merge/Lib/distutils/command/register.py (original)
+++ python/branches/cpy_merge/Lib/distutils/command/register.py Thu Jun 14 21:06:29 2007
@@ -183,7 +183,7 @@
username, password))
f.close()
try:
- os.chmod(rc, 0600)
+ os.chmod(rc, 0o600)
except:
pass
elif choice == '2':
Modified: python/branches/cpy_merge/Lib/distutils/dir_util.py
==============================================================================
--- python/branches/cpy_merge/Lib/distutils/dir_util.py (original)
+++ python/branches/cpy_merge/Lib/distutils/dir_util.py Thu Jun 14 21:06:29 2007
@@ -18,7 +18,7 @@
# I don't use os.makedirs because a) it's new to Python 1.5.2, and
# b) it blows up if the directory already exists (I want to silently
# succeed in that case).
-def mkpath (name, mode=0777, verbose=0, dry_run=0):
+def mkpath (name, mode=0o777, verbose=0, dry_run=0):
"""Create a directory and any missing ancestor directories. If the
directory already exists (or if 'name' is the empty string, which
means the current directory, which of course exists), then do
@@ -85,7 +85,7 @@
# mkpath ()
-def create_tree (base_dir, files, mode=0777, verbose=0, dry_run=0):
+def create_tree (base_dir, files, mode=0o777, verbose=0, dry_run=0):
"""Create all the empty directories under 'base_dir' needed to
put 'files' there. 'base_dir' is just the a name of a directory
Modified: python/branches/cpy_merge/Lib/distutils/dist.py
==============================================================================
--- python/branches/cpy_merge/Lib/distutils/dist.py (original)
+++ python/branches/cpy_merge/Lib/distutils/dist.py Thu Jun 14 21:06:29 2007
@@ -9,7 +9,6 @@
__revision__ = "$Id$"
import sys, os, re
-from types import *
from copy import copy
try:
@@ -527,7 +526,7 @@
# Also make sure that the command object provides a list of its
# known options.
if not (hasattr(cmd_class, 'user_options') and
- type(cmd_class.user_options) is ListType):
+ isinstance(cmd_class.user_options, list)):
raise DistutilsClassError, \
("command class %s must provide " +
"'user_options' attribute (a list of tuples)") % \
@@ -543,7 +542,7 @@
# Check for help_options in command class. They have a different
# format (tuple of four) so we need to preprocess them here.
if (hasattr(cmd_class, 'help_options') and
- type(cmd_class.help_options) is ListType):
+ isinstance(cmd_class.help_options, list)):
help_options = fix_help_options(cmd_class.help_options)
else:
help_options = []
@@ -561,7 +560,7 @@
return
if (hasattr(cmd_class, 'help_options') and
- type(cmd_class.help_options) is ListType):
+ isinstance(cmd_class.help_options, list)):
help_option_found=0
for (help_option, short, desc, func) in cmd_class.help_options:
if hasattr(opts, parser.get_attr_name(help_option)):
@@ -598,13 +597,13 @@
keywords = self.metadata.keywords
if keywords is not None:
- if type(keywords) is StringType:
+ if isinstance(keywords, str):
keywordlist = keywords.split(',')
self.metadata.keywords = [x.strip() for x in keywordlist]
platforms = self.metadata.platforms
if platforms is not None:
- if type(platforms) is StringType:
+ if isinstance(platforms, str):
platformlist = platforms.split(',')
self.metadata.platforms = [x.strip() for x in platformlist]
@@ -646,12 +645,12 @@
print()
for command in self.commands:
- if type(command) is ClassType and issubclass(command, Command):
+ if isinstance(command, type) and issubclass(command, Command):
klass = command
else:
klass = self.get_command_class(command)
if (hasattr(klass, 'help_options') and
- type(klass.help_options) is ListType):
+ isinstance(klass.help_options, list)):
parser.set_option_table(klass.user_options +
fix_help_options(klass.help_options))
else:
@@ -906,7 +905,7 @@
neg_opt = {}
try:
- is_string = type(value) is StringType
+ is_string = isinstance(value, str)
if option in neg_opt and is_string:
setattr(command_obj, neg_opt[option], not strtobool(value))
elif option in bool_opts and is_string:
Modified: python/branches/cpy_merge/Lib/distutils/extension.py
==============================================================================
--- python/branches/cpy_merge/Lib/distutils/extension.py (original)
+++ python/branches/cpy_merge/Lib/distutils/extension.py Thu Jun 14 21:06:29 2007
@@ -6,7 +6,6 @@
__revision__ = "$Id$"
import os, sys
-from types import *
try:
import warnings
@@ -103,9 +102,9 @@
language=None,
**kw # To catch unknown keywords
):
- assert type(name) is StringType, "'name' must be a string"
- assert (type(sources) is ListType and
- map(type, sources) == [StringType]*len(sources)), \
+ assert isinstance(name, str), "'name' must be a string"
+ assert (isinstance(sources, list) and
+ map(type, sources) == [str]*len(sources)), \
"'sources' must be a list of strings"
self.name = name
Modified: python/branches/cpy_merge/Lib/distutils/mwerkscompiler.py
==============================================================================
--- python/branches/cpy_merge/Lib/distutils/mwerkscompiler.py (original)
+++ python/branches/cpy_merge/Lib/distutils/mwerkscompiler.py Thu Jun 14 21:06:29 2007
@@ -18,7 +18,6 @@
import distutils.util
import distutils.dir_util
from distutils import log
-import mkcwproject
class MWerksCompiler (CCompiler) :
"""Concrete class that implements an interface to MetroWerks CodeWarrior,
@@ -188,6 +187,7 @@
# doesn't have a clue about our working directory.
xmlfilename = os.path.join(os.getcwd(), os.path.join(build_temp, xmlname))
log.debug("\tCreate XML file %s", xmlfilename)
+ import mkcwproject
xmlbuilder = mkcwproject.cwxmlgen.ProjectBuilder(settings)
xmlbuilder.generate()
xmldata = settings['tmp_projectxmldata']
Modified: python/branches/cpy_merge/Lib/distutils/tests/support.py
==============================================================================
--- python/branches/cpy_merge/Lib/distutils/tests/support.py (original)
+++ python/branches/cpy_merge/Lib/distutils/tests/support.py Thu Jun 14 21:06:29 2007
@@ -9,12 +9,12 @@
class LoggingSilencer(object):
def setUp(self):
- super(LoggingSilencer, self).setUp()
+ super().setUp()
self.threshold = log.set_threshold(log.FATAL)
def tearDown(self):
log.set_threshold(self.threshold)
- super(LoggingSilencer, self).tearDown()
+ super().tearDown()
class TempdirManager(object):
@@ -24,11 +24,11 @@
"""
def setUp(self):
- super(TempdirManager, self).setUp()
+ super().setUp()
self.tempdirs = []
def tearDown(self):
- super(TempdirManager, self).tearDown()
+ super().tearDown()
while self.tempdirs:
d = self.tempdirs.pop()
shutil.rmtree(d)
Modified: python/branches/cpy_merge/Lib/distutils/tests/test_build_py.py
==============================================================================
--- python/branches/cpy_merge/Lib/distutils/tests/test_build_py.py (original)
+++ python/branches/cpy_merge/Lib/distutils/tests/test_build_py.py Thu Jun 14 21:06:29 2007
@@ -1,10 +1,13 @@
"""Tests for distutils.command.build_py."""
import os
+import sys
+import StringIO
import unittest
from distutils.command.build_py import build_py
from distutils.core import Distribution
+from distutils.errors import DistutilsFileError
from distutils.tests import support
@@ -53,6 +56,38 @@
self.assert_("__init__.pyc" in files)
self.assert_("README.txt" in files)
+ def test_empty_package_dir (self):
+ # See SF 1668596/1720897.
+ cwd = os.getcwd()
+
+ # create the distribution files.
+ sources = self.mkdtemp()
+ open(os.path.join(sources, "__init__.py"), "w").close()
+
+ testdir = os.path.join(sources, "doc")
+ os.mkdir(testdir)
+ open(os.path.join(testdir, "testfile"), "w").close()
+
+ os.chdir(sources)
+ sys.stdout = StringIO.StringIO()
+
+ try:
+ dist = Distribution({"packages": ["pkg"],
+ "package_dir": {"pkg": ""},
+ "package_data": {"pkg": ["doc/*"]}})
+ # script_name need not exist, it just need to be initialized
+ dist.script_name = os.path.join(sources, "setup.py")
+ dist.script_args = ["build"]
+ dist.parse_command_line()
+
+ try:
+ dist.run_commands()
+ except DistutilsFileError:
+ self.fail("failed package_data test when package_dir is ''")
+ finally:
+ # Restore state.
+ os.chdir(cwd)
+ sys.stdout = sys.__stdout__
def test_suite():
return unittest.makeSuite(BuildPyTestCase)
Modified: python/branches/cpy_merge/Lib/distutils/text_file.py
==============================================================================
--- python/branches/cpy_merge/Lib/distutils/text_file.py (original)
+++ python/branches/cpy_merge/Lib/distutils/text_file.py Thu Jun 14 21:06:29 2007
@@ -6,7 +6,6 @@
__revision__ = "$Id$"
-from types import *
import sys, os
@@ -137,7 +136,7 @@
if line is None:
line = self.current_line
outmsg.append(self.filename + ", ")
- if type (line) in (ListType, TupleType):
+ if isinstance (line, (list, tuple)):
outmsg.append("lines %d-%d: " % tuple (line))
else:
outmsg.append("line %d: " % line)
@@ -239,7 +238,7 @@
line = buildup_line + line
# careful: pay attention to line number when incrementing it
- if type (self.current_line) is ListType:
+ if isinstance (self.current_line, list):
self.current_line[1] = self.current_line[1] + 1
else:
self.current_line = [self.current_line,
@@ -250,7 +249,7 @@
return None
# still have to be careful about incrementing the line number!
- if type (self.current_line) is ListType:
+ if isinstance (self.current_line, list):
self.current_line = self.current_line[1] + 1
else:
self.current_line = self.current_line + 1
Modified: python/branches/cpy_merge/Lib/distutils/unixccompiler.py
==============================================================================
--- python/branches/cpy_merge/Lib/distutils/unixccompiler.py (original)
+++ python/branches/cpy_merge/Lib/distutils/unixccompiler.py Thu Jun 14 21:06:29 2007
@@ -16,7 +16,6 @@
__revision__ = "$Id$"
import os, sys
-from types import StringType, NoneType
from copy import copy
from distutils import sysconfig
@@ -212,7 +211,7 @@
lib_opts = gen_lib_options(self, library_dirs, runtime_library_dirs,
libraries)
- if type(output_dir) not in (StringType, NoneType):
+ if not isinstance(output_dir, (str, type(None))):
raise TypeError, "'output_dir' must be a string or None"
if output_dir is not None:
output_filename = os.path.join(output_dir, output_filename)
Modified: python/branches/cpy_merge/Lib/dumbdbm.py
==============================================================================
--- python/branches/cpy_merge/Lib/dumbdbm.py (original)
+++ python/branches/cpy_merge/Lib/dumbdbm.py Thu Jun 14 21:06:29 2007
@@ -219,7 +219,7 @@
self._os.chmod(file, self._mode)
-def open(file, flag=None, mode=0666):
+def open(file, flag=None, mode=0o666):
"""Open the database file, filename, and return corresponding object.
The flag argument, used to control how the database is opened in the
@@ -228,7 +228,7 @@
not exist.
The optional mode argument is the UNIX mode of the file, used only when
- the database has to be created. It defaults to octal code 0666 (and
+ the database has to be created. It defaults to octal code 0o666 (and
will be modified by the prevailing umask).
"""
Modified: python/branches/cpy_merge/Lib/encodings/uu_codec.py
==============================================================================
--- python/branches/cpy_merge/Lib/encodings/uu_codec.py (original)
+++ python/branches/cpy_merge/Lib/encodings/uu_codec.py Thu Jun 14 21:06:29 2007
@@ -12,7 +12,7 @@
### Codec APIs
-def uu_encode(input,errors='strict',filename='<data>',mode=0666):
+def uu_encode(input,errors='strict',filename='<data>',mode=0o666):
""" Encodes the object input and returns a tuple (output
object, length consumed).
@@ -31,7 +31,7 @@
write = outfile.write
# Encode
- write('begin %o %s\n' % (mode & 0777, filename))
+ write('begin %o %s\n' % (mode & 0o777, filename))
chunk = read(45)
while chunk:
write(b2a_uu(chunk))
Modified: python/branches/cpy_merge/Lib/ftplib.py
==============================================================================
--- python/branches/cpy_merge/Lib/ftplib.py (original)
+++ python/branches/cpy_merge/Lib/ftplib.py Thu Jun 14 21:06:29 2007
@@ -319,9 +319,7 @@
size = None
if self.passiveserver:
host, port = self.makepasv()
- af, socktype, proto, canon, sa = socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM)[0]
- conn = socket.socket(af, socktype, proto)
- conn.connect(sa)
+ conn = socket.create_connection((host, port), self.timeout)
if rest is not None:
self.sendcmd("REST %s" % rest)
resp = self.sendcmd(cmd)
Modified: python/branches/cpy_merge/Lib/idlelib/CallTips.py
==============================================================================
--- python/branches/cpy_merge/Lib/idlelib/CallTips.py (original)
+++ python/branches/cpy_merge/Lib/idlelib/CallTips.py Thu Jun 14 21:06:29 2007
@@ -131,14 +131,14 @@
arg_text = ""
if ob is not None:
arg_offset = 0
- if type(ob) in (types.ClassType, types.TypeType):
+ if isinstance(ob, type):
# Look for the highest __init__ in the class chain.
fob = _find_constructor(ob)
if fob is None:
fob = lambda: None
else:
arg_offset = 1
- elif type(ob)==types.MethodType:
+ elif isinstace(ob, types.MethodType):
# bit of a hack for methods - turn it into a function
# but we drop the "self" param.
fob = ob.im_func
@@ -146,7 +146,7 @@
else:
fob = ob
# Try to build one for Python defined functions
- if type(fob) in [types.FunctionType, types.LambdaType]:
+ if isinstance(fob, (types.FunctionType, types.LambdaType)):
argcount = fob.__code__.co_argcount
real_args = fob.__code__.co_varnames[arg_offset:argcount]
defaults = fob.__defaults__ or []
Modified: python/branches/cpy_merge/Lib/idlelib/ObjectBrowser.py
==============================================================================
--- python/branches/cpy_merge/Lib/idlelib/ObjectBrowser.py (original)
+++ python/branches/cpy_merge/Lib/idlelib/ObjectBrowser.py Thu Jun 14 21:06:29 2007
@@ -101,17 +101,14 @@
pass
return keys
-from types import *
-
dispatch = {
- IntType: AtomicObjectTreeItem,
- LongType: AtomicObjectTreeItem,
- FloatType: AtomicObjectTreeItem,
- StringType: AtomicObjectTreeItem,
- TupleType: SequenceTreeItem,
- ListType: SequenceTreeItem,
- DictType: DictTreeItem,
- ClassType: ClassTreeItem,
+ int: AtomicObjectTreeItem,
+ float: AtomicObjectTreeItem,
+ str: AtomicObjectTreeItem,
+ tuple: SequenceTreeItem,
+ list: SequenceTreeItem,
+ dict: DictTreeItem,
+ type: ClassTreeItem,
}
def make_objecttreeitem(labeltext, object, setfunction=None):
Modified: python/branches/cpy_merge/Lib/idlelib/rpc.py
==============================================================================
--- python/branches/cpy_merge/Lib/idlelib/rpc.py (original)
+++ python/branches/cpy_merge/Lib/idlelib/rpc.py Thu Jun 14 21:06:29 2007
@@ -287,7 +287,7 @@
def _proxify(self, obj):
if isinstance(obj, RemoteProxy):
return RPCProxy(self, obj.oid)
- if isinstance(obj, types.ListType):
+ if isinstance(obj, list):
return map(self._proxify, obj)
# XXX Check for other types -- not currently needed
return obj
@@ -574,7 +574,7 @@
attr = getattr(obj, name)
if hasattr(attr, '__call__'):
methods[name] = 1
- if type(obj) == types.ClassType:
+ if isinstance(obj, type):
for super in obj.__bases__:
_getmethods(super, methods)
Modified: python/branches/cpy_merge/Lib/imputil.py
==============================================================================
--- python/branches/cpy_merge/Lib/imputil.py (original)
+++ python/branches/cpy_merge/Lib/imputil.py Thu Jun 14 21:06:29 2007
@@ -476,7 +476,7 @@
s = _os_stat(pathname)
except OSError:
return None
- return (s.st_mode & 0170000) == 0040000
+ return (s.st_mode & 0o170000) == 0o040000
def _timestamp(pathname):
"Return the file modification time as a Long."
Modified: python/branches/cpy_merge/Lib/inspect.py
==============================================================================
--- python/branches/cpy_merge/Lib/inspect.py (original)
+++ python/branches/cpy_merge/Lib/inspect.py Thu Jun 14 21:06:29 2007
@@ -47,7 +47,7 @@
Class objects provide these attributes:
__doc__ documentation string
__module__ name of module in which this class was defined"""
- return isinstance(object, types.ClassType) or hasattr(object, '__bases__')
+ return isinstance(object, type) or hasattr(object, '__bases__')
def ismethod(object):
"""Return true if the object is an instance method.
@@ -313,7 +313,7 @@
doc = object.__doc__
except AttributeError:
return None
- if not isinstance(doc, types.StringTypes):
+ if not isinstance(doc, basestring):
return None
try:
lines = doc.expandtabs().split('\n')
Modified: python/branches/cpy_merge/Lib/lib-tk/ScrolledText.py
==============================================================================
--- python/branches/cpy_merge/Lib/lib-tk/ScrolledText.py (original)
+++ python/branches/cpy_merge/Lib/lib-tk/ScrolledText.py Thu Jun 14 21:06:29 2007
@@ -21,7 +21,7 @@
cnf = _cnfmerge((cnf, kw))
fcnf = {}
for k in cnf.keys():
- if type(k) == ClassType or k == 'name':
+ if isinstace(k, type) or k == 'name':
fcnf[k] = cnf[k]
del cnf[k]
self.frame = Frame(master, **fcnf)
Modified: python/branches/cpy_merge/Lib/lib-tk/Tkinter.py
==============================================================================
--- python/branches/cpy_merge/Lib/lib-tk/Tkinter.py (original)
+++ python/branches/cpy_merge/Lib/lib-tk/Tkinter.py Thu Jun 14 21:06:29 2007
@@ -38,7 +38,6 @@
import _tkinter # If this fails your Python may not be configured for Tk
tkinter = _tkinter # b/w compat for export
TclError = _tkinter.TclError
-from types import *
from Tkconstants import *
try:
import MacOS; _MacOS = MacOS; del MacOS
@@ -61,11 +60,11 @@
except AttributeError: _tkinter.deletefilehandler = None
-def _flatten(tuple):
+def _flatten(seq):
"""Internal function."""
res = ()
- for item in tuple:
- if type(item) in (TupleType, ListType):
+ for item in seq:
+ if isinstance(item, (tuple, list)):
res = res + _flatten(item)
elif item is not None:
res = res + (item,)
@@ -76,9 +75,9 @@
def _cnfmerge(cnfs):
"""Internal function."""
- if type(cnfs) is DictionaryType:
+ if isinstance(cnfs, dict):
return cnfs
- elif type(cnfs) in (NoneType, StringType):
+ elif isinstance(cnfs, (type(None), str)):
return cnfs
else:
cnf = {}
@@ -867,7 +866,7 @@
data = self.tk.split(
self.tk.call('winfo', 'visualsavailable', self._w,
includeids and 'includeids' or None))
- if type(data) is StringType:
+ if isinstance(data, str):
data = [self.tk.split(data)]
return map(self.__winfo_parseitem, data)
def __winfo_parseitem(self, t):
@@ -934,7 +933,7 @@
self.tk.call('bindtags', self._w, tagList)
def _bind(self, what, sequence, func, add, needcleanup=1):
"""Internal function."""
- if type(func) is StringType:
+ if isinstance(func, str):
self.tk.call(what + (sequence, func))
elif func:
funcid = self._register(func, self._substitute,
@@ -1181,7 +1180,7 @@
self.tk.call(_flatten((self._w, cmd)))):
cnf[x[0][1:]] = (x[0][1:],) + x[1:]
return cnf
- if type(cnf) is StringType:
+ if isinstance(cnf, str):
x = self.tk.split(
self.tk.call(_flatten((self._w, cmd, '-'+cnf))))
return (x[0][1:],) + x[1:]
@@ -1262,7 +1261,7 @@
bbox = grid_bbox
def _grid_configure(self, command, index, cnf, kw):
"""Internal function."""
- if type(cnf) is StringType and not kw:
+ if isinstance(cnf, str) and not kw:
if cnf[-1:] == '_':
cnf = cnf[:-1]
if cnf[:1] != '-':
@@ -1923,7 +1922,7 @@
BaseWidget._setup(self, master, cnf)
classes = []
for k in cnf.keys():
- if type(k) is ClassType:
+ if isinstance(k, type):
classes.append((k, cnf[k]))
del cnf[k]
self.tk.call(
@@ -2136,7 +2135,7 @@
"""Internal function."""
args = _flatten(args)
cnf = args[-1]
- if type(cnf) in (DictionaryType, TupleType):
+ if isinstance(cnf, (dict, tuple)):
args = args[:-1]
else:
cnf = {}
@@ -3695,7 +3694,7 @@
'paneconfigure', tagOrId)):
cnf[x[0][1:]] = (x[0][1:],) + x[1:]
return cnf
- if type(cnf) == StringType and not kw:
+ if isinstance(cnf, str) and not kw:
x = self.tk.split(self.tk.call(
self._w, 'paneconfigure', tagOrId, '-'+cnf))
return (x[0][1:],) + x[1:]
Modified: python/branches/cpy_merge/Lib/logging/__init__.py
==============================================================================
--- python/branches/cpy_merge/Lib/logging/__init__.py (original)
+++ python/branches/cpy_merge/Lib/logging/__init__.py Thu Jun 14 21:06:29 2007
@@ -26,7 +26,7 @@
To use, simply 'import logging' and log away!
"""
-import sys, os, types, time, cStringIO, traceback
+import sys, os, time, cStringIO, traceback
try:
import codecs
@@ -48,6 +48,8 @@
# Miscellaneous module data
#---------------------------------------------------------------------------
+_unicode = 'unicode' in dir(__builtins__)
+
#
# _srcfile is used when walking the stack to check when we've got the first
# caller stack frame.
@@ -234,7 +236,7 @@
# 'Value is %d' instead of 'Value is 0'.
# For the use case of passing a dictionary, this should not be a
# problem.
- if args and (len(args) == 1) and args[0] and (type(args[0]) == types.DictType):
+ if args and (len(args) == 1) and args[0] and isinstance(args[0], dict):
args = args[0]
self.args = args
self.levelname = getLevelName(level)
@@ -275,11 +277,11 @@
Return the message for this LogRecord after merging any user-supplied
arguments with the message.
"""
- if not hasattr(types, "UnicodeType"): #if no unicode support...
+ if not _unicode: #if no unicode support...
msg = str(self.msg)
else:
msg = self.msg
- if type(msg) not in (types.UnicodeType, types.StringType):
+ if not isinstance(msg, basestring):
try:
msg = str(self.msg)
except UnicodeError:
@@ -743,7 +745,7 @@
try:
msg = self.format(record)
fs = "%s\n"
- if not hasattr(types, "UnicodeType"): #if no unicode support...
+ if not _unicode: #if no unicode support...
self.stream.write(fs % msg)
else:
try:
@@ -1053,7 +1055,7 @@
logger.log(level, "We have a %s", "mysterious problem", exc_info=1)
"""
- if type(level) != types.IntType:
+ if not isinstance(level, int):
if raiseExceptions:
raise TypeError, "level must be an integer"
else:
@@ -1103,7 +1105,7 @@
else:
fn, lno, func = "(unknown file)", 0, "(unknown function)"
if exc_info:
- if type(exc_info) != types.TupleType:
+ if not isinstance(exc_info, tuple):
exc_info = sys.exc_info()
record = self.makeRecord(self.name, level, fn, lno, msg, args, exc_info, func, extra)
self.handle(record)
Modified: python/branches/cpy_merge/Lib/logging/config.py
==============================================================================
--- python/branches/cpy_merge/Lib/logging/config.py (original)
+++ python/branches/cpy_merge/Lib/logging/config.py Thu Jun 14 21:06:29 2007
@@ -27,7 +27,7 @@
To use, simply 'import logging' and log away!
"""
-import sys, logging, logging.handlers, socket, struct, os, traceback, types
+import sys, logging, logging.handlers, socket, struct, os, traceback
try:
import thread
@@ -289,7 +289,7 @@
traceback.print_exc()
os.remove(file)
except socket.error as e:
- if type(e.args) != types.TupleType:
+ if not isinstancetype(e.args, tuple):
raise
else:
errcode = e.args[0]
Modified: python/branches/cpy_merge/Lib/logging/handlers.py
==============================================================================
--- python/branches/cpy_merge/Lib/logging/handlers.py (original)
+++ python/branches/cpy_merge/Lib/logging/handlers.py Thu Jun 14 21:06:29 2007
@@ -27,7 +27,7 @@
To use, simply 'import logging' and log away!
"""
-import sys, logging, socket, types, os, struct, time, glob
+import sys, logging, socket, os, struct, time, glob
try:
import cPickle as pickle
except ImportError:
@@ -637,7 +637,7 @@
self.address = address
self.facility = facility
- if type(address) == types.StringType:
+ if isinstance(address, str):
self.unixsocket = 1
self._connect_unixsocket(address)
else:
@@ -669,9 +669,9 @@
priority_names mapping dictionaries are used to convert them to
integers.
"""
- if type(facility) == types.StringType:
+ if isinstance(facility, str):
facility = self.facility_names[facility]
- if type(priority) == types.StringType:
+ if isinstance(priority, str):
priority = self.priority_names[priority]
return (facility << 3) | priority
@@ -738,16 +738,16 @@
for the credentials argument.
"""
logging.Handler.__init__(self)
- if type(mailhost) == types.TupleType:
+ if isinstance(mailhost, tuple):
self.mailhost, self.mailport = mailhost
else:
self.mailhost, self.mailport = mailhost, None
- if type(credentials) == types.TupleType:
+ if isinstance(credentials, tuple):
self.username, self.password = credentials
else:
self.username = None
self.fromaddr = fromaddr
- if type(toaddrs) == types.StringType:
+ if isinstance(toaddrs, str):
toaddrs = [toaddrs]
self.toaddrs = toaddrs
self.subject = subject
Modified: python/branches/cpy_merge/Lib/mailbox.py
==============================================================================
--- python/branches/cpy_merge/Lib/mailbox.py (original)
+++ python/branches/cpy_merge/Lib/mailbox.py Thu Jun 14 21:06:29 2007
@@ -227,10 +227,10 @@
Mailbox.__init__(self, dirname, factory, create)
if not os.path.exists(self._path):
if create:
- os.mkdir(self._path, 0700)
- os.mkdir(os.path.join(self._path, 'tmp'), 0700)
- os.mkdir(os.path.join(self._path, 'new'), 0700)
- os.mkdir(os.path.join(self._path, 'cur'), 0700)
+ os.mkdir(self._path, 0o700)
+ os.mkdir(os.path.join(self._path, 'tmp'), 0o700)
+ os.mkdir(os.path.join(self._path, 'new'), 0o700)
+ os.mkdir(os.path.join(self._path, 'cur'), 0o700)
else:
raise NoSuchMailboxError(self._path)
self._toc = {}
@@ -802,9 +802,9 @@
Mailbox.__init__(self, path, factory, create)
if not os.path.exists(self._path):
if create:
- os.mkdir(self._path, 0700)
+ os.mkdir(self._path, 0o700)
os.close(os.open(os.path.join(self._path, '.mh_sequences'),
- os.O_CREAT | os.O_EXCL | os.O_WRONLY, 0600))
+ os.O_CREAT | os.O_EXCL | os.O_WRONLY, 0o600))
else:
raise NoSuchMailboxError(self._path)
self._locked = False
Modified: python/branches/cpy_merge/Lib/mhlib.py
==============================================================================
--- python/branches/cpy_merge/Lib/mhlib.py (original)
+++ python/branches/cpy_merge/Lib/mhlib.py Thu Jun 14 21:06:29 2007
@@ -67,7 +67,7 @@
MH_PROFILE = '~/.mh_profile'
PATH = '~/Mail'
MH_SEQUENCES = '.mh_sequences'
-FOLDER_PROTECT = 0700
+FOLDER_PROTECT = 0o700
# Imported modules
Modified: python/branches/cpy_merge/Lib/new.py
==============================================================================
--- python/branches/cpy_merge/Lib/new.py (original)
+++ python/branches/cpy_merge/Lib/new.py Thu Jun 14 21:06:29 2007
@@ -4,7 +4,7 @@
Objects of most types can now be created by calling the type object.
"""
-from types import ClassType as classobj
+classobj = type
from types import FunctionType as function
from types import MethodType as instancemethod
from types import ModuleType as module
Modified: python/branches/cpy_merge/Lib/optparse.py
==============================================================================
--- python/branches/cpy_merge/Lib/optparse.py (original)
+++ python/branches/cpy_merge/Lib/optparse.py Thu Jun 14 21:06:29 2007
@@ -67,7 +67,6 @@
"""
import sys, os
-import types
import textwrap
def _repr(self):
@@ -641,7 +640,7 @@
# Python 2.1 and earlier, and is short-circuited by the
# first check on modern Pythons.)
import __builtin__
- if ( type(self.type) is types.TypeType or
+ if ( isinstance(self.type, type) or
(hasattr(self.type, "__name__") and
getattr(__builtin__, self.type.__name__, None) is self.type) ):
self.type = self.type.__name__
@@ -660,7 +659,7 @@
if self.choices is None:
raise OptionError(
"must supply a list of choices for type 'choice'", self)
- elif type(self.choices) not in (types.TupleType, types.ListType):
+ elif not isinstance(self.choices, (tuple, list)):
raise OptionError(
"choices must be a list of strings ('%s' supplied)"
% str(type(self.choices)).split("'")[1], self)
@@ -704,12 +703,12 @@
raise OptionError(
"callback not callable: %r" % self.callback, self)
if (self.callback_args is not None and
- type(self.callback_args) is not types.TupleType):
+ not isinstance(self.callback_args, tuple)):
raise OptionError(
"callback_args, if supplied, must be a tuple: not %r"
% self.callback_args, self)
if (self.callback_kwargs is not None and
- type(self.callback_kwargs) is not types.DictType):
+ not isinstance(self.callback_kwargs, dict)):
raise OptionError(
"callback_kwargs, if supplied, must be a dict: not %r"
% self.callback_kwargs, self)
@@ -817,7 +816,7 @@
SUPPRESS_USAGE = "SUPPRESS"+"USAGE"
def isbasestring(x):
- return isinstance(x, types.StringType) or isinstance(x, types.UnicodeType)
+ return isinstance(x, basestring)
class Values:
@@ -834,7 +833,7 @@
def __eq__(self, other):
if isinstance(other, Values):
return self.__dict__ == other.__dict__
- elif isinstance(other, types.DictType):
+ elif isinstance(other, dict):
return self.__dict__ == other
else:
return NotImplemented
@@ -995,7 +994,7 @@
"""add_option(Option)
add_option(opt_str, ..., kwarg=val, ...)
"""
- if type(args[0]) is types.StringType:
+ if isinstance(args[0], str):
option = self.option_class(*args, **kwargs)
elif len(args) == 1 and not kwargs:
option = args[0]
@@ -1306,7 +1305,7 @@
def add_option_group(self, *args, **kwargs):
# XXX lots of overlap with OptionContainer.add_option()
- if type(args[0]) is types.StringType:
+ if isinstance(args[0], str):
group = OptionGroup(self, *args, **kwargs)
elif len(args) == 1 and not kwargs:
group = args[0]
Modified: python/branches/cpy_merge/Lib/os.py
==============================================================================
--- python/branches/cpy_merge/Lib/os.py (original)
+++ python/branches/cpy_merge/Lib/os.py Thu Jun 14 21:06:29 2007
@@ -147,8 +147,8 @@
# Super directory utilities.
# (Inspired by Eric Raymond; the doc strings are mostly his)
-def makedirs(name, mode=0777):
- """makedirs(path [, mode=0777])
+def makedirs(name, mode=0o777):
+ """makedirs(path [, mode=0o777])
Super-mkdir; create a leaf directory and all intermediate ones.
Works like mkdir, except that any intermediate path segment (not
@@ -405,108 +405,63 @@
raise error, saved_exc, saved_tb
raise error, last_exc, tb
-# Change environ to automatically call putenv() if it exists
-try:
- # This will fail if there's no putenv
- putenv
-except NameError:
- pass
+
+if name == "riscos":
+ # On RISC OS, all env access goes through getenv and putenv
+ from riscosenviron import _Environ
else:
- import UserDict
+ # Change environ to automatically call putenv(), unsetenv if they exist.
+ from _abcoll import MutableMapping # Can't use collections (bootstrap)
- # Fake unsetenv() for Windows
- # not sure about os2 here but
- # I'm guessing they are the same.
-
- if name in ('os2', 'nt'):
- def unsetenv(key):
- putenv(key, "")
-
- if name == "riscos":
- # On RISC OS, all env access goes through getenv and putenv
- from riscosenviron import _Environ
- elif name in ('os2', 'nt'): # Where Env Var Names Must Be UPPERCASE
- # But we store them as upper case
- class _Environ(UserDict.IterableUserDict):
- def __init__(self, environ):
- UserDict.UserDict.__init__(self)
- data = self.data
- for k, v in environ.items():
- data[k.upper()] = v
- def __setitem__(self, key, item):
- putenv(key, item)
- self.data[key.upper()] = item
- def __getitem__(self, key):
- return self.data[key.upper()]
- try:
- unsetenv
- except NameError:
- def __delitem__(self, key):
- del self.data[key.upper()]
- else:
- def __delitem__(self, key):
- unsetenv(key)
- del self.data[key.upper()]
- def __contains__(self, key):
- return key.upper() in self.data
- def get(self, key, failobj=None):
- return self.data.get(key.upper(), failobj)
- def update(self, dict=None, **kwargs):
- if dict:
- try:
- keys = dict.keys()
- except AttributeError:
- # List of (key, value)
- for k, v in dict:
- self[k] = v
- else:
- # got keys
- # cannot use items(), since mappings
- # may not have them.
- for k in keys:
- self[k] = dict[k]
- if kwargs:
- self.update(kwargs)
- def copy(self):
- return dict(self)
+ class _Environ(MutableMapping):
+ def __init__(self, environ, keymap, putenv, unsetenv):
+ self.keymap = keymap
+ self.putenv = putenv
+ self.unsetenv = unsetenv
+ self.data = data = {}
+ for key, value in environ.items():
+ data[keymap(key)] = value
+ def __getitem__(self, key):
+ return self.data[self.keymap(key)]
+ def __setitem__(self, key, item):
+ self.putenv(key, item)
+ self.data[self.keymap(key)] = item
+ def __delitem__(self, key):
+ self.unsetenv(key)
+ del self.data[self.keymap(key)]
+ def __iter__(self):
+ for key in self.data:
+ yield key
+ def __len__(self):
+ return len(self.data)
+ def copy(self):
+ return dict(self)
+ def setdefault(self, key, value):
+ if key not in self:
+ self[key] = value
+ return self[key]
+
+ try:
+ _putenv = putenv
+ except NameError:
+ _putenv = lambda key, value: None
+ else:
+ __all__.append("putenv")
+ try:
+ _unsetenv = unsetenv
+ except NameError:
+ _unsetenv = lambda key: _putenv(key, "")
+ else:
+ __all__.append("unsetenv")
+
+ if name in ('os2', 'nt'): # Where Env Var Names Must Be UPPERCASE
+ _keymap = lambda key: key.upper()
else: # Where Env Var Names Can Be Mixed Case
- class _Environ(UserDict.IterableUserDict):
- def __init__(self, environ):
- UserDict.UserDict.__init__(self)
- self.data = environ
- def __setitem__(self, key, item):
- putenv(key, item)
- self.data[key] = item
- def update(self, dict=None, **kwargs):
- if dict:
- try:
- keys = dict.keys()
- except AttributeError:
- # List of (key, value)
- for k, v in dict:
- self[k] = v
- else:
- # got keys
- # cannot use items(), since mappings
- # may not have them.
- for k in keys:
- self[k] = dict[k]
- if kwargs:
- self.update(kwargs)
- try:
- unsetenv
- except NameError:
- pass
- else:
- def __delitem__(self, key):
- unsetenv(key)
- del self.data[key]
- def copy(self):
- return dict(self)
+ _keymap = lambda key: key
+ environ = _Environ(environ, _keymap, _putenv, _unsetenv)
- environ = _Environ(environ)
def getenv(key, default=None):
"""Get an environment variable, return None if it doesn't exist.
Modified: python/branches/cpy_merge/Lib/pickle.py
==============================================================================
--- python/branches/cpy_merge/Lib/pickle.py (original)
+++ python/branches/cpy_merge/Lib/pickle.py Thu Jun 14 21:06:29 2007
@@ -26,7 +26,7 @@
__version__ = "$Revision$" # Code version
-from types import *
+from types import FunctionType, BuiltinFunctionType
from copy_reg import dispatch_table
from copy_reg import _extension_registry, _inverted_registry, _extension_cache
import marshal
@@ -89,11 +89,11 @@
except ImportError:
PyStringMap = None
-# UnicodeType may or may not be exported (normally imported from types)
+# unicode may or may not be exported (normally imported from types)
try:
- UnicodeType
+ unicode
except NameError:
- UnicodeType = None
+ unicode = None
# Pickle opcodes. See pickletools.py for extensive docs. The listing
# here is in kind-of alphabetical order of 1-character pickle code.
@@ -287,7 +287,7 @@
# Check for a class with a custom metaclass; treat as regular class
try:
- issc = issubclass(t, TypeType)
+ issc = issubclass(t, type)
except TypeError: # t is not a class (old Boost; see SF #502085)
issc = 0
if issc:
@@ -312,12 +312,12 @@
(t.__name__, obj))
# Check for string returned by reduce(), meaning "save as global"
- if type(rv) is StringType:
+ if isinstance(rv, str):
self.save_global(obj, rv)
return
# Assert that reduce() returned a tuple
- if type(rv) is not TupleType:
+ if not isinstance(rv, tuple):
raise PicklingError("%s must return string or tuple" % reduce)
# Assert that it returned an appropriately sized tuple
@@ -346,7 +346,7 @@
# This API is called by some subclasses
# Assert that args is a tuple or None
- if not isinstance(args, TupleType):
+ if not isinstance(args, tuple):
raise PicklingError("args from reduce() should be a tuple")
# Assert that func is callable
@@ -424,7 +424,7 @@
def save_none(self, obj):
self.write(NONE)
- dispatch[NoneType] = save_none
+ dispatch[type(None)] = save_none
def save_bool(self, obj):
if self.proto >= 2:
@@ -456,7 +456,7 @@
# Text pickle, or int too big to fit in signed 4-byte format.
self.write(INT + repr(obj) + '\n')
# XXX save_int is merged into save_long
- # dispatch[IntType] = save_int
+ # dispatch[int] = save_int
def save_long(self, obj, pack=struct.pack):
if self.bin:
@@ -487,14 +487,14 @@
self.write(LONG4 + pack("<i", n) + bytes)
return
self.write(LONG + repr(obj) + '\n')
- dispatch[LongType] = save_long
+ dispatch[int] = save_long
def save_float(self, obj, pack=struct.pack):
if self.bin:
self.write(BINFLOAT + pack('>d', obj))
else:
self.write(FLOAT + repr(obj) + '\n')
- dispatch[FloatType] = save_float
+ dispatch[float] = save_float
def save_string(self, obj, pack=struct.pack):
if self.bin:
@@ -506,7 +506,7 @@
else:
self.write(STRING + repr(obj) + '\n')
self.memoize(obj)
- dispatch[StringType] = save_string
+ dispatch[str] = save_string
def save_unicode(self, obj, pack=struct.pack):
if self.bin:
@@ -518,9 +518,9 @@
obj = obj.replace("\n", "\\u000a")
self.write(UNICODE + obj.encode('raw-unicode-escape') + '\n')
self.memoize(obj)
- dispatch[UnicodeType] = save_unicode
+ dispatch[unicode] = save_unicode
- if StringType == UnicodeType:
+ if str == unicode:
# This is true for Jython
def save_string(self, obj, pack=struct.pack):
unicode = obj.isunicode()
@@ -546,7 +546,7 @@
else:
self.write(STRING + repr(obj) + '\n')
self.memoize(obj)
- dispatch[StringType] = save_string
+ dispatch[str] = save_string
def save_tuple(self, obj):
write = self.write
@@ -599,7 +599,7 @@
self.write(TUPLE)
self.memoize(obj)
- dispatch[TupleType] = save_tuple
+ dispatch[tuple] = save_tuple
# save_empty_tuple() isn't used by anything in Python 2.3. However, I
# found a Pickler subclass in Zope3 that calls it, so it's not harmless
@@ -618,7 +618,7 @@
self.memoize(obj)
self._batch_appends(iter(obj))
- dispatch[ListType] = save_list
+ dispatch[list] = save_list
# Keep in synch with cPickle's BATCHSIZE. Nothing will break if it gets
# out of synch, though.
@@ -667,8 +667,8 @@
self.memoize(obj)
self._batch_setitems(iter(obj.items()))
- dispatch[DictionaryType] = save_dict
- if not PyStringMap is None:
+ dispatch[dict] = save_dict
+ if PyStringMap is not None:
dispatch[PyStringMap] = save_dict
def _batch_setitems(self, items):
@@ -746,10 +746,9 @@
write(GLOBAL + module + '\n' + name + '\n')
self.memoize(obj)
- dispatch[ClassType] = save_global
dispatch[FunctionType] = save_global
dispatch[BuiltinFunctionType] = save_global
- dispatch[TypeType] = save_global
+ dispatch[type] = save_global
# Pickling helpers
@@ -1024,7 +1023,7 @@
del self.stack[k:]
instantiated = 0
if (not args and
- type(klass) is ClassType and
+ isinstance(klass, type) and
not hasattr(klass, "__getinitargs__")):
value = _EmptyClass()
value.__class__ = klass
Modified: python/branches/cpy_merge/Lib/pickletools.py
==============================================================================
--- python/branches/cpy_merge/Lib/pickletools.py (original)
+++ python/branches/cpy_merge/Lib/pickletools.py Thu Jun 14 21:06:29 2007
@@ -1517,7 +1517,7 @@
opcode is followed by code to create setstate's argument, and then a
BUILD opcode to apply __setstate__ to that argument.
- If type(callable) is not ClassType, REDUCE complains unless the
+ If not isinstance(callable, type), REDUCE complains unless the
callable has been registered with the copy_reg module's
safe_constructors dict, or the callable has a magic
'__safe_for_unpickling__' attribute with a true value. I'm not sure
@@ -1573,9 +1573,6 @@
+ The argtuple is empty (markobject was at the top of the stack
at the start).
- + It's an old-style class object (the type of the class object is
- ClassType).
-
+ The class object does not have a __getinitargs__ attribute.
then we want to create an old-style class instance without invoking
Modified: python/branches/cpy_merge/Lib/plat-atheos/IN.py
==============================================================================
--- python/branches/cpy_merge/Lib/plat-atheos/IN.py (original)
+++ python/branches/cpy_merge/Lib/plat-atheos/IN.py Thu Jun 14 21:06:29 2007
@@ -557,7 +557,7 @@
# Included from bits/dirent.h
def _D_ALLOC_NAMLEN(d): return (_D_EXACT_NAMLEN (d) + 1)
-def IFTODT(mode): return (((mode) & 0170000) >> 12)
+def IFTODT(mode): return (((mode) & 0o170000) >> 12)
def DTTOIF(dirtype): return ((dirtype) << 12)
@@ -567,17 +567,17 @@
MAXNAMLEN = 255
# Included from posix/stat.h
-S_IFMT = 00170000
-S_IFSOCK = 0140000
-S_IFLNK = 0120000
-S_IFREG = 0100000
-S_IFBLK = 0060000
-S_IFDIR = 0040000
-S_IFCHR = 0020000
-S_IFIFO = 0010000
-S_ISUID = 0004000
-S_ISGID = 0002000
-S_ISVTX = 0001000
+S_IFMT = 0o0170000
+S_IFSOCK = 0o140000
+S_IFLNK = 0o120000
+S_IFREG = 0o100000
+S_IFBLK = 0o060000
+S_IFDIR = 0o040000
+S_IFCHR = 0o020000
+S_IFIFO = 0o010000
+S_ISUID = 0o004000
+S_ISGID = 0o002000
+S_ISVTX = 0o001000
def S_ISLNK(m): return (((m) & S_IFMT) == S_IFLNK)
def S_ISREG(m): return (((m) & S_IFMT) == S_IFREG)
@@ -592,18 +592,18 @@
def S_ISSOCK(m): return (((m) & S_IFMT) == S_IFSOCK)
-S_IRWXU = 00700
-S_IRUSR = 00400
-S_IWUSR = 00200
-S_IXUSR = 00100
-S_IRWXG = 00070
-S_IRGRP = 00040
-S_IWGRP = 00020
-S_IXGRP = 00010
-S_IRWXO = 00007
-S_IROTH = 00004
-S_IWOTH = 00002
-S_IXOTH = 00001
+S_IRWXU = 0o0700
+S_IRUSR = 0o0400
+S_IWUSR = 0o0200
+S_IXUSR = 0o0100
+S_IRWXG = 0o0070
+S_IRGRP = 0o0040
+S_IWGRP = 0o0020
+S_IXGRP = 0o0010
+S_IRWXO = 0o0007
+S_IROTH = 0o0004
+S_IWOTH = 0o0002
+S_IXOTH = 0o0001
S_IRWXUGO = (S_IRWXU|S_IRWXG|S_IRWXO)
S_IALLUGO = (S_ISUID|S_ISGID|S_ISVTX|S_IRWXUGO)
S_IRUGO = (S_IRUSR|S_IRGRP|S_IROTH)
@@ -612,24 +612,24 @@
_STAT_VER_KERNEL = 0
# Included from posix/fcntl.h
-O_ACCMODE = 0003
+O_ACCMODE = 0o003
O_RWMASK = O_ACCMODE
O_RDONLY = 00
-O_WRONLY = 01
-O_RDWR = 02
-O_CREAT = 0100
-O_EXCL = 0200
-O_NOCTTY = 0400
-O_TRUNC = 01000
-O_APPEND = 02000
-O_NONBLOCK = 04000
+O_WRONLY = 0o1
+O_RDWR = 0o2
+O_CREAT = 0o100
+O_EXCL = 0o200
+O_NOCTTY = 0o400
+O_TRUNC = 0o1000
+O_APPEND = 0o2000
+O_NONBLOCK = 0o4000
O_NDELAY = O_NONBLOCK
-O_SYNC = 010000
+O_SYNC = 0o10000
O_FSYNC = O_SYNC
-O_ASYNC = 020000
+O_ASYNC = 0o20000
FASYNC = O_ASYNC
-O_DIRECTORY = 040000
-O_NOTRAVERSE = 0100000
+O_DIRECTORY = 0o40000
+O_NOTRAVERSE = 0o100000
O_NOFOLLOW = O_NOTRAVERSE
F_DUPFD = 0
F_GETFD = 1
Modified: python/branches/cpy_merge/Lib/plat-mac/aepack.py
==============================================================================
--- python/branches/cpy_merge/Lib/plat-mac/aepack.py (original)
+++ python/branches/cpy_merge/Lib/plat-mac/aepack.py Thu Jun 14 21:06:29 2007
@@ -13,8 +13,6 @@
#
import struct
-import types
-from types import *
from Carbon import AE
from Carbon.AppleEvents import *
import MacOS
@@ -74,7 +72,7 @@
"""Pack a python object into an AE descriptor"""
if forcetype:
- if type(x) is StringType:
+ if isinstance(x, str):
return AE.AECreateDesc(forcetype, x)
else:
return pack(x).AECoerceDesc(forcetype)
@@ -90,29 +88,29 @@
return AE.AECreateDesc('fsrf', x.data)
if isinstance(x, AliasType):
return AE.AECreateDesc('alis', x.data)
- if isinstance(x, IntType):
+ if isinstance(x, int):
return AE.AECreateDesc('long', struct.pack('l', x))
- if isinstance(x, FloatType):
+ if isinstance(x, float):
return AE.AECreateDesc('doub', struct.pack('d', x))
- if isinstance(x, StringType):
+ if isinstance(x, str):
return AE.AECreateDesc('TEXT', x)
- if isinstance(x, UnicodeType):
+ if isinstance(x, unicode):
data = x.encode('utf16')
if data[:2] == '\xfe\xff':
data = data[2:]
return AE.AECreateDesc('utxt', data)
- if isinstance(x, ListType):
- list = AE.AECreateList('', 0)
+ if isinstance(x, list):
+ lst = AE.AECreateList('', 0)
for item in x:
- list.AEPutDesc(0, pack(item))
- return list
- if isinstance(x, DictionaryType):
+ lst.AEPutDesc(0, pack(item))
+ return lst
+ if isinstance(x, dict):
record = AE.AECreateList('', 1)
for key, value in x.items():
packkey(record, key, value)
#record.AEPutParamDesc(key, pack(value))
return record
- if type(x) == types.ClassType and issubclass(x, ObjectSpecifier):
+ if isinstance(x, type) and issubclass(x, ObjectSpecifier):
# Note: we are getting a class object here, not an instance
return AE.AECreateDesc('type', x.want)
if hasattr(x, '__aepack__'):
@@ -340,7 +338,7 @@
# to __class__ is safe. Moreover, shouldn't there be a better
# initializer for the classes in the suites?
def mkobjectfrommodule(dict, modulename):
- if type(dict['want']) == types.ClassType and issubclass(dict['want'], ObjectSpecifier):
+ if isinstance(dict['want'], type) and issubclass(dict['want'], ObjectSpecifier):
# The type has already been converted to Python. Convert back:-(
classtype = dict['want']
dict['want'] = aetypes.mktype(classtype.want)
Modified: python/branches/cpy_merge/Lib/plat-mac/aetypes.py
==============================================================================
--- python/branches/cpy_merge/Lib/plat-mac/aetypes.py (original)
+++ python/branches/cpy_merge/Lib/plat-mac/aetypes.py Thu Jun 14 21:06:29 2007
@@ -2,7 +2,6 @@
from Carbon.AppleEvents import *
import struct
-from types import *
#
# convoluted, since there are cyclic dependencies between this file and
@@ -14,7 +13,7 @@
def nice(s):
"""'nice' representation of an object"""
- if type(s) is StringType: return repr(s)
+ if isinstance(s, str): return repr(s)
else: return str(s)
class Unknown:
@@ -222,7 +221,7 @@
return "Logical(%r, %r)" % (self.logc, self.term)
def __str__(self):
- if type(self.term) == ListType and len(self.term) == 2:
+ if isinstance(self.term, list) and len(self.term) == 2:
return "%s %s %s" % (nice(self.term[0]),
self.logc.strip(),
nice(self.term[1]))
@@ -481,13 +480,13 @@
def __init__(self, want, seld, fr = None):
t = type(seld)
- if t == StringType:
+ if isinstance(t, str):
form = 'name'
elif IsRange(seld):
form = 'rang'
elif IsComparison(seld) or IsLogical(seld):
form = 'test'
- elif t == TupleType:
+ elif isinstance(t, tuple):
# Breakout: specify both form and seld in a tuple
# (if you want ID or rele or somesuch)
form, seld = seld
@@ -513,7 +512,7 @@
def __str__(self):
seld = self.seld
- if type(seld) == StringType:
+ if isinstance(seld, str):
ss = repr(seld)
elif IsRange(seld):
start, stop = seld.start, seld.stop
Modified: python/branches/cpy_merge/Lib/plat-mac/bundlebuilder.py
==============================================================================
--- python/branches/cpy_merge/Lib/plat-mac/bundlebuilder.py (original)
+++ python/branches/cpy_merge/Lib/plat-mac/bundlebuilder.py Thu Jun 14 21:06:29 2007
@@ -504,7 +504,7 @@
standalone = self.standalone
semi_standalone = self.semi_standalone
open(bootstrappath, "w").write(BOOTSTRAP_SCRIPT % locals())
- os.chmod(bootstrappath, 0775)
+ os.chmod(bootstrappath, 0o775)
if self.iconfile is not None:
iconbase = os.path.basename(self.iconfile)
@@ -603,7 +603,7 @@
walk(path)
else:
mod = os.stat(path)[stat.ST_MODE]
- if not (mod & 0100):
+ if not (mod & 0o100):
continue
relpath = path[len(self.bundlepath):]
self.message("Stripping %s" % relpath, 2)
Modified: python/branches/cpy_merge/Lib/plat-mac/gensuitemodule.py
==============================================================================
--- python/branches/cpy_merge/Lib/plat-mac/gensuitemodule.py (original)
+++ python/branches/cpy_merge/Lib/plat-mac/gensuitemodule.py Thu Jun 14 21:06:29 2007
@@ -279,9 +279,9 @@
def simplify(item):
"""Recursively replace singleton tuples by their constituent item"""
- if type(item) is types.ListType:
+ if isinstance(item, list):
return map(simplify, item)
- elif type(item) == types.TupleType and len(item) == 2:
+ elif isinstance(item, tuple) and len(item) == 2:
return simplify(item[1])
else:
return item
@@ -352,7 +352,7 @@
def generic(what, f, *args):
if type(what) == types.FunctionType:
return what(f, *args)
- if type(what) == types.ListType:
+ if isinstance(what, list):
record = []
for thing in what:
item = generic(thing[:1], f, *thing[1:])
Modified: python/branches/cpy_merge/Lib/plat-mac/macostools.py
==============================================================================
--- python/branches/cpy_merge/Lib/plat-mac/macostools.py (original)
+++ python/branches/cpy_merge/Lib/plat-mac/macostools.py Thu Jun 14 21:06:29 2007
@@ -61,7 +61,7 @@
if os.sep == ':' and not ':' in head:
head = head + ':'
mkdirs(head)
- os.mkdir(dst, 0777)
+ os.mkdir(dst, 0o777)
def touched(dst):
"""Tell the finder a file has changed. No-op on MacOSX."""
Modified: python/branches/cpy_merge/Lib/plat-mac/plistlib.py
==============================================================================
--- python/branches/cpy_merge/Lib/plat-mac/plistlib.py (original)
+++ python/branches/cpy_merge/Lib/plat-mac/plistlib.py Thu Jun 14 21:06:29 2007
@@ -320,7 +320,7 @@
from warnings import warn
warn("The plistlib.Dict class is deprecated, use builtin dict instead",
PendingDeprecationWarning)
- super(Dict, self).__init__(**kwargs)
+ super().__init__(**kwargs)
class Plist(_InternalDict):
@@ -333,7 +333,7 @@
from warnings import warn
warn("The Plist class is deprecated, use the readPlist() and "
"writePlist() functions instead", PendingDeprecationWarning)
- super(Plist, self).__init__(**kwargs)
+ super().__init__(**kwargs)
def fromFile(cls, pathOrFile):
"""Deprecated. Use the readPlist() function instead."""
Modified: python/branches/cpy_merge/Lib/plat-sunos5/IN.py
==============================================================================
--- python/branches/cpy_merge/Lib/plat-sunos5/IN.py (original)
+++ python/branches/cpy_merge/Lib/plat-sunos5/IN.py Thu Jun 14 21:06:29 2007
@@ -97,7 +97,7 @@
NZERO = 20
NULL = 0
NULL = 0
-CMASK = 022
+CMASK = 0o22
CDLIMIT = (1<<11)
NBPS = 0x20000
NBPSCTR = 512
@@ -733,13 +733,13 @@
_XRS_ID = 0x78727300
GETCONTEXT = 0
SETCONTEXT = 1
-UC_SIGMASK = 001
-UC_STACK = 002
-UC_CPU = 004
-UC_MAU = 010
+UC_SIGMASK = 0o01
+UC_STACK = 0o02
+UC_CPU = 0o04
+UC_MAU = 0o10
UC_FPU = UC_MAU
-UC_INTR = 020
-UC_ASR = 040
+UC_INTR = 0o20
+UC_ASR = 0o40
UC_MCONTEXT = (UC_CPU|UC_FPU|UC_ASR)
UC_ALL = (UC_SIGMASK|UC_STACK|UC_MCONTEXT)
_SIGQUEUE_MAX = 32
@@ -1021,14 +1021,14 @@
AT_TIMES = (AT_ATIME|AT_MTIME|AT_CTIME)
AT_NOSET = (AT_NLINK|AT_RDEV|AT_FSID|AT_NODEID|AT_TYPE|\
AT_BLKSIZE|AT_NBLOCKS|AT_VCODE)
-VSUID = 04000
-VSGID = 02000
-VSVTX = 01000
-VREAD = 00400
-VWRITE = 00200
-VEXEC = 00100
-MODEMASK = 07777
-PERMMASK = 00777
+VSUID = 0o4000
+VSGID = 0o2000
+VSVTX = 0o1000
+VREAD = 0o0400
+VWRITE = 0o0200
+VEXEC = 0o0100
+MODEMASK = 0o7777
+PERMMASK = 0o0777
def MANDMODE(mode): return (((mode) & (VSGID|(VEXEC>>3))) == VSGID)
VSA_ACL = 0x0001
Modified: python/branches/cpy_merge/Lib/plat-sunos5/STROPTS.py
==============================================================================
--- python/branches/cpy_merge/Lib/plat-sunos5/STROPTS.py (original)
+++ python/branches/cpy_merge/Lib/plat-sunos5/STROPTS.py Thu Jun 14 21:06:29 2007
@@ -94,7 +94,7 @@
NZERO = 20
NULL = 0
NULL = 0
-CMASK = 022
+CMASK = 0o22
CDLIMIT = (1<<11)
NBPS = 0x20000
NBPSCTR = 512
@@ -730,13 +730,13 @@
_XRS_ID = 0x78727300
GETCONTEXT = 0
SETCONTEXT = 1
-UC_SIGMASK = 001
-UC_STACK = 002
-UC_CPU = 004
-UC_MAU = 010
+UC_SIGMASK = 0o01
+UC_STACK = 0o02
+UC_CPU = 0o04
+UC_MAU = 0o10
UC_FPU = UC_MAU
-UC_INTR = 020
-UC_ASR = 040
+UC_INTR = 0o20
+UC_ASR = 0o40
UC_MCONTEXT = (UC_CPU|UC_FPU|UC_ASR)
UC_ALL = (UC_SIGMASK|UC_STACK|UC_MCONTEXT)
_SIGQUEUE_MAX = 32
@@ -1400,14 +1400,14 @@
AT_TIMES = (AT_ATIME|AT_MTIME|AT_CTIME)
AT_NOSET = (AT_NLINK|AT_RDEV|AT_FSID|AT_NODEID|AT_TYPE|\
AT_BLKSIZE|AT_NBLOCKS|AT_VCODE)
-VSUID = 04000
-VSGID = 02000
-VSVTX = 01000
-VREAD = 00400
-VWRITE = 00200
-VEXEC = 00100
-MODEMASK = 07777
-PERMMASK = 00777
+VSUID = 0o4000
+VSGID = 0o2000
+VSVTX = 0o1000
+VREAD = 0o0400
+VWRITE = 0o0200
+VEXEC = 0o0100
+MODEMASK = 0o7777
+PERMMASK = 0o0777
def MANDMODE(mode): return (((mode) & (VSGID|(VEXEC>>3))) == VSGID)
VSA_ACL = 0x0001
Modified: python/branches/cpy_merge/Lib/plat-unixware7/IN.py
==============================================================================
--- python/branches/cpy_merge/Lib/plat-unixware7/IN.py (original)
+++ python/branches/cpy_merge/Lib/plat-unixware7/IN.py Thu Jun 14 21:06:29 2007
@@ -187,8 +187,8 @@
NC_TPI_COTS_ORD = 3
NC_TPI_RAW = 4
NC_NOFLAG = 00
-NC_VISIBLE = 01
-NC_BROADCAST = 02
+NC_VISIBLE = 0o1
+NC_BROADCAST = 0o2
NC_NOPROTOFMLY = "-"
NC_LOOPBACK = "loopback"
NC_INET = "inet"
Modified: python/branches/cpy_merge/Lib/plat-unixware7/STROPTS.py
==============================================================================
--- python/branches/cpy_merge/Lib/plat-unixware7/STROPTS.py (original)
+++ python/branches/cpy_merge/Lib/plat-unixware7/STROPTS.py Thu Jun 14 21:06:29 2007
@@ -65,41 +65,41 @@
ES_MACADTLID = 7
ES_PRVID = 8
ES_TPGETMAJOR = 9
-SA_EXEC = 001
-SA_WRITE = 002
-SA_READ = 004
-SA_SUBSIZE = 010
+SA_EXEC = 0o01
+SA_WRITE = 0o02
+SA_READ = 0o04
+SA_SUBSIZE = 0o10
# Included from sys/stropts_f.h
X_STR = (ord('S')<<8)
-X_I_BASE = (X_STR|0200)
-X_I_NREAD = (X_STR|0201)
-X_I_PUSH = (X_STR|0202)
-X_I_POP = (X_STR|0203)
-X_I_LOOK = (X_STR|0204)
-X_I_FLUSH = (X_STR|0205)
-X_I_SRDOPT = (X_STR|0206)
-X_I_GRDOPT = (X_STR|0207)
-X_I_STR = (X_STR|0210)
-X_I_SETSIG = (X_STR|0211)
-X_I_GETSIG = (X_STR|0212)
-X_I_FIND = (X_STR|0213)
-X_I_LINK = (X_STR|0214)
-X_I_UNLINK = (X_STR|0215)
-X_I_PEEK = (X_STR|0217)
-X_I_FDINSERT = (X_STR|0220)
-X_I_SENDFD = (X_STR|0221)
-X_I_RECVFD = (X_STR|0222)
+X_I_BASE = (X_STR|0o200)
+X_I_NREAD = (X_STR|0o201)
+X_I_PUSH = (X_STR|0o202)
+X_I_POP = (X_STR|0o203)
+X_I_LOOK = (X_STR|0o204)
+X_I_FLUSH = (X_STR|0o205)
+X_I_SRDOPT = (X_STR|0o206)
+X_I_GRDOPT = (X_STR|0o207)
+X_I_STR = (X_STR|0o210)
+X_I_SETSIG = (X_STR|0o211)
+X_I_GETSIG = (X_STR|0o212)
+X_I_FIND = (X_STR|0o213)
+X_I_LINK = (X_STR|0o214)
+X_I_UNLINK = (X_STR|0o215)
+X_I_PEEK = (X_STR|0o217)
+X_I_FDINSERT = (X_STR|0o220)
+X_I_SENDFD = (X_STR|0o221)
+X_I_RECVFD = (X_STR|0o222)
# Included from unistd.h
# Included from sys/unistd.h
-R_OK = 004
-W_OK = 002
-X_OK = 001
+R_OK = 0o04
+W_OK = 0o02
+X_OK = 0o01
F_OK = 000
-EFF_ONLY_OK = 010
-EX_OK = 020
+EFF_ONLY_OK = 0o10
+EX_OK = 0o20
SEEK_SET = 0
SEEK_CUR = 1
SEEK_END = 2
@@ -289,40 +289,40 @@
ANYMARK = 0x01
LASTMARK = 0x02
STR = (ord('S')<<8)
-I_NREAD = (STR|01)
-I_PUSH = (STR|02)
-I_POP = (STR|03)
-I_LOOK = (STR|04)
-I_FLUSH = (STR|05)
-I_SRDOPT = (STR|06)
-I_GRDOPT = (STR|07)
-I_STR = (STR|010)
-I_SETSIG = (STR|011)
-I_GETSIG = (STR|012)
-I_FIND = (STR|013)
-I_LINK = (STR|014)
-I_UNLINK = (STR|015)
-I_PEEK = (STR|017)
-I_FDINSERT = (STR|020)
-I_SENDFD = (STR|021)
-I_RECVFD = (STR|022)
-I_E_RECVFD = (STR|016)
-I_RECVFD = (STR|016)
-I_RECVFD = (STR|022)
-I_SWROPT = (STR|023)
-I_GWROPT = (STR|024)
-I_LIST = (STR|025)
-I_PLINK = (STR|026)
-I_PUNLINK = (STR|027)
-I_FLUSHBAND = (STR|034)
-I_CKBAND = (STR|035)
-I_GETBAND = (STR|036)
-I_ATMARK = (STR|037)
-I_SETCLTIME = (STR|040)
-I_GETCLTIME = (STR|041)
-I_CANPUT = (STR|042)
-I_S_RECVFD = (STR|043)
-I_STATS = (STR|044)
-I_BIGPIPE = (STR|045)
-I_GETTP = (STR|046)
+I_NREAD = (STR|0o1)
+I_PUSH = (STR|0o2)
+I_POP = (STR|0o3)
+I_LOOK = (STR|0o4)
+I_FLUSH = (STR|0o5)
+I_SRDOPT = (STR|0o6)
+I_GRDOPT = (STR|0o7)
+I_STR = (STR|0o10)
+I_SETSIG = (STR|0o11)
+I_GETSIG = (STR|0o12)
+I_FIND = (STR|0o13)
+I_LINK = (STR|0o14)
+I_UNLINK = (STR|0o15)
+I_PEEK = (STR|0o17)
+I_FDINSERT = (STR|0o20)
+I_SENDFD = (STR|0o21)
+I_RECVFD = (STR|0o22)
+I_E_RECVFD = (STR|0o16)
+I_RECVFD = (STR|0o16)
+I_RECVFD = (STR|0o22)
+I_SWROPT = (STR|0o23)
+I_GWROPT = (STR|0o24)
+I_LIST = (STR|0o25)
+I_PLINK = (STR|0o26)
+I_PUNLINK = (STR|0o27)
+I_FLUSHBAND = (STR|0o34)
+I_CKBAND = (STR|0o35)
+I_GETBAND = (STR|0o36)
+I_ATMARK = (STR|0o37)
+I_SETCLTIME = (STR|0o40)
+I_GETCLTIME = (STR|0o41)
+I_CANPUT = (STR|0o42)
+I_S_RECVFD = (STR|0o43)
+I_STATS = (STR|0o44)
+I_BIGPIPE = (STR|0o45)
+I_GETTP = (STR|0o46)
INFTIM = -1
Modified: python/branches/cpy_merge/Lib/platform.py
==============================================================================
--- python/branches/cpy_merge/Lib/platform.py (original)
+++ python/branches/cpy_merge/Lib/platform.py Thu Jun 14 21:06:29 2007
@@ -242,7 +242,7 @@
_supported_dists = ('SuSE', 'debian', 'fedora', 'redhat', 'centos',
'mandrake', 'rocks', 'slackware', 'yellowdog',
- 'gentoo', 'UnitedLinux')
+ 'gentoo', 'UnitedLinux', 'turbolinux')
def _parse_release_file(firstline):
@@ -600,6 +600,16 @@
release = '2003Server'
else:
release = 'post2003'
+ elif maj == 6:
+ if min == 0:
+ # Per http://msdn2.microsoft.com/en-us/library/ms724429.aspx
+ productType = GetVersionEx(1)[8]
+ if productType == 1: # VER_NT_WORKSTATION
+ release = 'Vista'
+ else:
+ release = '2008Server'
+ else:
+ release = 'post2008Server'
else:
if not release:
# E.g. Win3.1 with win32s
@@ -1064,6 +1074,16 @@
# (_syscmd_ver() tends to return the vendor name as well)
if system == 'Microsoft Windows':
system = 'Windows'
+ elif system == 'Microsoft' and release == 'Windows':
+ # Under Windows Vista and Windows Server 2008,
+ # Microsoft changed the output of the ver command. The
+ # release is no longer printed. This causes the
+ # system and release to be misidentified.
+ system = 'Windows'
+ if '6.0' == version[:3]:
+ release = 'Vista'
+ else:
+ release = ''
# In case we still don't know anything useful, we'll try to
# help ourselves
Modified: python/branches/cpy_merge/Lib/pty.py
==============================================================================
--- python/branches/cpy_merge/Lib/pty.py (original)
+++ python/branches/cpy_merge/Lib/pty.py Thu Jun 14 21:06:29 2007
@@ -55,7 +55,7 @@
pass
else:
try:
- tty_name, master_fd = sgi._getpty(os.O_RDWR, 0666, 0)
+ tty_name, master_fd = sgi._getpty(os.O_RDWR, 0o666, 0)
except IOError as msg:
raise os.error, msg
return master_fd, tty_name
Modified: python/branches/cpy_merge/Lib/pydoc.py
==============================================================================
--- python/branches/cpy_merge/Lib/pydoc.py (original)
+++ python/branches/cpy_merge/Lib/pydoc.py Thu Jun 14 21:06:29 2007
@@ -235,7 +235,7 @@
def __str__(self):
exc = self.exc
- if type(exc) is types.ClassType:
+ if isinstance(exc, type):
exc = exc.__name__
return 'problem in %s - %s: %s' % (self.filename, exc, self.value)
Modified: python/branches/cpy_merge/Lib/random.py
==============================================================================
--- python/branches/cpy_merge/Lib/random.py (original)
+++ python/branches/cpy_merge/Lib/random.py Thu Jun 14 21:06:29 2007
@@ -110,19 +110,19 @@
import time
a = int(time.time() * 256) # use fractional seconds
- super(Random, self).seed(a)
+ super().seed(a)
self.gauss_next = None
def getstate(self):
"""Return internal state; can be passed to setstate() later."""
- return self.VERSION, super(Random, self).getstate(), self.gauss_next
+ return self.VERSION, super().getstate(), self.gauss_next
def setstate(self, state):
"""Restore internal state from object returned by getstate()."""
version = state[0]
if version == 2:
version, internalstate, self.gauss_next = state
- super(Random, self).setstate(internalstate)
+ super().setstate(internalstate)
else:
raise ValueError("state with version %s passed to "
"Random.setstate() of version %s" %
Modified: python/branches/cpy_merge/Lib/repr.py
==============================================================================
--- python/branches/cpy_merge/Lib/repr.py (original)
+++ python/branches/cpy_merge/Lib/repr.py Thu Jun 14 21:06:29 2007
@@ -47,7 +47,7 @@
return '%s%s%s' % (left, s, right)
def repr_tuple(self, x, level):
- return self._repr_iterable(x, level, '(', ')', self.maxlist, ',')
+ return self._repr_iterable(x, level, '(', ')', self.maxtuple, ',')
def repr_list(self, x, level):
return self._repr_iterable(x, level, '[', ']', self.maxlist)
Modified: python/branches/cpy_merge/Lib/sqlite3/test/dbapi.py
==============================================================================
--- python/branches/cpy_merge/Lib/sqlite3/test/dbapi.py (original)
+++ python/branches/cpy_merge/Lib/sqlite3/test/dbapi.py Thu Jun 14 21:06:29 2007
@@ -40,12 +40,12 @@
sqlite.paramstyle)
def CheckWarning(self):
- self.assert_(issubclass(sqlite.Warning, StandardError),
- "Warning is not a subclass of StandardError")
+ self.assert_(issubclass(sqlite.Warning, Exception),
+ "Warning is not a subclass of Exception")
def CheckError(self):
- self.failUnless(issubclass(sqlite.Error, StandardError),
- "Error is not a subclass of StandardError")
+ self.failUnless(issubclass(sqlite.Error, Exception),
+ "Error is not a subclass of Exception")
def CheckInterfaceError(self):
self.failUnless(issubclass(sqlite.InterfaceError, sqlite.Error),
Modified: python/branches/cpy_merge/Lib/sre_parse.py
==============================================================================
--- python/branches/cpy_merge/Lib/sre_parse.py (original)
+++ python/branches/cpy_merge/Lib/sre_parse.py Thu Jun 14 21:06:29 2007
@@ -101,7 +101,7 @@
self.width = None
def dump(self, level=0):
nl = 1
- seqtypes = type(()), type([])
+ seqtypes = (tuple, list)
for op, av in self.data:
print(level*" " + op, end=' '); nl = 0
if op == "in":
@@ -117,7 +117,7 @@
print(level*" " + "or")
a.dump(level+1); nl = 1
i = i + 1
- elif type(av) in seqtypes:
+ elif isinstance(av, seqtypes):
for a in av:
if isinstance(a, SubPattern):
if not nl: print()
@@ -709,7 +709,7 @@
else:
pappend((LITERAL, literal))
sep = source[:0]
- if type(sep) is type(""):
+ if isinstance(sep, str):
makechar = chr
else:
makechar = unichr
Modified: python/branches/cpy_merge/Lib/stat.py
==============================================================================
--- python/branches/cpy_merge/Lib/stat.py (original)
+++ python/branches/cpy_merge/Lib/stat.py Thu Jun 14 21:06:29 2007
@@ -24,21 +24,21 @@
# Extract bits from the mode
def S_IMODE(mode):
- return mode & 07777
+ return mode & 0o7777
def S_IFMT(mode):
- return mode & 0170000
+ return mode & 0o170000
# Constants used as S_IFMT() for various file types
# (not all are implemented on all systems)
-S_IFDIR = 0040000
-S_IFCHR = 0020000
-S_IFBLK = 0060000
-S_IFREG = 0100000
-S_IFIFO = 0010000
-S_IFLNK = 0120000
-S_IFSOCK = 0140000
+S_IFDIR = 0o040000
+S_IFCHR = 0o020000
+S_IFBLK = 0o060000
+S_IFREG = 0o100000
+S_IFIFO = 0o010000
+S_IFLNK = 0o120000
+S_IFSOCK = 0o140000
# Functions to test for each file type
@@ -65,25 +65,25 @@
# Names for permission bits
-S_ISUID = 04000
-S_ISGID = 02000
+S_ISUID = 0o4000
+S_ISGID = 0o2000
S_ENFMT = S_ISGID
-S_ISVTX = 01000
-S_IREAD = 00400
-S_IWRITE = 00200
-S_IEXEC = 00100
-S_IRWXU = 00700
-S_IRUSR = 00400
-S_IWUSR = 00200
-S_IXUSR = 00100
-S_IRWXG = 00070
-S_IRGRP = 00040
-S_IWGRP = 00020
-S_IXGRP = 00010
-S_IRWXO = 00007
-S_IROTH = 00004
-S_IWOTH = 00002
-S_IXOTH = 00001
+S_ISVTX = 0o1000
+S_IREAD = 0o0400
+S_IWRITE = 0o0200
+S_IEXEC = 0o0100
+S_IRWXU = 0o0700
+S_IRUSR = 0o0400
+S_IWUSR = 0o0200
+S_IXUSR = 0o0100
+S_IRWXG = 0o0070
+S_IRGRP = 0o0040
+S_IWGRP = 0o0020
+S_IXGRP = 0o0010
+S_IRWXO = 0o0007
+S_IROTH = 0o0004
+S_IWOTH = 0o0002
+S_IXOTH = 0o0001
# Names for file flags
Modified: python/branches/cpy_merge/Lib/string.py
==============================================================================
--- python/branches/cpy_merge/Lib/string.py (original)
+++ python/branches/cpy_merge/Lib/string.py Thu Jun 14 21:06:29 2007
@@ -103,7 +103,7 @@
"""
def __init__(cls, name, bases, dct):
- super(_TemplateMetaclass, cls).__init__(name, bases, dct)
+ super().__init__(name, bases, dct)
if 'pattern' in dct:
pattern = cls.pattern
else:
Modified: python/branches/cpy_merge/Lib/subprocess.py
==============================================================================
--- python/branches/cpy_merge/Lib/subprocess.py (original)
+++ python/branches/cpy_merge/Lib/subprocess.py Thu Jun 14 21:06:29 2007
@@ -287,7 +287,6 @@
mswindows = (sys.platform == "win32")
import os
-import types
import traceback
# Exception classes used by this module.
@@ -694,7 +693,7 @@
errread, errwrite):
"""Execute program (MS Windows version)"""
- if not isinstance(args, types.StringTypes):
+ if not isinstance(args, basestring):
args = list2cmdline(args)
# Process startup details
@@ -909,7 +908,7 @@
errread, errwrite):
"""Execute program (POSIX version)"""
- if isinstance(args, types.StringTypes):
+ if isinstance(args, basestring):
args = [args]
else:
args = list(args)
Modified: python/branches/cpy_merge/Lib/tarfile.py
==============================================================================
--- python/branches/cpy_merge/Lib/tarfile.py (original)
+++ python/branches/cpy_merge/Lib/tarfile.py Thu Jun 14 21:06:29 2007
@@ -141,26 +141,26 @@
#---------------------------------------------------------
# Bits used in the mode field, values in octal.
#---------------------------------------------------------
-S_IFLNK = 0120000 # symbolic link
-S_IFREG = 0100000 # regular file
-S_IFBLK = 0060000 # block device
-S_IFDIR = 0040000 # directory
-S_IFCHR = 0020000 # character device
-S_IFIFO = 0010000 # fifo
-
-TSUID = 04000 # set UID on execution
-TSGID = 02000 # set GID on execution
-TSVTX = 01000 # reserved
-
-TUREAD = 0400 # read by owner
-TUWRITE = 0200 # write by owner
-TUEXEC = 0100 # execute/search by owner
-TGREAD = 0040 # read by group
-TGWRITE = 0020 # write by group
-TGEXEC = 0010 # execute/search by group
-TOREAD = 0004 # read by other
-TOWRITE = 0002 # write by other
-TOEXEC = 0001 # execute/search by other
+S_IFLNK = 0o120000 # symbolic link
+S_IFREG = 0o100000 # regular file
+S_IFBLK = 0o060000 # block device
+S_IFDIR = 0o040000 # directory
+S_IFCHR = 0o020000 # character device
+S_IFIFO = 0o010000 # fifo
+
+TSUID = 0o4000 # set UID on execution
+TSGID = 0o2000 # set GID on execution
+TSVTX = 0o1000 # reserved
+
+TUREAD = 0o400 # read by owner
+TUWRITE = 0o200 # write by owner
+TUEXEC = 0o100 # execute/search by owner
+TGREAD = 0o040 # read by group
+TGWRITE = 0o020 # write by group
+TGEXEC = 0o010 # execute/search by group
+TOREAD = 0o004 # read by other
+TOWRITE = 0o002 # write by other
+TOEXEC = 0o001 # execute/search by other
#---------------------------------------------------------
# initialization
@@ -192,7 +192,7 @@
"""
# There are two possible encodings for a number field, see
# itn() below.
- if s[0] != chr(0200):
+ if s[0] != chr(0o200):
try:
n = int(nts(s) or "0", 8)
except ValueError:
@@ -210,7 +210,7 @@
# POSIX 1003.1-1988 requires numbers to be encoded as a string of
# octal digits followed by a null-byte, this allows values up to
# (8**(digits-1))-1. GNU tar allows storing numbers greater than
- # that if necessary. A leading 0200 byte indicates this particular
+ # that if necessary. A leading 0o200 byte indicates this particular
# encoding, the following digits-1 bytes are a big-endian
# representation. This allows values up to (256**(digits-1))-1.
if 0 <= n < 8 ** (digits - 1):
@@ -226,9 +226,9 @@
s = ""
for i in range(digits - 1):
- s = chr(n & 0377) + s
+ s = chr(n & 0o377) + s
n >>= 8
- s = chr(0200) + s
+ s = chr(0o200) + s
return s
def uts(s, encoding, errors):
@@ -920,7 +920,7 @@
of the member.
"""
self.name = name # member name
- self.mode = 0644 # file permissions
+ self.mode = 0o644 # file permissions
self.uid = 0 # user id
self.gid = 0 # group id
self.size = 0 # file size
@@ -960,7 +960,7 @@
"""
info = {
"name": normpath(self.name),
- "mode": self.mode & 07777,
+ "mode": self.mode & 0o7777,
"uid": self.uid,
"gid": self.gid,
"size": self.size,
@@ -1103,7 +1103,7 @@
"""
parts = [
stn(info.get("name", ""), 100),
- itn(info.get("mode", 0) & 07777, 8, format),
+ itn(info.get("mode", 0) & 0o7777, 8, format),
itn(info.get("uid", 0), 8, format),
itn(info.get("gid", 0), 8, format),
itn(info.get("size", 0), 12, format),
@@ -2019,7 +2019,7 @@
# Extract directory with a safe mode, so that
# all files below can be extracted as well.
try:
- os.makedirs(os.path.join(path, tarinfo.name), 0700)
+ os.makedirs(os.path.join(path, tarinfo.name), 0o700)
except EnvironmentError:
pass
directories.append(tarinfo)
Modified: python/branches/cpy_merge/Lib/tempfile.py
==============================================================================
--- python/branches/cpy_merge/Lib/tempfile.py (original)
+++ python/branches/cpy_merge/Lib/tempfile.py Thu Jun 14 21:06:29 2007
@@ -200,7 +200,7 @@
name = next(namer)
filename = _os.path.join(dir, name)
try:
- fd = _os.open(filename, flags, 0600)
+ fd = _os.open(filename, flags, 0o600)
fp = _os.fdopen(fd, 'w')
fp.write('blat')
fp.close()
@@ -239,7 +239,7 @@
name = next(names)
file = _os.path.join(dir, pre + name + suf)
try:
- fd = _os.open(file, flags, 0600)
+ fd = _os.open(file, flags, 0o600)
_set_cloexec(fd)
return (fd, _os.path.abspath(file))
except OSError as e:
@@ -331,7 +331,7 @@
name = next(names)
file = _os.path.join(dir, prefix + name + suffix)
try:
- _os.mkdir(file, 0700)
+ _os.mkdir(file, 0o700)
return file
except OSError as e:
if e.errno == _errno.EEXIST:
Modified: python/branches/cpy_merge/Lib/test/exception_hierarchy.txt
==============================================================================
--- python/branches/cpy_merge/Lib/test/exception_hierarchy.txt (original)
+++ python/branches/cpy_merge/Lib/test/exception_hierarchy.txt Thu Jun 14 21:06:29 2007
@@ -4,39 +4,38 @@
+-- Exception
+-- GeneratorExit
+-- StopIteration
- +-- StandardError
- | +-- ArithmeticError
- | | +-- FloatingPointError
- | | +-- OverflowError
- | | +-- ZeroDivisionError
- | +-- AssertionError
- | +-- AttributeError
- | +-- EnvironmentError
- | | +-- IOError
- | | +-- OSError
- | | +-- WindowsError (Windows)
- | | +-- VMSError (VMS)
- | +-- EOFError
- | +-- ImportError
- | +-- LookupError
- | | +-- IndexError
- | | +-- KeyError
- | +-- MemoryError
- | +-- NameError
- | | +-- UnboundLocalError
- | +-- ReferenceError
- | +-- RuntimeError
- | | +-- NotImplementedError
- | +-- SyntaxError
- | | +-- IndentationError
- | | +-- TabError
- | +-- SystemError
- | +-- TypeError
- | +-- ValueError
- | | +-- UnicodeError
- | | +-- UnicodeDecodeError
- | | +-- UnicodeEncodeError
- | | +-- UnicodeTranslateError
+ +-- ArithmeticError
+ | +-- FloatingPointError
+ | +-- OverflowError
+ | +-- ZeroDivisionError
+ +-- AssertionError
+ +-- AttributeError
+ +-- EnvironmentError
+ | +-- IOError
+ | +-- OSError
+ | +-- WindowsError (Windows)
+ | +-- VMSError (VMS)
+ +-- EOFError
+ +-- ImportError
+ +-- LookupError
+ | +-- IndexError
+ | +-- KeyError
+ +-- MemoryError
+ +-- NameError
+ | +-- UnboundLocalError
+ +-- ReferenceError
+ +-- RuntimeError
+ | +-- NotImplementedError
+ +-- SyntaxError
+ | +-- IndentationError
+ | +-- TabError
+ +-- SystemError
+ +-- TypeError
+ +-- ValueError
+ | +-- UnicodeError
+ | +-- UnicodeDecodeError
+ | +-- UnicodeEncodeError
+ | +-- UnicodeTranslateError
+-- Warning
+-- DeprecationWarning
+-- PendingDeprecationWarning
Modified: python/branches/cpy_merge/Lib/test/list_tests.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/list_tests.py (original)
+++ python/branches/cpy_merge/Lib/test/list_tests.py Thu Jun 14 21:06:29 2007
@@ -451,7 +451,7 @@
self.assertEqual(u, list("ham"))
def test_iadd(self):
- super(CommonTest, self).test_iadd()
+ super().test_iadd()
u = self.type2test([0, 1])
u2 = u
u += [2, 3]
Modified: python/branches/cpy_merge/Lib/test/output/test_class
==============================================================================
--- python/branches/cpy_merge/Lib/test/output/test_class (original)
+++ python/branches/cpy_merge/Lib/test/output/test_class Thu Jun 14 21:06:29 2007
@@ -46,8 +46,7 @@
__int__: ()
__int__: ()
__float__: ()
-__oct__: ()
-__hex__: ()
+__index__: ()
__hash__: ()
__repr__: ()
__str__: ()
Modified: python/branches/cpy_merge/Lib/test/output/test_tokenize
==============================================================================
--- python/branches/cpy_merge/Lib/test/output/test_tokenize (original)
+++ python/branches/cpy_merge/Lib/test/output/test_tokenize Thu Jun 14 21:06:29 2007
@@ -124,66 +124,80 @@
39,5-39,7: OP '!='
39,8-39,11: NUMBER '255'
39,11-39,12: NEWLINE '\n'
-40,0-40,4: NUMBER '0377'
-40,5-40,7: OP '!='
-40,8-40,11: NUMBER '255'
-40,11-40,12: NEWLINE '\n'
+40,0-40,5: NUMBER '0o377'
+40,6-40,8: OP '!='
+40,9-40,12: NUMBER '255'
+40,12-40,13: NEWLINE '\n'
41,0-41,10: NUMBER '2147483647'
41,13-41,15: OP '!='
-41,16-41,28: NUMBER '017777777777'
-41,28-41,29: NEWLINE '\n'
+41,16-41,29: NUMBER '0o17777777777'
+41,29-41,30: NEWLINE '\n'
42,0-42,1: OP '-'
42,1-42,11: NUMBER '2147483647'
42,11-42,12: OP '-'
42,12-42,13: NUMBER '1'
42,14-42,16: OP '!='
-42,17-42,29: NUMBER '020000000000'
-42,29-42,30: NEWLINE '\n'
-43,0-43,12: NUMBER '037777777777'
-43,13-43,15: OP '!='
-43,16-43,17: OP '-'
-43,17-43,18: NUMBER '1'
-43,18-43,19: NEWLINE '\n'
+42,17-42,30: NUMBER '0o20000000000'
+42,30-42,31: NEWLINE '\n'
+43,0-43,13: NUMBER '0o37777777777'
+43,14-43,16: OP '!='
+43,17-43,18: OP '-'
+43,18-43,19: NUMBER '1'
+43,19-43,20: NEWLINE '\n'
44,0-44,10: NUMBER '0xffffffff'
44,11-44,13: OP '!='
44,14-44,15: OP '-'
44,15-44,16: NUMBER '1'
-44,16-44,17: NEWLINE '\n'
+44,16-44,17: OP ';'
+44,18-44,31: NUMBER '0o37777777777'
+44,32-44,34: OP '!='
+44,35-44,36: OP '-'
+44,36-44,37: NUMBER '1'
+44,37-44,38: OP ';'
+44,39-44,40: OP '-'
+44,40-44,49: NUMBER '0o1234567'
+44,50-44,52: OP '=='
+44,53-44,64: NUMBER '0O001234567'
+44,64-44,65: OP ';'
+44,66-44,73: NUMBER '0b10101'
+44,74-44,76: OP '=='
+44,77-44,87: NUMBER '0B00010101'
+44,87-44,88: NEWLINE '\n'
45,0-45,1: NL '\n'
46,0-46,15: COMMENT '# Long integers'
46,15-46,16: NL '\n'
47,0-47,1: NAME 'x'
47,2-47,3: OP '='
-47,4-47,6: NUMBER '0L'
-47,6-47,7: NEWLINE '\n'
+47,4-47,5: NUMBER '0'
+47,5-47,6: NEWLINE '\n'
48,0-48,1: NAME 'x'
48,2-48,3: OP '='
-48,4-48,6: NUMBER '0l'
-48,6-48,7: NEWLINE '\n'
+48,4-48,5: NUMBER '0'
+48,5-48,6: NEWLINE '\n'
49,0-49,1: NAME 'x'
49,2-49,3: OP '='
-49,4-49,23: NUMBER '0xffffffffffffffffL'
-49,23-49,24: NEWLINE '\n'
+49,4-49,22: NUMBER '0xffffffffffffffff'
+49,22-49,23: NEWLINE '\n'
50,0-50,1: NAME 'x'
50,2-50,3: OP '='
-50,4-50,23: NUMBER '0xffffffffffffffffl'
-50,23-50,24: NEWLINE '\n'
+50,4-50,22: NUMBER '0xffffffffffffffff'
+50,22-50,23: NEWLINE '\n'
51,0-51,1: NAME 'x'
51,2-51,3: OP '='
-51,4-51,23: NUMBER '077777777777777777L'
+51,4-51,23: NUMBER '0o77777777777777777'
51,23-51,24: NEWLINE '\n'
52,0-52,1: NAME 'x'
52,2-52,3: OP '='
-52,4-52,23: NUMBER '077777777777777777l'
+52,4-52,23: NUMBER '0B11101010111111111'
52,23-52,24: NEWLINE '\n'
53,0-53,1: NAME 'x'
53,2-53,3: OP '='
-53,4-53,35: NUMBER '123456789012345678901234567890L'
-53,35-53,36: NEWLINE '\n'
+53,4-53,34: NUMBER '123456789012345678901234567890'
+53,34-53,35: NEWLINE '\n'
54,0-54,1: NAME 'x'
54,2-54,3: OP '='
-54,4-54,35: NUMBER '123456789012345678901234567890l'
-54,35-54,36: NEWLINE '\n'
+54,4-54,34: NUMBER '123456789012345678901234567890'
+54,34-54,35: NEWLINE '\n'
55,0-55,1: NL '\n'
56,0-56,24: COMMENT '# Floating-point numbers'
56,24-56,25: NL '\n'
Modified: python/branches/cpy_merge/Lib/test/regrtest.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/regrtest.py (original)
+++ python/branches/cpy_merge/Lib/test/regrtest.py Thu Jun 14 21:06:29 2007
@@ -697,7 +697,7 @@
import gc, copy_reg
import _strptime, linecache, dircache
import urlparse, urllib, urllib2, mimetypes, doctest
- import struct, filecmp
+ import struct, filecmp, collections
from distutils.dir_util import _path_created
# Restore some original values.
@@ -707,6 +707,10 @@
sys.path_importer_cache.clear()
sys.path_importer_cache.update(pic)
+ # Clear ABC registries.
+ for obj in [collections.Hashable, collections.Iterable]:
+ obj._ABCMeta__registry.clear()
+
# Clear assorted module caches.
_path_created.clear()
re.purge()
Modified: python/branches/cpy_merge/Lib/test/string_tests.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/string_tests.py (original)
+++ python/branches/cpy_merge/Lib/test/string_tests.py Thu Jun 14 21:06:29 2007
@@ -211,6 +211,32 @@
self.checkraises(TypeError, 'hello', 'rindex')
self.checkraises(TypeError, 'hello', 'rindex', 42)
+ def test_lower(self):
+ self.checkequal('hello', 'HeLLo', 'lower')
+ self.checkequal('hello', 'hello', 'lower')
+ self.checkraises(TypeError, 'hello', 'lower', 42)
+
+ def test_upper(self):
+ self.checkequal('HELLO', 'HeLLo', 'upper')
+ self.checkequal('HELLO', 'HELLO', 'upper')
+ self.checkraises(TypeError, 'hello', 'upper', 42)
+
+ def test_expandtabs(self):
+ self.checkequal('abc\rab def\ng hi', 'abc\rab\tdef\ng\thi', 'expandtabs')
+ self.checkequal('abc\rab def\ng hi', 'abc\rab\tdef\ng\thi', 'expandtabs', 8)
+ self.checkequal('abc\rab def\ng hi', 'abc\rab\tdef\ng\thi', 'expandtabs', 4)
+ self.checkequal('abc\r\nab def\ng hi', 'abc\r\nab\tdef\ng\thi', 'expandtabs', 4)
+ self.checkequal('abc\rab def\ng hi', 'abc\rab\tdef\ng\thi', 'expandtabs')
+ self.checkequal('abc\rab def\ng hi', 'abc\rab\tdef\ng\thi', 'expandtabs', 8)
+ self.checkequal('abc\r\nab\r\ndef\ng\r\nhi', 'abc\r\nab\r\ndef\ng\r\nhi', 'expandtabs', 4)
+ self.checkequal(' a\n b', ' \ta\n\tb', 'expandtabs', 1)
+
+ self.checkraises(TypeError, 'hello', 'expandtabs', 42, 42)
+ # This test is only valid when sizeof(int) == sizeof(void*) == 4.
+ if sys.maxint < (1 << 32) and struct.calcsize('P') == 4:
+ self.checkraises(OverflowError,
+ '\ta\n\tb', 'expandtabs', sys.maxint)
+
def test_split(self):
# by a char
self.checkequal(['a', 'b', 'c', 'd'], 'a|b|c|d', 'split', '|')
Modified: python/branches/cpy_merge/Lib/test/test_array.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_array.py (original)
+++ python/branches/cpy_merge/Lib/test/test_array.py Thu Jun 14 21:06:29 2007
@@ -710,7 +710,7 @@
class StringTest(BaseTest):
def test_setitem(self):
- super(StringTest, self).test_setitem()
+ super().test_setitem()
a = array.array(self.typecode, self.example)
self.assertRaises(TypeError, a.__setitem__, 0, self.example[:2])
Modified: python/branches/cpy_merge/Lib/test/test_builtin.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_builtin.py (original)
+++ python/branches/cpy_merge/Lib/test/test_builtin.py Thu Jun 14 21:06:29 2007
@@ -795,8 +795,27 @@
self.assertRaises(TypeError, int, 1, 12)
- self.assertEqual(int('0123', 0), 83)
+ # tests with base 0
+ self.assertRaises(ValueError, int, ' 0123 ', 0) # old octal syntax
+ self.assertEqual(int('000', 0), 0)
+ self.assertEqual(int('0o123', 0), 83)
+ self.assertEqual(int('0x123', 0), 291)
+ self.assertEqual(int('0b100', 0), 4)
+ self.assertEqual(int(' 0O123 ', 0), 83)
+ self.assertEqual(int(' 0X123 ', 0), 291)
+ self.assertEqual(int(' 0B100 ', 0), 4)
+
+ # without base still base 10
+ self.assertEqual(int('0123'), 123)
+ self.assertEqual(int('0123', 10), 123)
+
+ # tests with prefix and base != 0
self.assertEqual(int('0x123', 16), 291)
+ self.assertEqual(int('0o123', 8), 83)
+ self.assertEqual(int('0b100', 2), 4)
+ self.assertEqual(int('0X123', 16), 291)
+ self.assertEqual(int('0O123', 8), 83)
+ self.assertEqual(int('0B100', 2), 4)
# SF bug 1334662: int(string, base) wrong answers
# Various representations of 2**32 evaluated to 0
@@ -1348,10 +1367,10 @@
self.assertEquals(next(it, 42), 42)
def test_oct(self):
- self.assertEqual(oct(100), '0144')
- self.assertEqual(oct(100), '0144')
- self.assertEqual(oct(-100), '-0144')
- self.assertEqual(oct(-100), '-0144')
+ self.assertEqual(oct(100), '0o144')
+ self.assertEqual(oct(100), '0o144')
+ self.assertEqual(oct(-100), '-0o144')
+ self.assertEqual(oct(-100), '-0o144')
self.assertRaises(TypeError, oct, ())
def write_testfile(self):
Modified: python/branches/cpy_merge/Lib/test/test_bytes.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_bytes.py (original)
+++ python/branches/cpy_merge/Lib/test/test_bytes.py Thu Jun 14 21:06:29 2007
@@ -709,6 +709,12 @@
pass
def test_find(self):
pass
+ def test_expandtabs(self):
+ pass
+ def test_upper(self):
+ pass
+ def test_lower(self):
+ pass
def test_main():
Modified: python/branches/cpy_merge/Lib/test/test_cgi.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_cgi.py (original)
+++ python/branches/cpy_merge/Lib/test/test_cgi.py Thu Jun 14 21:06:29 2007
@@ -50,7 +50,7 @@
raise ValueError, "unknown method: %s" % method
try:
return cgi.parse(fp, env, strict_parsing=1)
- except StandardError as err:
+ except Exception as err:
return ComparableException(err)
# A list of test cases. Each test case is a a two-tuple that contains
Modified: python/branches/cpy_merge/Lib/test/test_class.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_class.py (original)
+++ python/branches/cpy_merge/Lib/test/test_class.py Thu Jun 14 21:06:29 2007
@@ -80,18 +80,14 @@
print("__int__:", args)
return 1
+ def __index__(self, *args):
+ print("__index__:", args)
+ return 1
+
def __float__(self, *args):
print("__float__:", args)
return 1.0
- def __oct__(self, *args):
- print("__oct__:", args)
- return '01'
-
- def __hex__(self, *args):
- print("__hex__:", args)
- return '0x1'
-
def __cmp__(self, *args):
print("__cmp__:", args)
return 0
@@ -237,7 +233,6 @@
int(testme)
float(testme)
oct(testme)
-hex(testme)
# And the rest...
@@ -287,8 +282,6 @@
__float__ = __int__
__str__ = __int__
__repr__ = __int__
- __oct__ = __int__
- __hex__ = __int__
def check_exc(stmt, exception):
"""Raise TestFailed if executing 'stmt' does not raise 'exception'
Modified: python/branches/cpy_merge/Lib/test/test_collections.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_collections.py (original)
+++ python/branches/cpy_merge/Lib/test/test_collections.py Thu Jun 14 21:06:29 2007
@@ -1,6 +1,14 @@
+"""Unit tests for collections.py."""
+
import unittest
from test import test_support
from collections import NamedTuple
+from collections import Hashable, Iterable, Iterator
+from collections import Sized, Container, Callable
+from collections import Set, MutableSet
+from collections import Mapping, MutableMapping
+from collections import Sequence, MutableSequence
+
class TestNamedTuple(unittest.TestCase):
@@ -51,11 +59,187 @@
self.assertRaises(AttributeError, eval, 'p.z', locals())
+class TestOneTrickPonyABCs(unittest.TestCase):
+
+ def test_Hashable(self):
+ # Check some non-hashables
+ non_samples = [bytes(), list(), set(), dict()]
+ for x in non_samples:
+ self.failIf(isinstance(x, Hashable), repr(x))
+ self.failIf(issubclass(type(x), Hashable), repr(type(x)))
+ # Check some hashables
+ samples = [None,
+ int(), float(), complex(),
+ str(), unicode(),
+ tuple(), frozenset(),
+ int, list, object, type,
+ ]
+ for x in samples:
+ self.failUnless(isinstance(x, Hashable), repr(x))
+ self.failUnless(issubclass(type(x), Hashable), repr(type(x)))
+ self.assertRaises(TypeError, Hashable)
+ # Check direct subclassing
+ class H(Hashable):
+ def __hash__(self):
+ return super().__hash__()
+ self.assertEqual(hash(H()), 0)
+ self.failIf(issubclass(int, H))
+
+ def test_Iterable(self):
+ # Check some non-iterables
+ non_samples = [None, 42, 3.14, 1j]
+ for x in non_samples:
+ self.failIf(isinstance(x, Iterable), repr(x))
+ self.failIf(issubclass(type(x), Iterable), repr(type(x)))
+ # Check some iterables
+ samples = [bytes(), str(), unicode(),
+ tuple(), list(), set(), frozenset(), dict(),
+ dict().keys(), dict().items(), dict().values(),
+ (lambda: (yield))(),
+ (x for x in []),
+ ]
+ for x in samples:
+ self.failUnless(isinstance(x, Iterable), repr(x))
+ self.failUnless(issubclass(type(x), Iterable), repr(type(x)))
+ # Check direct subclassing
+ class I(Iterable):
+ def __iter__(self):
+ return super().__iter__()
+ self.assertEqual(list(I()), [])
+ self.failIf(issubclass(str, I))
+
+ def test_Iterator(self):
+ non_samples = [None, 42, 3.14, 1j, b"", "", u"", (), [], {}, set()]
+ for x in non_samples:
+ self.failIf(isinstance(x, Iterator), repr(x))
+ self.failIf(issubclass(type(x), Iterator), repr(type(x)))
+ samples = [iter(bytes()), iter(str()), iter(unicode()),
+ iter(tuple()), iter(list()), iter(dict()),
+ iter(set()), iter(frozenset()),
+ iter(dict().keys()), iter(dict().items()),
+ iter(dict().values()),
+ (lambda: (yield))(),
+ (x for x in []),
+ ]
+ for x in samples:
+ self.failUnless(isinstance(x, Iterator), repr(x))
+ self.failUnless(issubclass(type(x), Iterator), repr(type(x)))
+
+ def test_Sized(self):
+ non_samples = [None, 42, 3.14, 1j,
+ (lambda: (yield))(),
+ (x for x in []),
+ ]
+ for x in non_samples:
+ self.failIf(isinstance(x, Sized), repr(x))
+ self.failIf(issubclass(type(x), Sized), repr(type(x)))
+ samples = [bytes(), str(), unicode(),
+ tuple(), list(), set(), frozenset(), dict(),
+ dict().keys(), dict().items(), dict().values(),
+ ]
+ for x in samples:
+ self.failUnless(isinstance(x, Sized), repr(x))
+ self.failUnless(issubclass(type(x), Sized), repr(type(x)))
+
+ def test_Container(self):
+ non_samples = [None, 42, 3.14, 1j,
+ (lambda: (yield))(),
+ (x for x in []),
+ ]
+ for x in non_samples:
+ self.failIf(isinstance(x, Container), repr(x))
+ self.failIf(issubclass(type(x), Container), repr(type(x)))
+ samples = [bytes(), str(), unicode(),
+ tuple(), list(), set(), frozenset(), dict(),
+ dict().keys(), dict().items(),
+ ]
+ for x in samples:
+ self.failUnless(isinstance(x, Container), repr(x))
+ self.failUnless(issubclass(type(x), Container), repr(type(x)))
+
+ def test_Callable(self):
+ non_samples = [None, 42, 3.14, 1j,
+ "", b"", (), [], {}, set(),
+ (lambda: (yield))(),
+ (x for x in []),
+ ]
+ for x in non_samples:
+ self.failIf(isinstance(x, Callable), repr(x))
+ self.failIf(issubclass(type(x), Callable), repr(type(x)))
+ samples = [lambda: None,
+ type, int, object,
+ len,
+ list.append, [].append,
+ ]
+ for x in samples:
+ self.failUnless(isinstance(x, Callable), repr(x))
+ self.failUnless(issubclass(type(x), Callable), repr(type(x)))
+
+ def test_direct_subclassing(self):
+ for B in Hashable, Iterable, Iterator, Sized, Container, Callable:
+ class C(B):
+ pass
+ self.failUnless(issubclass(C, B))
+ self.failIf(issubclass(int, C))
+
+ def test_registration(self):
+ for B in Hashable, Iterable, Iterator, Sized, Container, Callable:
+ class C:
+ __hash__ = None # Make sure it isn't hashable by default
+ self.failIf(issubclass(C, B), B.__name__)
+ B.register(C)
+ self.failUnless(issubclass(C, B))
+
+
+class TestCollectionABCs(unittest.TestCase):
+
+ # XXX For now, we only test some virtual inheritance properties.
+ # We should also test the proper behavior of the collection ABCs
+ # as real base classes or mix-in classes.
+
+ def test_Set(self):
+ for sample in [set, frozenset]:
+ self.failUnless(isinstance(sample(), Set))
+ self.failUnless(issubclass(sample, Set))
+
+ def test_MutableSet(self):
+ self.failUnless(isinstance(set(), MutableSet))
+ self.failUnless(issubclass(set, MutableSet))
+ self.failIf(isinstance(frozenset(), MutableSet))
+ self.failIf(issubclass(frozenset, MutableSet))
+
+ def test_Mapping(self):
+ for sample in [dict]:
+ self.failUnless(isinstance(sample(), Mapping))
+ self.failUnless(issubclass(sample, Mapping))
+
+ def test_MutableMapping(self):
+ for sample in [dict]:
+ self.failUnless(isinstance(sample(), MutableMapping))
+ self.failUnless(issubclass(sample, MutableMapping))
+
+ def test_Sequence(self):
+ for sample in [tuple, list, bytes, str]:
+ self.failUnless(isinstance(sample(), Sequence))
+ self.failUnless(issubclass(sample, Sequence))
+ self.failUnless(issubclass(basestring, Sequence))
+
+ def test_MutableSequence(self):
+ for sample in [tuple, str]:
+ self.failIf(isinstance(sample(), MutableSequence))
+ self.failIf(issubclass(sample, MutableSequence))
+ for sample in [list, bytes]:
+ self.failUnless(isinstance(sample(), MutableSequence))
+ self.failUnless(issubclass(sample, MutableSequence))
+ self.failIf(issubclass(basestring, MutableSequence))
+
+
def test_main(verbose=None):
import collections as CollectionsModule
- test_classes = [TestNamedTuple]
+ test_classes = [TestNamedTuple, TestOneTrickPonyABCs, TestCollectionABCs]
test_support.run_unittest(*test_classes)
test_support.run_doctest(CollectionsModule, verbose)
+
if __name__ == "__main__":
test_main(verbose=True)
Modified: python/branches/cpy_merge/Lib/test/test_compile.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_compile.py (original)
+++ python/branches/cpy_merge/Lib/test/test_compile.py Thu Jun 14 21:06:29 2007
@@ -36,6 +36,9 @@
def test_syntax_error(self):
self.assertRaises(SyntaxError, compile, "1+*3", "filename", "exec")
+ def test_none_keyword_arg(self):
+ self.assertRaises(SyntaxError, compile, "f(None=1)", "<string>", "exec")
+
def test_duplicate_global_local(self):
try:
exec('def f(a): global a; a = 1')
@@ -158,21 +161,22 @@
def test_literals_with_leading_zeroes(self):
for arg in ["077787", "0xj", "0x.", "0e", "090000000000000",
- "080000000000000", "000000000000009", "000000000000008"]:
+ "080000000000000", "000000000000009", "000000000000008",
+ "0b42", "0BADCAFE", "0o123456789", "0b1.1", "0o4.2",
+ "0b101j2", "0o153j2", "0b100e1", "0o777e1", "0777",
+ "000777", "000000000000007"]:
self.assertRaises(SyntaxError, eval, arg)
- self.assertEqual(eval("0777"), 511)
- self.assertEqual(eval("000777"), 511)
self.assertEqual(eval("0xff"), 255)
- self.assertEqual(eval("0XfF"), 255)
self.assertEqual(eval("0777."), 777)
self.assertEqual(eval("0777.0"), 777)
self.assertEqual(eval("000000000000000000000000000000000000000000000000000777e0"), 777)
self.assertEqual(eval("0777e1"), 7770)
self.assertEqual(eval("0e0"), 0)
- self.assertEqual(eval("0000E-012"), 0)
+ self.assertEqual(eval("0000e-012"), 0)
self.assertEqual(eval("09.5"), 9.5)
self.assertEqual(eval("0777j"), 777j)
+ self.assertEqual(eval("000"), 0)
self.assertEqual(eval("00j"), 0j)
self.assertEqual(eval("00.0"), 0)
self.assertEqual(eval("0e3"), 0)
@@ -181,9 +185,12 @@
self.assertEqual(eval("090000000000000e0"), 90000000000000.)
self.assertEqual(eval("090000000000000e-0"), 90000000000000.)
self.assertEqual(eval("090000000000000j"), 90000000000000j)
- self.assertEqual(eval("000000000000007"), 7)
self.assertEqual(eval("000000000000008."), 8.)
self.assertEqual(eval("000000000000009."), 9.)
+ self.assertEqual(eval("0b101010"), 42)
+ self.assertEqual(eval("-0b000000000010"), -2)
+ self.assertEqual(eval("0o777"), 511)
+ self.assertEqual(eval("-0o0000010"), -8)
def test_unary_minus(self):
# Verify treatment of unary minus on negative numbers SF bug #660455
Modified: python/branches/cpy_merge/Lib/test/test_descr.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_descr.py (original)
+++ python/branches/cpy_merge/Lib/test/test_descr.py Thu Jun 14 21:06:29 2007
@@ -2124,17 +2124,14 @@
class octlong(int):
__slots__ = []
def __str__(self):
- s = oct(self)
- if s[-1] == 'L':
- s = s[:-1]
- return s
+ return oct(self)
def __add__(self, other):
return self.__class__(super(octlong, self).__add__(other))
__radd__ = __add__
- vereq(str(octlong(3) + 5), "010")
+ vereq(str(octlong(3) + 5), "0o10")
# (Note that overriding __radd__ here only seems to work
# because the example uses a short int left argument.)
- vereq(str(5 + octlong(3000)), "05675")
+ vereq(str(5 + octlong(3000)), "0o5675")
a = octlong(12345)
vereq(a, 12345)
vereq(int(a), 12345)
@@ -4103,7 +4100,8 @@
N1 = sys.maxint + 1 # might trigger OverflowErrors instead of TypeErrors
N2 = sys.maxint # if sizeof(int) < sizeof(long), might trigger
# ValueErrors instead of TypeErrors
- for metaclass in [type, types.ClassType]:
+ if 1:
+ metaclass = type
for name, expr, iexpr in [
('__add__', 'x + y', 'x += y'),
('__sub__', 'x - y', 'x -= y'),
Modified: python/branches/cpy_merge/Lib/test/test_dumbdbm.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_dumbdbm.py (original)
+++ python/branches/cpy_merge/Lib/test/test_dumbdbm.py Thu Jun 14 21:06:29 2007
@@ -44,17 +44,17 @@
return
try:
- old_umask = os.umask(0002)
- f = dumbdbm.open(_fname, 'c', 0637)
+ old_umask = os.umask(0o002)
+ f = dumbdbm.open(_fname, 'c', 0o637)
f.close()
finally:
os.umask(old_umask)
- expected_mode = 0635
+ expected_mode = 0o635
if os.name != 'posix':
# Windows only supports setting the read-only attribute.
# This shouldn't fail, but doesn't work like Unix either.
- expected_mode = 0666
+ expected_mode = 0o666
import stat
st = os.stat(_fname + '.dat')
Modified: python/branches/cpy_merge/Lib/test/test_format.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_format.py (original)
+++ python/branches/cpy_merge/Lib/test/test_format.py Thu Jun 14 21:06:29 2007
@@ -122,7 +122,7 @@
# same, except no 0 flag
testboth("%#+27.23X", big, " +0X001234567890ABCDEF12345")
-big = 012345670123456701234567012345670 # 32 octal digits
+big = 0o12345670123456701234567012345670 # 32 octal digits
testboth("%o", big, "12345670123456701234567012345670")
testboth("%o", -big, "-12345670123456701234567012345670")
testboth("%5o", -big, "-12345670123456701234567012345670")
@@ -142,25 +142,26 @@
testboth("%34.33o", big, " 012345670123456701234567012345670")
testboth("%-34.33o", big, "012345670123456701234567012345670 ")
testboth("%o", big, "12345670123456701234567012345670")
-testboth("%#o", big, "012345670123456701234567012345670")
-testboth("%#o", -big, "-012345670123456701234567012345670")
-testboth("%#.34o", -big, "-0012345670123456701234567012345670")
-testboth("%#+.34o", big, "+0012345670123456701234567012345670")
-testboth("%# .34o", big, " 0012345670123456701234567012345670")
-testboth("%#+.34o", big, "+0012345670123456701234567012345670")
-testboth("%#-+.34o", big, "+0012345670123456701234567012345670")
-testboth("%#-+37.34o", big, "+0012345670123456701234567012345670 ")
-testboth("%#+37.34o", big, " +0012345670123456701234567012345670")
+testboth("%#o", big, "0o12345670123456701234567012345670")
+testboth("%#o", -big, "-0o12345670123456701234567012345670")
+testboth("%#.34o", -big, "-0o0012345670123456701234567012345670")
+testboth("%#+.34o", big, "+0o0012345670123456701234567012345670")
+testboth("%# .34o", big, " 0o0012345670123456701234567012345670")
+testboth("%#-+.34o", big, "+0o0012345670123456701234567012345670")
+testboth("%#-+39.34o", big, "+0o0012345670123456701234567012345670 ")
+testboth("%#+39.34o", big, " +0o0012345670123456701234567012345670")
# next one gets one leading zero from precision
testboth("%.33o", big, "012345670123456701234567012345670")
-# base marker shouldn't change that, since "0" is redundant
-testboth("%#.33o", big, "012345670123456701234567012345670")
-# but reduce precision, and base marker should add a zero
-testboth("%#.32o", big, "012345670123456701234567012345670")
-# one leading zero from precision, and another from "0" flag & width
+# one leading zero from precision
+testboth("%#.33o", big, "0o012345670123456701234567012345670")
+# leading zero vanishes
+testboth("%#.32o", big, "0o12345670123456701234567012345670")
+# one leading zero from precision, and another from '0' flag & width
testboth("%034.33o", big, "0012345670123456701234567012345670")
-# base marker shouldn't change that
-testboth("%0#34.33o", big, "0012345670123456701234567012345670")
+# max width includes base marker; padding zeroes come after marker
+testboth("%0#38.33o", big, "0o000012345670123456701234567012345670")
+# padding spaces come before marker
+testboth("%#36.33o", big, " 0o012345670123456701234567012345670")
# Some small ints, in both Python int and long flavors).
testboth("%d", 42, "42")
@@ -171,10 +172,10 @@
testboth("%#x", 1, "0x1")
testboth("%#X", 1, "0X1")
testboth("%#X", 1, "0X1")
-testboth("%#o", 1, "01")
-testboth("%#o", 1, "01")
-testboth("%#o", 0, "0")
-testboth("%#o", 0, "0")
+testboth("%#o", 1, "0o1")
+testboth("%#o", 1, "0o1")
+testboth("%#o", 0, "0o0")
+testboth("%#o", 0, "0o0")
testboth("%o", 0, "0")
testboth("%o", 0, "0")
testboth("%d", 0, "0")
@@ -189,10 +190,10 @@
testboth("%x", 0x42, "42")
testboth("%x", -0x42, "-42")
-testboth("%o", 042, "42")
-testboth("%o", -042, "-42")
-testboth("%o", 042, "42")
-testboth("%o", -042, "-42")
+testboth("%o", 0o42, "42")
+testboth("%o", -0o42, "-42")
+testboth("%o", 0o42, "42")
+testboth("%o", -0o42, "-42")
# Test exception for unknown format characters
if verbose:
@@ -232,14 +233,6 @@
test_exc(u'no format', u'1', TypeError,
"not all arguments converted during string formatting")
-class Foobar(int):
- def __oct__(self):
- # Returning a non-string should not blow up.
- return self + 1
-
-test_exc('%o', Foobar(), TypeError,
- "expected string or Unicode object, int found")
-
if maxsize == 2**31-1:
# crashes 2.2.1 and earlier:
try:
Modified: python/branches/cpy_merge/Lib/test/test_grammar.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_grammar.py (original)
+++ python/branches/cpy_merge/Lib/test/test_grammar.py Thu Jun 14 21:06:29 2007
@@ -27,26 +27,32 @@
self.assertEquals(x, 0, 'backslash ending comment')
def testPlainIntegers(self):
+ self.assertEquals(type(000), type(0))
self.assertEquals(0xff, 255)
- self.assertEquals(0377, 255)
- self.assertEquals(2147483647, 017777777777)
+ self.assertEquals(0o377, 255)
+ self.assertEquals(2147483647, 0o17777777777)
+ self.assertEquals(0b1001, 9)
from sys import maxint
if maxint == 2147483647:
- self.assertEquals(-2147483647-1, -020000000000)
+ self.assertEquals(-2147483647-1, -0o20000000000)
# XXX -2147483648
- self.assert_(037777777777 > 0)
+ self.assert_(0o37777777777 > 0)
self.assert_(0xffffffff > 0)
- for s in '2147483648', '040000000000', '0x100000000':
+ self.assert_(0b1111111111111111111111111111111 > 0)
+ for s in ('2147483648', '0o40000000000', '0x100000000',
+ '0b10000000000000000000000000000000'):
try:
x = eval(s)
except OverflowError:
self.fail("OverflowError on huge integer literal %r" % s)
elif maxint == 9223372036854775807:
- self.assertEquals(-9223372036854775807-1, -01000000000000000000000)
- self.assert_(01777777777777777777777 > 0)
+ self.assertEquals(-9223372036854775807-1, -0o1000000000000000000000)
+ self.assert_(0o1777777777777777777777 > 0)
self.assert_(0xffffffffffffffff > 0)
- for s in '9223372036854775808', '02000000000000000000000', \
- '0x10000000000000000':
+ self.assert_(0b11111111111111111111111111111111111111111111111111111111111111 > 0)
+ for s in '9223372036854775808', '0o2000000000000000000000', \
+ '0x10000000000000000', \
+ '0b100000000000000000000000000000000000000000000000000000000000000':
try:
x = eval(s)
except OverflowError:
@@ -56,13 +62,13 @@
def testLongIntegers(self):
x = 0
- x = 0
- x = 0xffffffffffffffff
x = 0xffffffffffffffff
- x = 077777777777777777
- x = 077777777777777777
- x = 123456789012345678901234567890
+ x = 0Xffffffffffffffff
+ x = 0o77777777777777777
+ x = 0O77777777777777777
x = 123456789012345678901234567890
+ x = 0b100000000000000000000000000000000000000000000000000000000000000000000
+ x = 0B111111111111111111111111111111111111111111111111111111111111111111111
def testFloats(self):
x = 3.14
Modified: python/branches/cpy_merge/Lib/test/test_hexoct.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_hexoct.py (original)
+++ python/branches/cpy_merge/Lib/test/test_hexoct.py Thu Jun 14 21:06:29 2007
@@ -65,49 +65,49 @@
def test_oct_baseline(self):
# Baseline tests
self.assertEqual(00, 0)
- self.assertEqual(020, 16)
+ self.assertEqual(0o20, 16)
if platform_long_is_32_bits:
- self.assertEqual(017777777777, 2147483647)
+ self.assertEqual(0o17777777777, 2147483647)
else:
- self.assertEqual(0777777777777777777777, 9223372036854775807)
+ self.assertEqual(0o777777777777777777777, 9223372036854775807)
# Ditto with a minus sign and parentheses
self.assertEqual(-(00), 0)
- self.assertEqual(-(020), -16)
+ self.assertEqual(-(0o20), -16)
if platform_long_is_32_bits:
- self.assertEqual(-(017777777777), -2147483647)
+ self.assertEqual(-(0o17777777777), -2147483647)
else:
- self.assertEqual(-(0777777777777777777777), -9223372036854775807)
+ self.assertEqual(-(0o777777777777777777777), -9223372036854775807)
# Ditto with a minus sign and NO parentheses
self.assertEqual(-00, 0)
- self.assertEqual(-020, -16)
+ self.assertEqual(-0o20, -16)
if platform_long_is_32_bits:
- self.assertEqual(-017777777777, -2147483647)
+ self.assertEqual(-0o17777777777, -2147483647)
else:
- self.assertEqual(-0777777777777777777777, -9223372036854775807)
+ self.assertEqual(-0o777777777777777777777, -9223372036854775807)
def test_oct_unsigned(self):
if platform_long_is_32_bits:
# Positive constants
- self.assertEqual(020000000000, 2147483648)
- self.assertEqual(037777777777, 4294967295)
+ self.assertEqual(0o20000000000, 2147483648)
+ self.assertEqual(0o37777777777, 4294967295)
# Ditto with a minus sign and parentheses
- self.assertEqual(-(020000000000), -2147483648)
- self.assertEqual(-(037777777777), -4294967295)
+ self.assertEqual(-(0o20000000000), -2147483648)
+ self.assertEqual(-(0o37777777777), -4294967295)
# Ditto with a minus sign and NO parentheses
# This failed in Python 2.2 through 2.2.2 and in 2.3a1
- self.assertEqual(-020000000000, -2147483648)
- self.assertEqual(-037777777777, -4294967295)
+ self.assertEqual(-0o20000000000, -2147483648)
+ self.assertEqual(-0o37777777777, -4294967295)
else:
# Positive constants
- self.assertEqual(01000000000000000000000, 9223372036854775808)
- self.assertEqual(01777777777777777777777, 18446744073709551615)
+ self.assertEqual(0o1000000000000000000000, 9223372036854775808)
+ self.assertEqual(0o1777777777777777777777, 18446744073709551615)
# Ditto with a minus sign and parentheses
- self.assertEqual(-(01000000000000000000000), -9223372036854775808)
- self.assertEqual(-(01777777777777777777777), -18446744073709551615)
+ self.assertEqual(-(0o1000000000000000000000), -9223372036854775808)
+ self.assertEqual(-(0o1777777777777777777777), -18446744073709551615)
# Ditto with a minus sign and NO parentheses
# This failed in Python 2.2 through 2.2.2 and in 2.3a1
- self.assertEqual(-01000000000000000000000, -9223372036854775808)
- self.assertEqual(-01777777777777777777777, -18446744073709551615)
+ self.assertEqual(-0o1000000000000000000000, -9223372036854775808)
+ self.assertEqual(-0o1777777777777777777777, -18446744073709551615)
def test_main():
test_support.run_unittest(TextHexOct)
Modified: python/branches/cpy_merge/Lib/test/test_isinstance.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_isinstance.py (original)
+++ python/branches/cpy_merge/Lib/test/test_isinstance.py Thu Jun 14 21:06:29 2007
@@ -15,7 +15,7 @@
# (leading to an "undetected error" in the debug build). Set up is,
# isinstance(inst, cls) where:
#
- # - cls isn't a ClassType, a TypeType, or a TupleType
+ # - cls isn't a a type, or a tuple
# - cls has a __bases__ attribute
# - inst has a __class__ attribute
# - inst.__class__ as no __bases__ attribute
Modified: python/branches/cpy_merge/Lib/test/test_list.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_list.py (original)
+++ python/branches/cpy_merge/Lib/test/test_list.py Thu Jun 14 21:06:29 2007
@@ -5,7 +5,7 @@
type2test = list
def test_truth(self):
- super(ListTest, self).test_truth()
+ super().test_truth()
self.assert_(not [])
self.assert_([42])
@@ -13,7 +13,7 @@
self.assert_([] is not [])
def test_len(self):
- super(ListTest, self).test_len()
+ super().test_len()
self.assertEqual(len([]), 0)
self.assertEqual(len([0]), 1)
self.assertEqual(len([0, 1, 2]), 3)
Modified: python/branches/cpy_merge/Lib/test/test_logging.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_logging.py (original)
+++ python/branches/cpy_merge/Lib/test/test_logging.py Thu Jun 14 21:06:29 2007
@@ -25,7 +25,7 @@
"""
import select
-import os, sys, struct, types, pickle, cStringIO
+import os, sys, struct, pickle, cStringIO
import socket, tempfile, threading, time
import logging, logging.handlers, logging.config
from test.test_support import run_with_locale
Modified: python/branches/cpy_merge/Lib/test/test_long.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_long.py (original)
+++ python/branches/cpy_merge/Lib/test/test_long.py Thu Jun 14 21:06:29 2007
@@ -195,9 +195,6 @@
self.check_bitop_identities_3(x, y, self.getran((lenx + leny)//2))
def slow_format(self, x, base):
- if (x, base) == (0, 8):
- # this is an oddball!
- return "0"
digits = []
sign = 0
if x < 0:
@@ -208,7 +205,7 @@
digits.reverse()
digits = digits or [0]
return '-'[:sign] + \
- {8: '0', 10: '', 16: '0x'}[base] + \
+ {2: '0b', 8: '0o', 10: '', 16: '0x'}[base] + \
"".join(map(lambda i: "0123456789abcdef"[i], digits))
def check_format_1(self, x):
Modified: python/branches/cpy_merge/Lib/test/test_multibytecodec.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_multibytecodec.py (original)
+++ python/branches/cpy_merge/Lib/test/test_multibytecodec.py Thu Jun 14 21:06:29 2007
@@ -136,11 +136,21 @@
self.assertRaises(UnicodeDecodeError, decoder.decode, '', True)
self.assertEqual(decoder.decode('B@$'), u'\u4e16')
+class Test_StreamReader(unittest.TestCase):
+ def test_bug1728403(self):
+ try:
+ open(TESTFN, 'w').write('\xa1')
+ f = codecs.open(TESTFN, encoding='cp949')
+ self.assertRaises(UnicodeDecodeError, f.read, 2)
+ finally:
+ try: f.close()
+ except: pass
+ os.unlink(TESTFN)
class Test_StreamWriter(unittest.TestCase):
if len(u'\U00012345') == 2: # UCS2
def test_gb18030(self):
- s= StringIO.StringIO()
+ s = StringIO.StringIO()
c = codecs.getwriter('gb18030')(s)
c.write(u'123')
self.assertEqual(s.getvalue(), '123')
Modified: python/branches/cpy_merge/Lib/test/test_optparse.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_optparse.py (original)
+++ python/branches/cpy_merge/Lib/test/test_optparse.py Thu Jun 14 21:06:29 2007
@@ -12,7 +12,6 @@
import os
import re
import copy
-import types
import unittest
from StringIO import StringIO
@@ -171,7 +170,7 @@
except InterceptedError as err:
self.assert_(
- type(output) is types.StringType,
+ isinstance(output, str),
"expected output to be an ordinary string, not %r"
% type(output))
@@ -432,18 +431,12 @@
self.parser.add_option("-s", type="str")
self.assertEquals(self.parser.get_option("-s").type, "string")
- def test_new_type_object(self):
+ def test_type_object(self):
self.parser.add_option("-s", type=str)
self.assertEquals(self.parser.get_option("-s").type, "string")
self.parser.add_option("-x", type=int)
self.assertEquals(self.parser.get_option("-x").type, "int")
- def test_old_type_object(self):
- self.parser.add_option("-s", type=types.StringType)
- self.assertEquals(self.parser.get_option("-s").type, "string")
- self.parser.add_option("-x", type=types.IntType)
- self.assertEquals(self.parser.get_option("-x").type, "int")
-
# Custom type for testing processing of default values.
_time_units = { 's' : 1, 'm' : 60, 'h' : 60*60, 'd' : 60*60*24 }
@@ -1470,7 +1463,7 @@
os.environ['COLUMNS'] = orig_columns
def assertHelpEquals(self, expected_output):
- if type(expected_output) is types.UnicodeType:
+ if isinstance(expected_output, unicode):
encoding = self.parser._get_encoding(sys.stdout)
expected_output = expected_output.encode(encoding, "replace")
Modified: python/branches/cpy_merge/Lib/test/test_peepholer.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_peepholer.py (original)
+++ python/branches/cpy_merge/Lib/test/test_peepholer.py Thu Jun 14 21:06:29 2007
@@ -39,16 +39,24 @@
asm = dis_single(line)
self.assert_(elem in asm)
- def test_none_as_constant(self):
- # LOAD_GLOBAL None --> LOAD_CONST None
+ def test_global_as_constant(self):
+ # LOAD_GLOBAL None/True/False --> LOAD_CONST None/True/False
def f(x):
None
+ None
return x
- asm = disassemble(f)
- for elem in ('LOAD_GLOBAL',):
- self.assert_(elem not in asm)
- for elem in ('LOAD_CONST', '(None)'):
- self.assert_(elem in asm)
+ def g(x):
+ True
+ return x
+ def h(x):
+ False
+ return x
+ for func, name in ((f, 'None'), (g, 'True'), (h, 'False')):
+ asm = disassemble(func)
+ for elem in ('LOAD_GLOBAL',):
+ self.assert_(elem not in asm)
+ for elem in ('LOAD_CONST', '('+name+')'):
+ self.assert_(elem in asm)
def f():
'Adding a docstring made this test fail in Py2.5.0'
return None
Modified: python/branches/cpy_merge/Lib/test/test_pep352.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_pep352.py (original)
+++ python/branches/cpy_merge/Lib/test/test_pep352.py Thu Jun 14 21:06:29 2007
@@ -133,22 +133,22 @@
"""Catching 'object_' should raise a TypeError."""
try:
try:
- raise StandardError
+ raise Exception
except object_:
pass
except TypeError:
pass
- except StandardError:
+ except Exception:
self.fail("TypeError expected when catching %s" % type(object_))
try:
try:
- raise StandardError
+ raise Exception
except (object_,):
pass
except TypeError:
return
- except StandardError:
+ except Exception:
self.fail("TypeError expected when catching %s as specified in a "
"tuple" % type(object_))
Modified: python/branches/cpy_merge/Lib/test/test_pyclbr.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_pyclbr.py (original)
+++ python/branches/cpy_merge/Lib/test/test_pyclbr.py Thu Jun 14 21:06:29 2007
@@ -4,7 +4,7 @@
'''
from test.test_support import run_unittest
import unittest, sys
-from types import ClassType, FunctionType, MethodType, BuiltinFunctionType
+from types import FunctionType, MethodType, BuiltinFunctionType
import pyclbr
from unittest import TestCase
@@ -95,7 +95,7 @@
continue # skip functions that came from somewhere else
self.assertEquals(py_item.__module__, value.module)
else:
- self.failUnless(isinstance(py_item, (ClassType, type)))
+ self.failUnless(isinstance(py_item, type))
if py_item.__module__ != moduleName:
continue # skip classes that came from somewhere else
@@ -133,14 +133,14 @@
# Now check for missing stuff.
def defined_in(item, module):
- if isinstance(item, ClassType):
+ if isinstance(item, type):
return item.__module__ == module.__name__
if isinstance(item, FunctionType):
return item.__globals__ is module.__dict__
return False
for name in dir(module):
item = getattr(module, name)
- if isinstance(item, (ClassType, FunctionType)):
+ if isinstance(item, (type, FunctionType)):
if defined_in(item, module):
self.assertHaskey(dict, name, ignore)
Modified: python/branches/cpy_merge/Lib/test/test_repr.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_repr.py (original)
+++ python/branches/cpy_merge/Lib/test/test_repr.py Thu Jun 14 21:06:29 2007
@@ -10,6 +10,7 @@
from test.test_support import run_unittest
from repr import repr as r # Don't shadow builtin repr
+from repr import Repr
def nestedTuple(nesting):
@@ -34,6 +35,18 @@
expected = repr(s)[:13] + "..." + repr(s)[-14:]
eq(r(s), expected)
+ def test_tuple(self):
+ eq = self.assertEquals
+ eq(r((1,)), "(1,)")
+
+ t3 = (1, 2, 3)
+ eq(r(t3), "(1, 2, 3)")
+
+ r2 = Repr()
+ r2.maxtuple = 2
+ expected = repr(t3)[:-2] + "...)"
+ eq(r2.repr(t3), expected)
+
def test_container(self):
from array import array
from collections import deque
Modified: python/branches/cpy_merge/Lib/test/test_str.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_str.py (original)
+++ python/branches/cpy_merge/Lib/test/test_str.py Thu Jun 14 21:06:29 2007
@@ -1,4 +1,7 @@
+
import unittest
+import struct
+import sys
from test import test_support, string_tests
@@ -90,6 +93,15 @@
self.assertEqual(str(Foo9("foo")), "string")
self.assertEqual(unicode(Foo9("foo")), u"not unicode")
+ def test_expandtabs_overflows_gracefully(self):
+ # This test only affects 32-bit platforms because expandtabs can only take
+ # an int as the max value, not a 64-bit C long. If expandtabs is changed
+ # to take a 64-bit long, this test should apply to all platforms.
+ if sys.maxint > (1 << 32) or struct.calcsize('P') != 4:
+ return
+ self.assertRaises(OverflowError, 't\tt\t'.expandtabs, sys.maxint)
+
+
def test_main():
test_support.run_unittest(StrTest)
Modified: python/branches/cpy_merge/Lib/test/test_strptime.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_strptime.py (original)
+++ python/branches/cpy_merge/Lib/test/test_strptime.py Thu Jun 14 21:06:29 2007
@@ -190,6 +190,15 @@
"locale data that contains regex metacharacters is not"
" properly escaped")
+ def test_whitespace_substitution(self):
+ # When pattern contains whitespace, make sure it is taken into account
+ # so as to not allow to subpatterns to end up next to each other and
+ # "steal" characters from each other.
+ pattern = self.time_re.pattern('%j %H')
+ self.failUnless(not re.match(pattern, "180"))
+ self.failUnless(re.match(pattern, "18 0"))
+
+
class StrptimeTests(unittest.TestCase):
"""Tests for _strptime.strptime."""
@@ -463,8 +472,8 @@
"of the year")
test_helper((1917, 12, 31), "Dec 31 on Monday with year starting and "
"ending on Monday")
- test_helper((2007, 01, 07), "First Sunday of 2007")
- test_helper((2007, 01, 14), "Second Sunday of 2007")
+ test_helper((2007, 1, 7), "First Sunday of 2007")
+ test_helper((2007, 1, 14), "Second Sunday of 2007")
test_helper((2006, 12, 31), "Last Sunday of 2006")
test_helper((2006, 12, 24), "Second to last Sunday of 2006")
Modified: python/branches/cpy_merge/Lib/test/test_structmembers.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_structmembers.py (original)
+++ python/branches/cpy_merge/Lib/test/test_structmembers.py Thu Jun 14 21:06:29 2007
@@ -2,7 +2,8 @@
CHAR_MAX, CHAR_MIN, UCHAR_MAX, \
SHRT_MAX, SHRT_MIN, USHRT_MAX, \
INT_MAX, INT_MIN, UINT_MAX, \
- LONG_MAX, LONG_MIN, ULONG_MAX
+ LONG_MAX, LONG_MIN, ULONG_MAX, \
+ LLONG_MAX, LLONG_MIN, ULLONG_MAX
import warnings, unittest
from test import test_support
@@ -39,6 +40,23 @@
ts.T_ULONG=ULONG_MAX
self.assertEquals(ts.T_ULONG, ULONG_MAX)
+ ## T_LONGLONG and T_ULONGLONG may not be present on some platforms
+ if hasattr(ts, 'T_LONGLONG'):
+ ts.T_LONGLONG=LLONG_MAX
+ self.assertEquals(ts.T_LONGLONG, LLONG_MAX)
+ ts.T_LONGLONG=LLONG_MIN
+ self.assertEquals(ts.T_LONGLONG, LLONG_MIN)
+
+ ts.T_ULONGLONG=ULLONG_MAX
+ self.assertEquals(ts.T_ULONGLONG, ULLONG_MAX)
+
+ ## make sure these will accept a plain int as well as a long
+ ts.T_LONGLONG=3
+ self.assertEquals(ts.T_LONGLONG, 3)
+ ts.T_ULONGLONG=4
+ self.assertEquals(ts.T_ULONGLONG, 4)
+
+
class TestWarnings(unittest.TestCase):
def has_warned(self, w):
self.assert_(w.category is RuntimeWarning)
Modified: python/branches/cpy_merge/Lib/test/test_subprocess.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_subprocess.py (original)
+++ python/branches/cpy_merge/Lib/test/test_subprocess.py Thu Jun 14 21:06:29 2007
@@ -533,7 +533,7 @@
os.write(f, "exec %s -c 'import sys; sys.exit(47)'\n" %
sys.executable)
os.close(f)
- os.chmod(fname, 0700)
+ os.chmod(fname, 0o700)
p = subprocess.Popen(fname)
p.wait()
os.remove(fname)
@@ -575,7 +575,7 @@
os.write(f, "exec %s -c 'import sys; sys.exit(47)'\n" %
sys.executable)
os.close(f)
- os.chmod(fname, 0700)
+ os.chmod(fname, 0o700)
rc = subprocess.call(fname)
os.remove(fname)
self.assertEqual(rc, 47)
Modified: python/branches/cpy_merge/Lib/test/test_sundry.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_sundry.py (original)
+++ python/branches/cpy_merge/Lib/test/test_sundry.py Thu Jun 14 21:06:29 2007
@@ -1,6 +1,7 @@
"""Do a minimal test of all the modules that aren't otherwise tested."""
from test.test_support import guard_warnings_filter
+import sys
import warnings
with guard_warnings_filter():
@@ -18,6 +19,53 @@
import cmd
import code
import compileall
+
+ import distutils.archive_util
+ import distutils.bcppcompiler
+ import distutils.ccompiler
+ import distutils.cmd
+ import distutils.core
+ import distutils.cygwinccompiler
+ import distutils.dep_util
+ import distutils.dir_util
+ import distutils.emxccompiler
+ import distutils.errors
+ import distutils.extension
+ import distutils.file_util
+ import distutils.filelist
+ import distutils.log
+ if sys.platform.startswith('win'):
+ import distutils.msvccompiler
+ import distutils.mwerkscompiler
+ import distutils.sysconfig
+ import distutils.text_file
+ import distutils.unixccompiler
+ import distutils.util
+ import distutils.version
+
+ import distutils.command.bdist_dumb
+ if sys.platform.startswith('win'):
+ import distutils.command.bdist_msi
+ import distutils.command.bdist
+ import distutils.command.bdist_rpm
+ import distutils.command.bdist_wininst
+ import distutils.command.build_clib
+ import distutils.command.build_ext
+ import distutils.command.build
+ import distutils.command.build_py
+ import distutils.command.build_scripts
+ import distutils.command.clean
+ import distutils.command.config
+ import distutils.command.install_data
+ import distutils.command.install_egg_info
+ import distutils.command.install_headers
+ import distutils.command.install_lib
+ import distutils.command.install
+ import distutils.command.install_scripts
+ import distutils.command.register
+ import distutils.command.sdist
+ import distutils.command.upload
+
import encodings
import formatter
import ftplib
@@ -37,7 +85,6 @@
import os2emxpath
import pdb
import pipes
- #import poplib
import pstats
import py_compile
import pydoc
Modified: python/branches/cpy_merge/Lib/test/test_tarfile.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_tarfile.py (original)
+++ python/branches/cpy_merge/Lib/test/test_tarfile.py Thu Jun 14 21:06:29 2007
@@ -164,7 +164,7 @@
def test_check_members(self):
for tarinfo in self.tar:
- self.assert_(int(tarinfo.mtime) == 07606136617,
+ self.assert_(int(tarinfo.mtime) == 0o7606136617,
"wrong mtime for %s" % tarinfo.name)
if not tarinfo.name.startswith("ustar/"):
continue
@@ -299,7 +299,7 @@
self.assert_(md5sum(self.tar.extractfile(tarinfo).read()) == chksum,
"wrong md5sum for %s" % tarinfo.name)
- kwargs["mtime"] = 07606136617
+ kwargs["mtime"] = 0o7606136617
kwargs["uid"] = 1000
kwargs["gid"] = 100
if "old-v7" not in tarinfo.name:
@@ -979,7 +979,7 @@
# uid > 8 digits
tarinfo = tarfile.TarInfo("name")
- tarinfo.uid = 010000000
+ tarinfo.uid = 0o10000000
self.assertRaises(ValueError, tarinfo.tobuf, tarfile.USTAR_FORMAT)
def test_gnu_limits(self):
@@ -992,7 +992,7 @@
# uid >= 256 ** 7
tarinfo = tarfile.TarInfo("name")
- tarinfo.uid = 04000000000000000000
+ tarinfo.uid = 0o4000000000000000000
self.assertRaises(ValueError, tarinfo.tobuf, tarfile.GNU_FORMAT)
def test_pax_limits(self):
@@ -1004,7 +1004,7 @@
tarinfo.tobuf(tarfile.PAX_FORMAT)
tarinfo = tarfile.TarInfo("name")
- tarinfo.uid = 04000000000000000000
+ tarinfo.uid = 0o4000000000000000000
tarinfo.tobuf(tarfile.PAX_FORMAT)
Modified: python/branches/cpy_merge/Lib/test/test_tempfile.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_tempfile.py (original)
+++ python/branches/cpy_merge/Lib/test/test_tempfile.py Thu Jun 14 21:06:29 2007
@@ -264,7 +264,7 @@
file = self.do_create()
mode = stat.S_IMODE(os.stat(file.name).st_mode)
- expected = 0600
+ expected = 0o600
if sys.platform in ('win32', 'os2emx', 'mac'):
# There's no distinction among 'user', 'group' and 'world';
# replicate the 'user' bits.
@@ -482,8 +482,8 @@
dir = self.do_create()
try:
mode = stat.S_IMODE(os.stat(dir).st_mode)
- mode &= 0777 # Mask off sticky bits inherited from /tmp
- expected = 0700
+ mode &= 0o777 # Mask off sticky bits inherited from /tmp
+ expected = 0o700
if sys.platform in ('win32', 'os2emx', 'mac'):
# There's no distinction among 'user', 'group' and 'world';
# replicate the 'user' bits.
@@ -517,7 +517,7 @@
self.name = tempfile.mktemp(dir=dir, prefix=pre, suffix=suf)
# Create the file. This will raise an exception if it's
# mysteriously appeared in the meanwhile.
- os.close(os.open(self.name, self._bflags, 0600))
+ os.close(os.open(self.name, self._bflags, 0o600))
def __del__(self):
self._unlink(self.name)
Modified: python/branches/cpy_merge/Lib/test/test_threading.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_threading.py (original)
+++ python/branches/cpy_merge/Lib/test/test_threading.py Thu Jun 14 21:06:29 2007
@@ -3,6 +3,7 @@
import test.test_support
from test.test_support import verbose
import random
+import sys
import threading
import thread
import time
@@ -201,8 +202,47 @@
t.join()
# else the thread is still running, and we have no way to kill it
+class ThreadingExceptionTests(unittest.TestCase):
+ # A RuntimeError should be raised if Thread.start() is called
+ # multiple times.
+ def test_start_thread_again(self):
+ thread = threading.Thread()
+ thread.start()
+ self.assertRaises(RuntimeError, thread.start)
+
+ def test_releasing_unacquired_rlock(self):
+ rlock = threading.RLock()
+ self.assertRaises(RuntimeError, rlock.release)
+
+ def test_waiting_on_unacquired_condition(self):
+ cond = threading.Condition()
+ self.assertRaises(RuntimeError, cond.wait)
+
+ def test_notify_on_unacquired_condition(self):
+ cond = threading.Condition()
+ self.assertRaises(RuntimeError, cond.notify)
+
+ def test_semaphore_with_negative_value(self):
+ self.assertRaises(ValueError, threading.Semaphore, value = -1)
+ self.assertRaises(ValueError, threading.Semaphore, value = -sys.maxint)
+
+ def test_joining_current_thread(self):
+ currentThread = threading.currentThread()
+ self.assertRaises(RuntimeError, currentThread.join);
+
+ def test_joining_inactive_thread(self):
+ thread = threading.Thread()
+ self.assertRaises(RuntimeError, thread.join)
+
+ def test_daemonize_active_thread(self):
+ thread = threading.Thread()
+ thread.start()
+ self.assertRaises(RuntimeError, thread.setDaemon, True)
+
+
def test_main():
- test.test_support.run_unittest(ThreadTests)
+ test.test_support.run_unittest(ThreadTests,
+ ThreadingExceptionTests)
if __name__ == "__main__":
test_main()
Modified: python/branches/cpy_merge/Lib/test/test_tuple.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_tuple.py (original)
+++ python/branches/cpy_merge/Lib/test/test_tuple.py Thu Jun 14 21:06:29 2007
@@ -5,30 +5,30 @@
type2test = tuple
def test_constructors(self):
- super(TupleTest, self).test_len()
+ super().test_len()
# calling built-in types without argument must return empty
self.assertEqual(tuple(), ())
def test_truth(self):
- super(TupleTest, self).test_truth()
+ super().test_truth()
self.assert_(not ())
self.assert_((42, ))
def test_len(self):
- super(TupleTest, self).test_len()
+ super().test_len()
self.assertEqual(len(()), 0)
self.assertEqual(len((0,)), 1)
self.assertEqual(len((0, 1, 2)), 3)
def test_iadd(self):
- super(TupleTest, self).test_iadd()
+ super().test_iadd()
u = (0, 1)
u2 = u
u += (2, 3)
self.assert_(u is not u2)
def test_imul(self):
- super(TupleTest, self).test_imul()
+ super().test_imul()
u = (0, 1)
u2 = u
u *= 3
Modified: python/branches/cpy_merge/Lib/test/test_unicode.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_unicode.py (original)
+++ python/branches/cpy_merge/Lib/test/test_unicode.py Thu Jun 14 21:06:29 2007
@@ -6,7 +6,7 @@
(c) Copyright CNRI, All Rights Reserved. NO WARRANTY.
"""#"
-import unittest, sys, codecs, new
+import unittest, sys, struct, codecs, new
from test import test_support, string_tests
# Error handling (bad decoder return)
@@ -825,8 +825,13 @@
self.assertEqual(repr(s1()), '\\n')
self.assertEqual(repr(s2()), '\\n')
-
-
+ def test_expandtabs_overflows_gracefully(self):
+ # This test only affects 32-bit platforms because expandtabs can only take
+ # an int as the max value, not a 64-bit C long. If expandtabs is changed
+ # to take a 64-bit long, this test should apply to all platforms.
+ if sys.maxint > (1 << 32) or struct.calcsize('P') != 4:
+ return
+ self.assertRaises(OverflowError, u't\tt\t'.expandtabs, sys.maxint)
def test_main():
Modified: python/branches/cpy_merge/Lib/test/test_unicode_file.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_unicode_file.py (original)
+++ python/branches/cpy_merge/Lib/test/test_unicode_file.py Thu Jun 14 21:06:29 2007
@@ -48,7 +48,7 @@
self.failUnless(os.path.exists(os.path.abspath(filename)))
self.failUnless(os.path.isfile(os.path.abspath(filename)))
self.failUnless(os.access(os.path.abspath(filename), os.R_OK))
- os.chmod(filename, 0777)
+ os.chmod(filename, 0o777)
os.utime(filename, None)
os.utime(filename, (time.time(), time.time()))
# Copy/rename etc tests using the same filename
Modified: python/branches/cpy_merge/Lib/test/test_unittest.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_unittest.py (original)
+++ python/branches/cpy_merge/Lib/test/test_unittest.py Thu Jun 14 21:06:29 2007
@@ -16,23 +16,23 @@
class LoggingResult(unittest.TestResult):
def __init__(self, log):
self._events = log
- super(LoggingResult, self).__init__()
+ super().__init__()
def startTest(self, test):
self._events.append('startTest')
- super(LoggingResult, self).startTest(test)
+ super().startTest(test)
def stopTest(self, test):
self._events.append('stopTest')
- super(LoggingResult, self).stopTest(test)
+ super().stopTest(test)
def addFailure(self, *args):
self._events.append('addFailure')
- super(LoggingResult, self).addFailure(*args)
+ super().addFailure(*args)
def addError(self, *args):
self._events.append('addError')
- super(LoggingResult, self).addError(*args)
+ super().addError(*args)
class TestEquality(object):
# Check for a valid __eq__ implementation
Modified: python/branches/cpy_merge/Lib/test/test_urllib2.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_urllib2.py (original)
+++ python/branches/cpy_merge/Lib/test/test_urllib2.py Thu Jun 14 21:06:29 2007
@@ -544,7 +544,7 @@
class NullFTPHandler(urllib2.FTPHandler):
def __init__(self, data): self.data = data
- def connect_ftp(self, user, passwd, host, port, dirs):
+ def connect_ftp(self, user, passwd, host, port, dirs, timeout=None):
self.user, self.passwd = user, passwd
self.host, self.port = host, port
self.dirs = dirs
@@ -567,7 +567,9 @@
"localhost", ftplib.FTP_PORT, "A",
[], "baz.gif", None), # XXX really this should guess image/gif
]:
- r = h.ftp_open(Request(url))
+ req = Request(url)
+ req.timeout = None
+ r = h.ftp_open(req)
# ftp authentication not yet implemented by FTPHandler
self.assert_(h.user == h.passwd == "")
self.assertEqual(h.host, socket.gethostbyname(host))
@@ -682,8 +684,9 @@
self.req_headers = []
self.data = None
self.raise_on_endheaders = False
- def __call__(self, host):
+ def __call__(self, host, timeout=None):
self.host = host
+ self.timeout = timeout
return self
def set_debuglevel(self, level):
self.level = level
@@ -706,6 +709,7 @@
url = "http://example.com/"
for method, data in [("GET", None), ("POST", "blah")]:
req = Request(url, data, {"Foo": "bar"})
+ req.timeout = None
req.add_unredirected_header("Spam", "eggs")
http = MockHTTPClass()
r = h.do_open(http, req)
Modified: python/branches/cpy_merge/Lib/test/test_urllib2net.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_urllib2net.py (original)
+++ python/branches/cpy_merge/Lib/test/test_urllib2net.py Thu Jun 14 21:06:29 2007
@@ -267,6 +267,49 @@
return handlers
+class TimeoutTest(unittest.TestCase):
+ def test_http_basic(self):
+ u = urllib2.urlopen("http://www.python.org")
+ self.assertTrue(u.fp._sock.fp._sock.gettimeout() is None)
+
+ def test_http_NoneWithdefault(self):
+ prev = socket.getdefaulttimeout()
+ socket.setdefaulttimeout(60)
+ try:
+ u = urllib2.urlopen("http://www.python.org", timeout=None)
+ self.assertEqual(u.fp._sock.fp._sock.gettimeout(), 60)
+ finally:
+ socket.setdefaulttimeout(prev)
+
+ def test_http_Value(self):
+ u = urllib2.urlopen("http://www.python.org", timeout=120)
+ self.assertEqual(u.fp._sock.fp._sock.gettimeout(), 120)
+
+ def test_http_NoneNodefault(self):
+ u = urllib2.urlopen("http://www.python.org", timeout=None)
+ self.assertTrue(u.fp._sock.fp._sock.gettimeout() is None)
+
+ def test_ftp_basic(self):
+ u = urllib2.urlopen("ftp://ftp.mirror.nl/pub/mirror/gnu/")
+ self.assertTrue(u.fp.fp._sock.gettimeout() is None)
+
+ def test_ftp_NoneWithdefault(self):
+ prev = socket.getdefaulttimeout()
+ socket.setdefaulttimeout(60)
+ try:
+ u = urllib2.urlopen("ftp://ftp.mirror.nl/pub/mirror/gnu/", timeout=None)
+ self.assertEqual(u.fp.fp._sock.gettimeout(), 60)
+ finally:
+ socket.setdefaulttimeout(prev)
+
+ def test_ftp_NoneNodefault(self):
+ u = urllib2.urlopen("ftp://ftp.mirror.nl/pub/mirror/gnu/", timeout=None)
+ self.assertTrue(u.fp.fp._sock.gettimeout() is None)
+
+ def test_ftp_Value(self):
+ u = urllib2.urlopen("ftp://ftp.mirror.nl/pub/mirror/gnu/", timeout=60)
+ self.assertEqual(u.fp.fp._sock.gettimeout(), 60)
+
def test_main():
test_support.requires("network")
@@ -275,6 +318,7 @@
AuthTests,
OtherNetworkTests,
CloseSocketTest,
+ TimeoutTest,
)
if __name__ == "__main__":
Modified: python/branches/cpy_merge/Lib/test/test_userlist.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_userlist.py (original)
+++ python/branches/cpy_merge/Lib/test/test_userlist.py Thu Jun 14 21:06:29 2007
@@ -8,7 +8,7 @@
type2test = UserList
def test_getslice(self):
- super(UserListTest, self).test_getslice()
+ super().test_getslice()
l = [0, 1, 2, 3, 4]
u = self.type2test(l)
for i in range(-3, 6):
@@ -30,7 +30,7 @@
self.assertEqual(u2, list("spameggs"))
def test_iadd(self):
- super(UserListTest, self).test_iadd()
+ super().test_iadd()
u = [0, 1]
u += UserList([0, 1])
self.assertEqual(u, [0, 1, 0, 1])
Modified: python/branches/cpy_merge/Lib/test/test_uu.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_uu.py (original)
+++ python/branches/cpy_merge/Lib/test/test_uu.py Thu Jun 14 21:06:29 2007
@@ -24,21 +24,21 @@
inp = cStringIO.StringIO(plaintext)
out = cStringIO.StringIO()
uu.encode(inp, out, "t1")
- self.assertEqual(out.getvalue(), encodedtextwrapped % (0666, "t1"))
+ self.assertEqual(out.getvalue(), encodedtextwrapped % (0o666, "t1"))
inp = cStringIO.StringIO(plaintext)
out = cStringIO.StringIO()
- uu.encode(inp, out, "t1", 0644)
- self.assertEqual(out.getvalue(), encodedtextwrapped % (0644, "t1"))
+ uu.encode(inp, out, "t1", 0o644)
+ self.assertEqual(out.getvalue(), encodedtextwrapped % (0o644, "t1"))
def test_decode(self):
- inp = cStringIO.StringIO(encodedtextwrapped % (0666, "t1"))
+ inp = cStringIO.StringIO(encodedtextwrapped % (0o666, "t1"))
out = cStringIO.StringIO()
uu.decode(inp, out)
self.assertEqual(out.getvalue(), plaintext)
inp = cStringIO.StringIO(
"UUencoded files may contain many lines,\n" +
"even some that have 'begin' in them.\n" +
- encodedtextwrapped % (0666, "t1")
+ encodedtextwrapped % (0o666, "t1")
)
out = cStringIO.StringIO()
uu.decode(inp, out)
@@ -75,14 +75,14 @@
def test_encode(self):
sys.stdin = cStringIO.StringIO(plaintext)
sys.stdout = cStringIO.StringIO()
- uu.encode("-", "-", "t1", 0666)
+ uu.encode("-", "-", "t1", 0o666)
self.assertEqual(
sys.stdout.getvalue(),
- encodedtextwrapped % (0666, "t1")
+ encodedtextwrapped % (0o666, "t1")
)
def test_decode(self):
- sys.stdin = cStringIO.StringIO(encodedtextwrapped % (0666, "t1"))
+ sys.stdin = cStringIO.StringIO(encodedtextwrapped % (0o666, "t1"))
sys.stdout = cStringIO.StringIO()
uu.decode("-", "-")
self.assertEqual(sys.stdout.getvalue(), plaintext)
@@ -120,21 +120,21 @@
fin = open(self.tmpin, 'rb')
fout = open(self.tmpout, 'w')
- uu.encode(fin, fout, self.tmpin, mode=0644)
+ uu.encode(fin, fout, self.tmpin, mode=0o644)
fin.close()
fout.close()
fout = open(self.tmpout, 'r')
s = fout.read()
fout.close()
- self.assertEqual(s, encodedtextwrapped % (0644, self.tmpin))
+ self.assertEqual(s, encodedtextwrapped % (0o644, self.tmpin))
# in_file and out_file as filenames
- uu.encode(self.tmpin, self.tmpout, self.tmpin, mode=0644)
+ uu.encode(self.tmpin, self.tmpout, self.tmpin, mode=0o644)
fout = open(self.tmpout, 'r')
s = fout.read()
fout.close()
- self.assertEqual(s, encodedtextwrapped % (0644, self.tmpin))
+ self.assertEqual(s, encodedtextwrapped % (0o644, self.tmpin))
finally:
self._kill(fin)
@@ -143,7 +143,7 @@
def test_decode(self):
try:
f = open(self.tmpin, 'w')
- f.write(encodedtextwrapped % (0644, self.tmpout))
+ f.write(encodedtextwrapped % (0o644, self.tmpout))
f.close()
f = open(self.tmpin, 'r')
@@ -161,7 +161,7 @@
def test_decodetwice(self):
# Verify that decode() will refuse to overwrite an existing file
try:
- f = cStringIO.StringIO(encodedtextwrapped % (0644, self.tmpout))
+ f = cStringIO.StringIO(encodedtextwrapped % (0o644, self.tmpout))
f = open(self.tmpin, 'r')
uu.decode(f)
Modified: python/branches/cpy_merge/Lib/test/test_weakref.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_weakref.py (original)
+++ python/branches/cpy_merge/Lib/test/test_weakref.py Thu Jun 14 21:06:29 2007
@@ -651,10 +651,10 @@
class MyRef(weakref.ref):
def __init__(self, ob, callback=None, value=42):
self.value = value
- super(MyRef, self).__init__(ob, callback)
+ super().__init__(ob, callback)
def __call__(self):
self.called = True
- return super(MyRef, self).__call__()
+ return super().__call__()
o = Object("foo")
mr = MyRef(o, value=24)
self.assert_(mr() is o)
@@ -1091,7 +1091,7 @@
>>> import weakref
>>> class ExtendedRef(weakref.ref):
... def __init__(self, ob, callback=None, **annotations):
-... super(ExtendedRef, self).__init__(ob, callback)
+... super().__init__(ob, callback)
... self.__counter = 0
... for k, v in annotations.items():
... setattr(self, k, v)
@@ -1099,7 +1099,7 @@
... '''Return a pair containing the referent and the number of
... times the reference has been called.
... '''
-... ob = super(ExtendedRef, self).__call__()
+... ob = super().__call__()
... if ob is not None:
... self.__counter += 1
... ob = (ob, self.__counter)
Modified: python/branches/cpy_merge/Lib/test/test_xmlrpc.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_xmlrpc.py (original)
+++ python/branches/cpy_merge/Lib/test/test_xmlrpc.py Thu Jun 14 21:06:29 2007
@@ -22,9 +22,9 @@
u'ukey\u4000': 'regular value',
'datetime1': xmlrpclib.DateTime('20050210T11:41:23'),
'datetime2': xmlrpclib.DateTime(
- (2005, 02, 10, 11, 41, 23, 0, 1, -1)),
+ (2005, 2, 10, 11, 41, 23, 0, 1, -1)),
'datetime3': xmlrpclib.DateTime(
- datetime.datetime(2005, 02, 10, 11, 41, 23)),
+ datetime.datetime(2005, 2, 10, 11, 41, 23)),
}]
class XMLRPCTestCase(unittest.TestCase):
@@ -38,7 +38,7 @@
# by the marshalling code. This can't be done via test_dump_load()
# since with use_datetime set to 1 the unmarshaller would create
# datetime objects for the 'datetime[123]' keys as well
- dt = datetime.datetime(2005, 02, 10, 11, 41, 23)
+ dt = datetime.datetime(2005, 2, 10, 11, 41, 23)
s = xmlrpclib.dumps((dt,))
(newdt,), m = xmlrpclib.loads(s, use_datetime=1)
self.assertEquals(newdt, dt)
@@ -51,7 +51,7 @@
# This checks that an unwrapped datetime.date object can be handled
# by the marshalling code. This can't be done via test_dump_load()
# since the unmarshaller produces a datetime object
- d = datetime.datetime(2005, 02, 10, 11, 41, 23).date()
+ d = datetime.datetime(2005, 2, 10, 11, 41, 23).date()
s = xmlrpclib.dumps((d,))
(newd,), m = xmlrpclib.loads(s, use_datetime=1)
self.assertEquals(newd.date(), d)
@@ -65,7 +65,7 @@
# This checks that an unwrapped datetime.time object can be handled
# by the marshalling code. This can't be done via test_dump_load()
# since the unmarshaller produces a datetime object
- t = datetime.datetime(2005, 02, 10, 11, 41, 23).time()
+ t = datetime.datetime(2005, 2, 10, 11, 41, 23).time()
s = xmlrpclib.dumps((t,))
(newt,), m = xmlrpclib.loads(s, use_datetime=1)
today = datetime.datetime.now().date().strftime("%Y%m%d")
Modified: python/branches/cpy_merge/Lib/test/test_zipimport.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/test_zipimport.py (original)
+++ python/branches/cpy_merge/Lib/test/test_zipimport.py Thu Jun 14 21:06:29 2007
@@ -364,7 +364,7 @@
finally:
# If we leave "the read-only bit" set on Windows, nothing can
# delete TESTMOD, and later tests suffer bogus failures.
- os.chmod(TESTMOD, 0666)
+ os.chmod(TESTMOD, 0o666)
test_support.unlink(TESTMOD)
def testNotZipFile(self):
Modified: python/branches/cpy_merge/Lib/test/tf_inherit_check.py
==============================================================================
--- python/branches/cpy_merge/Lib/test/tf_inherit_check.py (original)
+++ python/branches/cpy_merge/Lib/test/tf_inherit_check.py Thu Jun 14 21:06:29 2007
@@ -19,7 +19,7 @@
sys.stderr.write("fd %d is open in child" % fd)
sys.exit(1)
-except StandardError:
+except Exception:
if verbose:
raise
sys.exit(1)
Modified: python/branches/cpy_merge/Lib/test/tokenize_tests.txt
==============================================================================
--- python/branches/cpy_merge/Lib/test/tokenize_tests.txt (original)
+++ python/branches/cpy_merge/Lib/test/tokenize_tests.txt Thu Jun 14 21:06:29 2007
@@ -37,21 +37,21 @@
# Ordinary integers
0xff != 255
-0377 != 255
-2147483647 != 017777777777
--2147483647-1 != 020000000000
-037777777777 != -1
-0xffffffff != -1
+0o377 != 255
+2147483647 != 0o17777777777
+-2147483647-1 != 0o20000000000
+0o37777777777 != -1
+0xffffffff != -1; 0o37777777777 != -1; -0o1234567 == 0O001234567; 0b10101 == 0B00010101
# Long integers
-x = 0L
-x = 0l
-x = 0xffffffffffffffffL
-x = 0xffffffffffffffffl
-x = 077777777777777777L
-x = 077777777777777777l
-x = 123456789012345678901234567890L
-x = 123456789012345678901234567890l
+x = 0
+x = 0
+x = 0xffffffffffffffff
+x = 0xffffffffffffffff
+x = 0o77777777777777777
+x = 0B11101010111111111
+x = 123456789012345678901234567890
+x = 123456789012345678901234567890
# Floating-point numbers
x = 3.14
Modified: python/branches/cpy_merge/Lib/threading.py
==============================================================================
--- python/branches/cpy_merge/Lib/threading.py (original)
+++ python/branches/cpy_merge/Lib/threading.py Thu Jun 14 21:06:29 2007
@@ -111,8 +111,8 @@
__enter__ = acquire
def release(self):
- me = currentThread()
- assert self.__owner is me, "release() of un-acquire()d lock"
+ if self.__owner is not currentThread():
+ raise RuntimeError("cannot release un-aquired lock")
self.__count = count = self.__count - 1
if not count:
self.__owner = None
@@ -203,7 +203,8 @@
return True
def wait(self, timeout=None):
- assert self._is_owned(), "wait() of un-acquire()d lock"
+ if not self._is_owned():
+ raise RuntimeError("cannot wait on un-aquired lock")
waiter = _allocate_lock()
waiter.acquire()
self.__waiters.append(waiter)
@@ -244,7 +245,8 @@
self._acquire_restore(saved_state)
def notify(self, n=1):
- assert self._is_owned(), "notify() of un-acquire()d lock"
+ if not self._is_owned():
+ raise RuntimeError("cannot notify on un-aquired lock")
__waiters = self.__waiters
waiters = __waiters[:n]
if not waiters:
@@ -272,7 +274,8 @@
# After Tim Peters' semaphore class, but not quite the same (no maximum)
def __init__(self, value=1, verbose=None):
- assert value >= 0, "Semaphore initial value must be >= 0"
+ if value < 0:
+ raise ValueError("semaphore initial value must be >= 0")
_Verbose.__init__(self, verbose)
self.__cond = Condition(Lock())
self.__value = value
@@ -423,8 +426,10 @@
return "<%s(%s, %s)>" % (self.__class__.__name__, self.__name, status)
def start(self):
- assert self.__initialized, "Thread.__init__() not called"
- assert not self.__started, "thread already started"
+ if not self.__initialized:
+ raise RuntimeError("thread.__init__() not called")
+ if self.__started:
+ raise RuntimeError("thread already started")
if __debug__:
self._note("%s.start(): starting thread", self)
_active_limbo_lock.acquire()
@@ -544,9 +549,13 @@
_active_limbo_lock.release()
def join(self, timeout=None):
- assert self.__initialized, "Thread.__init__() not called"
- assert self.__started, "cannot join thread before it is started"
- assert self is not currentThread(), "cannot join current thread"
+ if not self.__initialized:
+ raise RuntimeError("Thread.__init__() not called")
+ if not self.__started:
+ raise RuntimeError("cannot join thread before it is started")
+ if self is currentThread():
+ raise RuntimeError("cannot join current thread")
+
if __debug__:
if not self.__stopped:
self._note("%s.join(): waiting until thread stops", self)
@@ -589,8 +598,10 @@
return self.__daemonic
def setDaemon(self, daemonic):
- assert self.__initialized, "Thread.__init__() not called"
- assert not self.__started, "cannot set daemon status of active thread"
+ if not self.__initialized:
+ raise RuntimeError("Thread.__init__() not called")
+ if self.__started:
+ raise RuntimeError("cannot set daemon status of active thread");
self.__daemonic = daemonic
# The timer class was contributed by Itamar Shtull-Trauring
Modified: python/branches/cpy_merge/Lib/tokenize.py
==============================================================================
--- python/branches/cpy_merge/Lib/tokenize.py (original)
+++ python/branches/cpy_merge/Lib/tokenize.py Thu Jun 14 21:06:29 2007
@@ -49,10 +49,11 @@
Ignore = Whitespace + any(r'\\\r?\n' + Whitespace) + maybe(Comment)
Name = r'[a-zA-Z_]\w*'
-Hexnumber = r'0[xX][\da-fA-F]*[lL]?'
-Octnumber = r'0[0-7]*[lL]?'
-Decnumber = r'[1-9]\d*[lL]?'
-Intnumber = group(Hexnumber, Octnumber, Decnumber)
+Hexnumber = r'0[xX][\da-fA-F]*'
+Binnumber = r'0[bB][01]*'
+Octnumber = r'0[oO][0-7]*'
+Decnumber = r'(?:0+|[1-9]\d*)'
+Intnumber = group(Hexnumber, Binnumber, Octnumber, Decnumber)
Exponent = r'[eE][-+]?\d+'
Pointfloat = group(r'\d+\.\d*', r'\.\d+') + maybe(Exponent)
Expfloat = r'\d+' + Exponent
Modified: python/branches/cpy_merge/Lib/types.py
==============================================================================
--- python/branches/cpy_merge/Lib/types.py (original)
+++ python/branches/cpy_merge/Lib/types.py Thu Jun 14 21:06:29 2007
@@ -50,7 +50,7 @@
class _C:
def _m(self): pass
-ClassType = type(_C)
+ClassType = type
UnboundMethodType = type(_C._m) # Same as MethodType
MethodType = type(_C()._m)
Modified: python/branches/cpy_merge/Lib/unittest.py
==============================================================================
--- python/branches/cpy_merge/Lib/unittest.py (original)
+++ python/branches/cpy_merge/Lib/unittest.py Thu Jun 14 21:06:29 2007
@@ -412,8 +412,7 @@
# sanity checks
if not hasattr(test, '__call__'):
raise TypeError("the test to add must be callable")
- if (isinstance(test, (type, types.ClassType)) and
- issubclass(test, (TestCase, TestSuite))):
+ if isinstance(test, type) and issubclass(test, (TestCase, TestSuite)):
raise TypeError("TestCases and TestSuites must be instantiated "
"before passing them to addTest()")
self._tests.append(test)
@@ -525,8 +524,7 @@
tests = []
for name in dir(module):
obj = getattr(module, name)
- if (isinstance(obj, (type, types.ClassType)) and
- issubclass(obj, TestCase)):
+ if isinstance(obj, type) and issubclass(obj, TestCase):
tests.append(self.loadTestsFromTestCase(obj))
return self.suiteClass(tests)
@@ -556,11 +554,10 @@
if type(obj) == types.ModuleType:
return self.loadTestsFromModule(obj)
- elif (isinstance(obj, (type, types.ClassType)) and
- issubclass(obj, TestCase)):
+ elif isinstance(obj, type) and issubclass(obj, TestCase):
return self.loadTestsFromTestCase(obj)
- elif (type(obj) == types.UnboundMethodType and
- isinstance(parent, (type, types.ClassType)) and
+ elif (isinstance(obj, types.UnboundMethodType) and
+ isinstance(parent, type) and
issubclass(parent, TestCase)):
return TestSuite([parent(obj.__name__)])
elif isinstance(obj, TestSuite):
@@ -816,7 +813,7 @@
self.module)
def runTests(self):
- if isinstance(self.testRunner, (type, types.ClassType)):
+ if isinstance(self.testRunner, type):
try:
testRunner = self.testRunner(verbosity=self.verbosity)
except TypeError:
Modified: python/branches/cpy_merge/Lib/urllib2.py
==============================================================================
--- python/branches/cpy_merge/Lib/urllib2.py (original)
+++ python/branches/cpy_merge/Lib/urllib2.py Thu Jun 14 21:06:29 2007
@@ -117,11 +117,11 @@
__version__ = sys.version[:3]
_opener = None
-def urlopen(url, data=None):
+def urlopen(url, data=None, timeout=None):
global _opener
if _opener is None:
_opener = build_opener()
- return _opener.open(url, data)
+ return _opener.open(url, data, timeout)
def install_opener(opener):
global _opener
@@ -355,7 +355,7 @@
if result is not None:
return result
- def open(self, fullurl, data=None):
+ def open(self, fullurl, data=None, timeout=None):
# accept a URL or a Request object
if isinstance(fullurl, basestring):
req = Request(fullurl, data)
@@ -364,6 +364,7 @@
if data is not None:
req.add_data(data)
+ req.timeout = timeout
protocol = req.get_type()
# pre-process request
@@ -431,9 +432,8 @@
If any of the handlers passed as arguments are subclasses of the
default handlers, the default handlers will not be used.
"""
- import types
def isclass(obj):
- return isinstance(obj, types.ClassType) or hasattr(obj, "__bases__")
+ return isinstance(obj, type) or hasattr(obj, "__bases__")
opener = OpenerDirector()
default_classes = [ProxyHandler, UnknownHandler, HTTPHandler,
@@ -948,7 +948,7 @@
respdig = KD(H(A1), "%s:%s" % (nonce, H(A2)))
else:
# XXX handle auth-int.
- pass
+ raise URLError("qop '%s' is not supported." % qop)
# XXX should the partial digests be encoded too?
@@ -1057,7 +1057,7 @@
if not host:
raise URLError('no host given')
- h = http_class(host) # will parse host:port
+ h = http_class(host, timeout=req.timeout) # will parse host:port
h.set_debuglevel(self._debuglevel)
headers = dict(req.headers)
@@ -1269,7 +1269,7 @@
if dirs and not dirs[0]:
dirs = dirs[1:]
try:
- fw = self.connect_ftp(user, passwd, host, port, dirs)
+ fw = self.connect_ftp(user, passwd, host, port, dirs, req.timeout)
type = file and 'I' or 'D'
for attr in attrs:
attr, value = splitvalue(attr)
@@ -1289,8 +1289,8 @@
except ftplib.all_errors as msg:
raise IOError, ('ftp error', msg), sys.exc_info()[2]
- def connect_ftp(self, user, passwd, host, port, dirs):
- fw = ftpwrapper(user, passwd, host, port, dirs)
+ def connect_ftp(self, user, passwd, host, port, dirs, timeout):
+ fw = ftpwrapper(user, passwd, host, port, dirs, timeout)
## fw.ftp.set_debuglevel(1)
return fw
@@ -1310,12 +1310,12 @@
def setMaxConns(self, m):
self.max_conns = m
- def connect_ftp(self, user, passwd, host, port, dirs):
- key = user, host, port, '/'.join(dirs)
+ def connect_ftp(self, user, passwd, host, port, dirs, timeout):
+ key = user, host, port, '/'.join(dirs), timeout
if key in self.cache:
self.timeout[key] = time.time() + self.delay
else:
- self.cache[key] = ftpwrapper(user, passwd, host, port, dirs)
+ self.cache[key] = ftpwrapper(user, passwd, host, port, dirs, timeout)
self.timeout[key] = time.time() + self.delay
self.check_cache()
return self.cache[key]
Modified: python/branches/cpy_merge/Lib/uu.py
==============================================================================
--- python/branches/cpy_merge/Lib/uu.py (original)
+++ python/branches/cpy_merge/Lib/uu.py Thu Jun 14 21:06:29 2007
@@ -68,11 +68,11 @@
if name is None:
name = '-'
if mode is None:
- mode = 0666
+ mode = 0o666
#
# Write the data
#
- out_file.write('begin %o %s\n' % ((mode&0777),name))
+ out_file.write('begin %o %s\n' % ((mode & 0o777),name))
data = in_file.read(45)
while len(data) > 0:
out_file.write(binascii.b2a_uu(data))
Modified: python/branches/cpy_merge/Lib/warnings.py
==============================================================================
--- python/branches/cpy_merge/Lib/warnings.py (original)
+++ python/branches/cpy_merge/Lib/warnings.py Thu Jun 14 21:06:29 2007
@@ -3,7 +3,7 @@
# Note: function level imports should *not* be used
# in this module as it may cause import lock deadlock.
# See bug 683658.
-import sys, types
+import sys
import linecache
__all__ = ["warn", "showwarning", "formatwarning", "filterwarnings",
@@ -151,8 +151,7 @@
assert action in ("error", "ignore", "always", "default", "module",
"once"), "invalid action: %r" % (action,)
assert isinstance(message, basestring), "message must be a string"
- assert isinstance(category, (type, types.ClassType)), \
- "category must be a class"
+ assert isinstance(category, type), "category must be a class"
assert issubclass(category, Warning), "category must be a Warning subclass"
assert isinstance(module, basestring), "module must be a string"
assert isinstance(lineno, int) and lineno >= 0, \
Modified: python/branches/cpy_merge/Lib/weakref.py
==============================================================================
--- python/branches/cpy_merge/Lib/weakref.py (original)
+++ python/branches/cpy_merge/Lib/weakref.py Thu Jun 14 21:06:29 2007
@@ -204,7 +204,7 @@
return self
def __init__(self, ob, callback, key):
- super(KeyedRef, self).__init__(ob, callback)
+ super().__init__(ob, callback)
class WeakKeyDictionary(UserDict.UserDict):
Modified: python/branches/cpy_merge/Lib/wsgiref/headers.py
==============================================================================
--- python/branches/cpy_merge/Lib/wsgiref/headers.py (original)
+++ python/branches/cpy_merge/Lib/wsgiref/headers.py Thu Jun 14 21:06:29 2007
@@ -5,8 +5,6 @@
written by Barry Warsaw.
"""
-from types import ListType, TupleType
-
# Regular expression that matches `special' characters in parameters, the
# existance of which force quoting of the parameter value.
import re
@@ -44,7 +42,7 @@
"""Manage a collection of HTTP response headers"""
def __init__(self,headers):
- if type(headers) is not ListType:
+ if not isinstance(headers, list):
raise TypeError("Headers must be a list of name/value tuples")
self._headers = headers
Modified: python/branches/cpy_merge/Lib/wsgiref/validate.py
==============================================================================
--- python/branches/cpy_merge/Lib/wsgiref/validate.py (original)
+++ python/branches/cpy_merge/Lib/wsgiref/validate.py Thu Jun 14 21:06:29 2007
@@ -113,7 +113,6 @@
import re
import sys
-from types import DictType, StringType, TupleType, ListType
import warnings
header_re = re.compile(r'^[a-zA-Z][a-zA-Z0-9\-_]*$')
@@ -191,20 +190,20 @@
def read(self, *args):
assert_(len(args) <= 1)
v = self.input.read(*args)
- assert_(type(v) is type(""))
+ assert_(isinstance(v, str))
return v
def readline(self):
v = self.input.readline()
- assert_(type(v) is type(""))
+ assert_(isinstance(v, str))
return v
def readlines(self, *args):
assert_(len(args) <= 1)
lines = self.input.readlines(*args)
- assert_(type(lines) is type([]))
+ assert_(isinstance(lines, list))
for line in lines:
- assert_(type(line) is type(""))
+ assert_(isinstance(line, str))
return lines
def __iter__(self):
@@ -223,7 +222,7 @@
self.errors = wsgi_errors
def write(self, s):
- assert_(type(s) is type(""))
+ assert_(isinstance(s, str))
self.errors.write(s)
def flush(self):
@@ -242,7 +241,7 @@
self.writer = wsgi_writer
def __call__(self, s):
- assert_(type(s) is type(""))
+ assert_(isinstance(s, str))
self.writer(s)
class PartialIteratorWrapper:
@@ -288,7 +287,7 @@
"Iterator garbage collected without being closed")
def check_environ(environ):
- assert_(type(environ) is DictType,
+ assert_(isinstance(environ, dict),
"Environment is not of the right type: %r (environment: %r)"
% (type(environ), environ))
@@ -315,11 +314,11 @@
if '.' in key:
# Extension, we don't care about its type
continue
- assert_(type(environ[key]) is StringType,
+ assert_(isinstance(environ[key], str),
"Environmental variable %s is not a string: %r (value: %r)"
% (key, type(environ[key]), environ[key]))
- assert_(type(environ['wsgi.version']) is TupleType,
+ assert_(isinstance(environ['wsgi.version'], tuple),
"wsgi.version should be a tuple (%r)" % (environ['wsgi.version'],))
assert_(environ['wsgi.url_scheme'] in ('http', 'https'),
"wsgi.url_scheme unknown: %r" % environ['wsgi.url_scheme'])
@@ -365,7 +364,7 @@
% (wsgi_errors, attr))
def check_status(status):
- assert_(type(status) is StringType,
+ assert_(isinstance(status, str),
"Status must be a string (not %r)" % status)
# Implicitly check that we can turn it into an integer:
status_code = status.split(None, 1)[0]
@@ -380,12 +379,12 @@
% status, WSGIWarning)
def check_headers(headers):
- assert_(type(headers) is ListType,
+ assert_(isinstance(headers, list),
"Headers (%r) must be of type list: %r"
% (headers, type(headers)))
header_names = {}
for item in headers:
- assert_(type(item) is TupleType,
+ assert_(isinstance(item, tuple),
"Individual headers (%r) must be of type tuple: %r"
% (item, type(item)))
assert_(len(item) == 2)
@@ -419,7 +418,7 @@
assert_(0, "No Content-Type header found in headers (%s)" % headers)
def check_exc_info(exc_info):
- assert_(exc_info is None or type(exc_info) is type(()),
+ assert_(exc_info is None or isinstance(exc_info, tuple),
"exc_info (%r) is not a tuple: %r" % (exc_info, type(exc_info)))
# More exc_info checks?
Modified: python/branches/cpy_merge/Lib/xml/dom/domreg.py
==============================================================================
--- python/branches/cpy_merge/Lib/xml/dom/domreg.py (original)
+++ python/branches/cpy_merge/Lib/xml/dom/domreg.py Thu Jun 14 21:06:29 2007
@@ -72,7 +72,7 @@
for creator in well_known_implementations.keys():
try:
dom = getDOMImplementation(name = creator)
- except StandardError: # typically ImportError, or AttributeError
+ except Exception: # typically ImportError, or AttributeError
continue
if _good_enough(dom, features):
return dom
Modified: python/branches/cpy_merge/Lib/xml/sax/saxutils.py
==============================================================================
--- python/branches/cpy_merge/Lib/xml/sax/saxutils.py (original)
+++ python/branches/cpy_merge/Lib/xml/sax/saxutils.py Thu Jun 14 21:06:29 2007
@@ -3,15 +3,10 @@
convenience of application and driver writers.
"""
-import os, urlparse, urllib, types
+import os, urlparse, urllib
from . import handler
from . import xmlreader
-try:
- _StringTypes = [types.StringType, types.UnicodeType]
-except AttributeError:
- _StringTypes = [types.StringType]
-
# See whether the xmlcharrefreplace error handler is
# supported
try:
@@ -277,7 +272,7 @@
"""This function takes an InputSource and an optional base URL and
returns a fully resolved InputSource object ready for reading."""
- if type(source) in _StringTypes:
+ if isinstance(source, basestring):
source = xmlreader.InputSource(source)
elif hasattr(source, "read"):
f = source
Modified: python/branches/cpy_merge/Lib/xmlrpclib.py
==============================================================================
--- python/branches/cpy_merge/Lib/xmlrpclib.py (original)
+++ python/branches/cpy_merge/Lib/xmlrpclib.py Thu Jun 14 21:06:29 2007
@@ -138,8 +138,6 @@
import re, time, operator
-from types import *
-
# --------------------------------------------------------------------
# Internal stuff
@@ -304,7 +302,7 @@
"""
def __init__(self, value=0):
- if not isinstance(value, StringType):
+ if not isinstance(value, str):
if datetime and isinstance(value, datetime.datetime):
self.value = value.strftime("%Y%m%dT%H:%M:%S")
return
@@ -315,7 +313,7 @@
today = datetime.datetime.now().strftime("%Y%m%d")
self.value = value.strftime(today+"T%H:%M:%S")
return
- if not isinstance(value, (TupleType, time.struct_time)):
+ if not isinstance(value, (tuple, time.struct_time)):
if value == 0:
value = time.time()
value = time.localtime(value)
@@ -592,7 +590,7 @@
if not self.allow_none:
raise TypeError, "cannot marshal None unless allow_none is enabled"
write("<value><nil/></value>")
- dispatch[NoneType] = dump_nil
+ dispatch[type(None)] = dump_nil
def dump_int(self, value, write):
# in case ints are > 32 bits
@@ -601,7 +599,7 @@
write("<value><int>")
write(str(value))
write("</int></value>\n")
- dispatch[IntType] = dump_int
+ #dispatch[int] = dump_int
if _bool_is_builtin:
def dump_bool(self, value, write):
@@ -616,19 +614,19 @@
write("<value><int>")
write(str(int(value)))
write("</int></value>\n")
- dispatch[LongType] = dump_long
+ dispatch[int] = dump_long
def dump_double(self, value, write):
write("<value><double>")
write(repr(value))
write("</double></value>\n")
- dispatch[FloatType] = dump_double
+ dispatch[float] = dump_double
def dump_string(self, value, write, escape=escape):
write("<value><string>")
write(escape(value))
write("</string></value>\n")
- dispatch[StringType] = dump_string
+ dispatch[str] = dump_string
if unicode:
def dump_unicode(self, value, write, escape=escape):
@@ -636,7 +634,7 @@
write("<value><string>")
write(escape(value))
write("</string></value>\n")
- dispatch[UnicodeType] = dump_unicode
+ dispatch[unicode] = dump_unicode
def dump_array(self, value, write):
i = id(value)
@@ -649,8 +647,8 @@
dump(v, write)
write("</data></array></value>\n")
del self.memo[i]
- dispatch[TupleType] = dump_array
- dispatch[ListType] = dump_array
+ dispatch[tuple] = dump_array
+ dispatch[list] = dump_array
def dump_struct(self, value, write, escape=escape):
i = id(value)
@@ -661,8 +659,8 @@
write("<value><struct>\n")
for k, v in value.items():
write("<member>\n")
- if type(k) is not StringType:
- if unicode and type(k) is UnicodeType:
+ if not isinstance(k, str):
+ if unicode and isinstance(k, unicode):
k = k.encode(self.encoding)
else:
raise TypeError, "dictionary key must be string"
@@ -671,7 +669,7 @@
write("</member>\n")
write("</struct></value>\n")
del self.memo[i]
- dispatch[DictType] = dump_struct
+ dispatch[dict] = dump_struct
if datetime:
def dump_datetime(self, value, write):
@@ -1019,12 +1017,10 @@
where necessary.
"""
- assert isinstance(params, TupleType) or isinstance(params, Fault),\
- "argument must be tuple or Fault instance"
-
+ assert isinstance(params, (tuple, Fault)), "argument must be tuple or Fault instance"
if isinstance(params, Fault):
methodresponse = 1
- elif methodresponse and isinstance(params, TupleType):
+ elif methodresponse and isinstance(params, tuple):
assert len(params) == 1, "response tuple must be a singleton"
if not encoding:
@@ -1045,7 +1041,7 @@
# standard XML-RPC wrappings
if methodname:
# a method call
- if not isinstance(methodname, StringType):
+ if not isinstance(methodname, str):
methodname = methodname.encode(encoding)
data = (
xmlheader,
@@ -1180,7 +1176,7 @@
def get_host_info(self, host):
x509 = {}
- if isinstance(host, TupleType):
+ if isinstance(host, tuple):
host, x509 = host
import urllib
@@ -1230,7 +1226,7 @@
host, extra_headers, x509 = self.get_host_info(host)
connection.putheader("Host", host)
if extra_headers:
- if isinstance(extra_headers, DictType):
+ if isinstance(extra_headers, dict):
extra_headers = extra_headers.items()
for key, value in extra_headers:
connection.putheader(key, value)
Modified: python/branches/cpy_merge/Misc/ACKS
==============================================================================
--- python/branches/cpy_merge/Misc/ACKS (original)
+++ python/branches/cpy_merge/Misc/ACKS Thu Jun 14 21:06:29 2007
@@ -159,6 +159,7 @@
Vincent Delft
Erik Demaine
Roger Dev
+Raghuram Devarakonda
Toby Dickenson
Mark Dickinson
Yves Dionne
@@ -660,6 +661,7 @@
Roger Upole
Michael Urman
Hector Urtubia
+Atul Varma
Dmitry Vasiliev
Frank Vercruesse
Mike Verdone
Modified: python/branches/cpy_merge/Misc/NEWS
==============================================================================
--- python/branches/cpy_merge/Misc/NEWS (original)
+++ python/branches/cpy_merge/Misc/NEWS Thu Jun 14 21:06:29 2007
@@ -26,6 +26,13 @@
Core and Builtins
-----------------
+- Removed the __oct__ and __hex__ special methods and added a bin()
+ builtin function.
+
+- PEP 3127: octal literals now start with "0o". Old-style octal literals
+ are invalid. There are binary literals with a prefix of "0b".
+ This also affects int(x, 0).
+
- None, True, False are now keywords.
- PEP 3119: isinstance() and issubclass() can be overridden.
Modified: python/branches/cpy_merge/Misc/Vim/python.vim
==============================================================================
--- python/branches/cpy_merge/Misc/Vim/python.vim (original)
+++ python/branches/cpy_merge/Misc/Vim/python.vim Thu Jun 14 21:06:29 2007
@@ -88,7 +88,7 @@
syn keyword pythonException MemoryError NameError NotImplementedError
syn keyword pythonException OSError OverflowError PendingDeprecationWarning
syn keyword pythonException ReferenceError RuntimeError RuntimeWarning
- syn keyword pythonException StandardError StopIteration SyntaxError
+ syn keyword pythonException StopIteration SyntaxError
syn keyword pythonException SyntaxWarning SystemError SystemExit TabError
syn keyword pythonException TypeError UnboundLocalError UnicodeDecodeError
syn keyword pythonException UnicodeEncodeError UnicodeError
Modified: python/branches/cpy_merge/Misc/build.sh
==============================================================================
--- python/branches/cpy_merge/Misc/build.sh (original)
+++ python/branches/cpy_merge/Misc/build.sh Thu Jun 14 21:06:29 2007
@@ -70,7 +70,7 @@
LEAKY_TESTS="test_(cmd_line|socket)"
# These tests always fail, so skip them so we don't get false positives.
-_ALWAYS_SKIP="test_compiler test_transformer"
+_ALWAYS_SKIP=""
ALWAYS_SKIP="-x $_ALWAYS_SKIP"
# Skip these tests altogether when looking for leaks. These tests
Modified: python/branches/cpy_merge/Misc/cheatsheet
==============================================================================
--- python/branches/cpy_merge/Misc/cheatsheet (original)
+++ python/branches/cpy_merge/Misc/cheatsheet Thu Jun 14 21:06:29 2007
@@ -779,8 +779,8 @@
class, the class name is printed, then a colon and a space, and
finally the instance converted to a string using the built-in function
str().
-All built-in exception classes derives from StandardError, itself
-derived from Exception.
+All built-in exception classes derives from Exception, itself
+derived from BaseException.
Name Space Statements
@@ -1051,9 +1051,6 @@
On 'sys.exit()'
StopIteration
Signal the end from iterator.__next__()
- StandardError
- Base class for all built-in exceptions; derived from Exception
- root class.
ArithmeticError
Base class for OverflowError, ZeroDivisionError,
FloatingPointError
Modified: python/branches/cpy_merge/Misc/python-mode.el
==============================================================================
--- python/branches/cpy_merge/Misc/python-mode.el (original)
+++ python/branches/cpy_merge/Misc/python-mode.el Thu Jun 14 21:06:29 2007
@@ -369,7 +369,7 @@
"NotImplementedError" "OSError" "OverflowError"
"OverflowWarning" "PendingDeprecationWarning"
"ReferenceError" "RuntimeError" "RuntimeWarning"
- "StandardError" "StopIteration" "SyntaxError"
+ "StopIteration" "SyntaxError"
"SyntaxWarning" "SystemError" "SystemExit"
"TabError" "True" "TypeError" "UnboundLocalError"
"UnicodeDecodeError" "UnicodeEncodeError"
Modified: python/branches/cpy_merge/Misc/valgrind-python.supp
==============================================================================
--- python/branches/cpy_merge/Misc/valgrind-python.supp (original)
+++ python/branches/cpy_merge/Misc/valgrind-python.supp Thu Jun 14 21:06:29 2007
@@ -134,6 +134,15 @@
###
{
+ Generic ubuntu ld problems
+ Memcheck:Addr8
+ obj:/lib/ld-2.4.so
+ obj:/lib/ld-2.4.so
+ obj:/lib/ld-2.4.so
+ obj:/lib/ld-2.4.so
+}
+
+{
Generic gentoo ld problems
Memcheck:Cond
obj:/lib/ld-2.3.4.so
Modified: python/branches/cpy_merge/Modules/_bsddb.c
==============================================================================
--- python/branches/cpy_merge/Modules/_bsddb.c (original)
+++ python/branches/cpy_merge/Modules/_bsddb.c Thu Jun 14 21:06:29 2007
@@ -1713,6 +1713,7 @@
PyObject* dataobj;
PyObject* retval = NULL;
DBT key, data;
+ void *orig_data;
DB_TXN *txn = NULL;
static char* kwnames[] = { "key", "data", "txn", "flags", NULL };
@@ -1724,7 +1725,6 @@
CHECK_DB_NOT_CLOSED(self);
if (!make_key_dbt(self, keyobj, &key, NULL))
return NULL;
- CLEAR_DBT(data);
if ( !make_dbt(dataobj, &data) ||
!checkTxnObj(txnobj, &txn) )
{
@@ -1733,13 +1733,12 @@
}
flags |= DB_GET_BOTH;
+ orig_data = data.data;
if (CHECK_DBFLAG(self, DB_THREAD)) {
/* Tell BerkeleyDB to malloc the return value (thread safe) */
+ /* XXX(nnorwitz): At least 4.4.20 and 4.5.20 require this flag. */
data.flags = DB_DBT_MALLOC;
- /* TODO: Is this flag needed? We're passing a data object that should
- match what's in the DB, so there should be no need to malloc.
- We run the risk of freeing something twice! Check this. */
}
MYDB_BEGIN_ALLOW_THREADS;
@@ -1753,8 +1752,13 @@
retval = Py_None;
}
else if (!err) {
+ /* XXX(nnorwitz): can we do: retval = dataobj; Py_INCREF(retval); */
retval = PyString_FromStringAndSize((char*)data.data, data.size);
- FREE_DBT(data); /* Only if retrieval was successful */
+
+ /* Even though the flags require DB_DBT_MALLOC, data is not always
+ allocated. 4.4: allocated, 4.5: *not* allocated. :-( */
+ if (data.data != orig_data)
+ FREE_DBT(data);
}
FREE_DBT(key);
Modified: python/branches/cpy_merge/Modules/_ctypes/_ctypes.c
==============================================================================
--- python/branches/cpy_merge/Modules/_ctypes/_ctypes.c (original)
+++ python/branches/cpy_merge/Modules/_ctypes/_ctypes.c Thu Jun 14 21:06:29 2007
@@ -789,7 +789,7 @@
CharArray_set_value(CDataObject *self, PyObject *value)
{
char *ptr;
- int size;
+ Py_ssize_t size;
if (PyUnicode_Check(value)) {
value = PyUnicode_AsEncodedString(value,
@@ -844,7 +844,7 @@
static int
WCharArray_set_value(CDataObject *self, PyObject *value)
{
- int result = 0;
+ Py_ssize_t result = 0;
if (PyString_Check(value)) {
value = PyUnicode_FromEncodedObject(value,
@@ -868,14 +868,12 @@
result = PyUnicode_AsWideChar((PyUnicodeObject *)value,
(wchar_t *)self->b_ptr,
self->b_size/sizeof(wchar_t));
- if (result >= 0 && (unsigned)result < self->b_size/sizeof(wchar_t))
+ if (result >= 0 && (size_t)result < self->b_size/sizeof(wchar_t))
((wchar_t *)self->b_ptr)[result] = (wchar_t)0;
- if (result > 0)
- result = 0;
done:
Py_DECREF(value);
- return result;
+ return result >= 0 ? 0 : -1;
}
static PyGetSetDef WCharArray_getsets[] = {
@@ -966,7 +964,7 @@
PyObject *typedict;
int length;
- int itemsize, itemalign;
+ Py_ssize_t itemsize, itemalign;
typedict = PyTuple_GetItem(args, 2);
if (!typedict)
@@ -1737,8 +1735,8 @@
converters_from_argtypes(PyObject *ob)
{
PyObject *converters;
- int i;
- int nArgs;
+ Py_ssize_t i;
+ Py_ssize_t nArgs;
ob = PySequence_Tuple(ob); /* new reference */
if (!ob) {
@@ -1771,7 +1769,12 @@
Py_XDECREF(converters);
Py_DECREF(ob);
PyErr_Format(PyExc_TypeError,
- "item %d in _argtypes_ has no from_param method", i+1);
+#if (PY_VERSION_HEX < 0x02050000)
+ "item %d in _argtypes_ has no from_param method",
+#else
+ "item %zd in _argtypes_ has no from_param method",
+#endif
+ i+1);
return NULL;
}
@@ -2591,18 +2594,18 @@
#ifdef MS_WIN32
static PPROC FindAddress(void *handle, char *name, PyObject *type)
{
+#ifdef MS_WIN64
+ /* win64 has no stdcall calling conv, so it should
+ also not have the name mangling of it.
+ */
+ return (PPROC)GetProcAddress(handle, name);
+#else
PPROC address;
char *mangled_name;
int i;
StgDictObject *dict;
address = (PPROC)GetProcAddress(handle, name);
-#ifdef _WIN64
- /* win64 has no stdcall calling conv, so it should
- also not have the name mangling of it.
- */
- return address;
-#else
if (address)
return address;
if (((size_t)name & ~0xFFFF) == 0) {
@@ -2634,7 +2637,7 @@
/* Return 1 if usable, 0 else and exception set. */
static int
-_check_outarg_type(PyObject *arg, int index)
+_check_outarg_type(PyObject *arg, Py_ssize_t index)
{
StgDictObject *dict;
@@ -2655,7 +2658,7 @@
PyErr_Format(PyExc_TypeError,
"'out' parameter %d must be a pointer type, not %s",
- index,
+ Py_SAFE_DOWNCAST(index, Py_ssize_t, int),
PyType_Check(arg) ?
((PyTypeObject *)arg)->tp_name :
arg->ob_type->tp_name);
@@ -2666,7 +2669,7 @@
static int
_validate_paramflags(PyTypeObject *type, PyObject *paramflags)
{
- int i, len;
+ Py_ssize_t i, len;
StgDictObject *dict;
PyObject *argtypes;
@@ -3051,12 +3054,12 @@
PyObject *paramflags = self->paramflags;
PyObject *callargs;
StgDictObject *dict;
- int i, len;
+ Py_ssize_t i, len;
int inargs_index = 0;
/* It's a little bit difficult to determine how many arguments the
function call requires/accepts. For simplicity, we count the consumed
args and compare this to the number of supplied args. */
- int actual_args;
+ Py_ssize_t actual_args;
*poutmask = 0;
*pinoutmask = 0;
@@ -3093,7 +3096,7 @@
/* This way seems to be ~2 us faster than the PyArg_ParseTuple
calls below. */
/* We HAVE already checked that the tuple can be parsed with "i|zO", so... */
- int tsize = PyTuple_GET_SIZE(item);
+ Py_ssize_t tsize = PyTuple_GET_SIZE(item);
flag = PyInt_AS_LONG(PyTuple_GET_ITEM(item, 0));
name = tsize > 1 ? PyString_AS_STRING(PyTuple_GET_ITEM(item, 1)) : NULL;
defval = tsize > 2 ? PyTuple_GET_ITEM(item, 2) : NULL;
@@ -3193,7 +3196,11 @@
message is misleading. See unittests/test_paramflags.py
*/
PyErr_Format(PyExc_TypeError,
+#if (PY_VERSION_HEX < 0x02050000)
"call takes exactly %d arguments (%d given)",
+#else
+ "call takes exactly %d arguments (%zd given)",
+#endif
inargs_index, actual_args);
goto error;
}
@@ -3339,8 +3346,10 @@
return NULL;
if (converters) {
- int required = PyTuple_GET_SIZE(converters);
- int actual = PyTuple_GET_SIZE(callargs);
+ int required = Py_SAFE_DOWNCAST(PyTuple_GET_SIZE(converters),
+ Py_ssize_t, int);
+ int actual = Py_SAFE_DOWNCAST(PyTuple_GET_SIZE(callargs),
+ Py_ssize_t, int);
if ((dict->flags & FUNCFLAG_CDECL) == FUNCFLAG_CDECL) {
/* For cdecl functions, we allow more actual arguments
@@ -3679,8 +3688,8 @@
static int
Array_init(CDataObject *self, PyObject *args, PyObject *kw)
{
- int i;
- int n;
+ Py_ssize_t i;
+ Py_ssize_t n;
if (!PyTuple_Check(args)) {
PyErr_SetString(PyExc_TypeError,
@@ -3701,7 +3710,7 @@
Array_item(PyObject *_self, Py_ssize_t index)
{
CDataObject *self = (CDataObject *)_self;
- int offset, size;
+ Py_ssize_t offset, size;
StgDictObject *stgdict;
@@ -3773,7 +3782,7 @@
Array_ass_item(PyObject *_self, Py_ssize_t index, PyObject *value)
{
CDataObject *self = (CDataObject *)_self;
- int size, offset;
+ Py_ssize_t size, offset;
StgDictObject *stgdict;
char *ptr;
@@ -3802,7 +3811,7 @@
Array_ass_slice(PyObject *_self, Py_ssize_t ilow, Py_ssize_t ihigh, PyObject *value)
{
CDataObject *self = (CDataObject *)_self;
- int i, len;
+ Py_ssize_t i, len;
if (value == NULL) {
PyErr_SetString(PyExc_TypeError,
@@ -4163,7 +4172,7 @@
Pointer_item(PyObject *_self, Py_ssize_t index)
{
CDataObject *self = (CDataObject *)_self;
- int size;
+ Py_ssize_t size;
Py_ssize_t offset;
StgDictObject *stgdict, *itemdict;
PyObject *proto;
@@ -4194,7 +4203,7 @@
Pointer_ass_item(PyObject *_self, Py_ssize_t index, PyObject *value)
{
CDataObject *self = (CDataObject *)_self;
- int size;
+ Py_ssize_t size;
Py_ssize_t offset;
StgDictObject *stgdict, *itemdict;
PyObject *proto;
@@ -4627,9 +4636,10 @@
static PyObject *
wstring_at(const wchar_t *ptr, int size)
{
- if (size == -1)
- size = wcslen(ptr);
- return PyUnicode_FromWideChar(ptr, size);
+ Py_ssize_t ssize = size;
+ if (ssize == -1)
+ ssize = wcslen(ptr);
+ return PyUnicode_FromWideChar(ptr, ssize);
}
#endif
@@ -4829,7 +4839,7 @@
return (PyObject *)unicode;
}
-int My_PyUnicode_AsWideChar(PyUnicodeObject *unicode,
+Py_ssize_t My_PyUnicode_AsWideChar(PyUnicodeObject *unicode,
register wchar_t *w,
Py_ssize_t size)
{
Modified: python/branches/cpy_merge/Modules/_ctypes/callbacks.c
==============================================================================
--- python/branches/cpy_merge/Modules/_ctypes/callbacks.c (original)
+++ python/branches/cpy_merge/Modules/_ctypes/callbacks.c Thu Jun 14 21:06:29 2007
@@ -124,10 +124,10 @@
PyObject *converters,
void **pArgs)
{
- int i;
+ Py_ssize_t i;
PyObject *result;
PyObject *arglist = NULL;
- int nArgs;
+ Py_ssize_t nArgs;
#ifdef WITH_THREAD
PyGILState_STATE state = PyGILState_Ensure();
#endif
@@ -265,7 +265,7 @@
{
int result;
ffi_info *p;
- int nArgs, i;
+ Py_ssize_t nArgs, i;
ffi_abi cc;
nArgs = PySequence_Size(converters);
@@ -308,7 +308,8 @@
if (is_cdecl == 0)
cc = FFI_STDCALL;
#endif
- result = ffi_prep_cif(&p->cif, cc, nArgs,
+ result = ffi_prep_cif(&p->cif, cc,
+ Py_SAFE_DOWNCAST(nArgs, Py_ssize_t, int),
GetType(restype),
&p->atypes[0]);
if (result != FFI_OK) {
Modified: python/branches/cpy_merge/Modules/_ctypes/callproc.c
==============================================================================
--- python/branches/cpy_merge/Modules/_ctypes/callproc.c (original)
+++ python/branches/cpy_merge/Modules/_ctypes/callproc.c Thu Jun 14 21:06:29 2007
@@ -361,13 +361,13 @@
case 'z':
case 'Z':
case 'P':
- sprintf(buffer, "<cparam '%c' (%08lx)>",
- self->tag, (long)self->value.p);
+ sprintf(buffer, "<cparam '%c' (%p)>",
+ self->tag, self->value.p);
break;
default:
- sprintf(buffer, "<cparam '%c' at %08lx>",
- self->tag, (long)self);
+ sprintf(buffer, "<cparam '%c' at %p>",
+ self->tag, self);
break;
}
return PyString_FromString(buffer);
@@ -464,7 +464,7 @@
/*
* Convert a single Python object into a PyCArgObject and return it.
*/
-static int ConvParam(PyObject *obj, int index, struct argument *pa)
+static int ConvParam(PyObject *obj, Py_ssize_t index, struct argument *pa)
{
StgDictObject *dict;
pa->keep = NULL; /* so we cannot forget it later */
@@ -566,7 +566,8 @@
return result;
}
PyErr_Format(PyExc_TypeError,
- "Don't know how to convert parameter %d", index);
+ "Don't know how to convert parameter %d",
+ Py_SAFE_DOWNCAST(index, Py_ssize_t, int));
return -1;
}
}
@@ -906,7 +907,7 @@
PyObject *restype,
PyObject *checker)
{
- int i, n, argcount, argtype_count;
+ Py_ssize_t i, n, argcount, argtype_count;
void *resbuf;
struct argument *args, *pa;
ffi_type **atypes;
@@ -996,7 +997,10 @@
}
if (-1 == _call_function_pointer(flags, pProc, avalues, atypes,
- rtype, resbuf, argcount))
+ rtype, resbuf,
+ Py_SAFE_DOWNCAST(argcount,
+ Py_ssize_t,
+ int)))
goto cleanup;
#ifdef WORDS_BIGENDIAN
@@ -1036,6 +1040,15 @@
return retval;
}
+static int
+_parse_voidp(PyObject *obj, void **address)
+{
+ *address = PyLong_AsVoidPtr(obj);
+ if (*address == NULL)
+ return 0;
+ return 1;
+}
+
#ifdef MS_WIN32
#ifdef _UNICODE
@@ -1123,7 +1136,7 @@
static PyObject *free_library(PyObject *self, PyObject *args)
{
void *hMod;
- if (!PyArg_ParseTuple(args, PY_VOID_P_CODE ":FreeLibrary", &hMod))
+ if (!PyArg_ParseTuple(args, "O&:FreeLibrary", &_parse_voidp, &hMod))
return NULL;
if (!FreeLibrary((HMODULE)hMod))
return PyErr_SetFromWindowsErr(GetLastError());
@@ -1246,7 +1259,7 @@
{
void *handle;
- if (!PyArg_ParseTuple(args, PY_VOID_P_CODE ":dlclose", &handle))
+ if (!PyArg_ParseTuple(args, "O&:dlclose", &_parse_voidp, &handle))
return NULL;
if (dlclose(handle)) {
PyErr_SetString(PyExc_OSError,
@@ -1263,7 +1276,8 @@
void *handle;
void *ptr;
- if (!PyArg_ParseTuple(args, PY_VOID_P_CODE "s:dlsym", &handle, &name))
+ if (!PyArg_ParseTuple(args, "O&s:dlsym",
+ &_parse_voidp, &handle, &name))
return NULL;
ptr = ctypes_dlsym((void*)handle, name);
if (!ptr) {
@@ -1288,8 +1302,8 @@
PyObject *result;
if (!PyArg_ParseTuple(args,
- PY_VOID_P_CODE "O!",
- &func,
+ "O&O!",
+ &_parse_voidp, &func,
&PyTuple_Type, &arguments))
return NULL;
@@ -1319,8 +1333,8 @@
PyObject *result;
if (!PyArg_ParseTuple(args,
- PY_VOID_P_CODE "O!",
- &func,
+ "O&O!",
+ &_parse_voidp, &func,
&PyTuple_Type, &arguments))
return NULL;
@@ -1352,10 +1366,10 @@
dict = PyType_stgdict(obj);
if (dict)
- return PyInt_FromLong(dict->size);
+ return PyInt_FromSsize_t(dict->size);
if (CDataObject_Check(obj))
- return PyInt_FromLong(((CDataObject *)obj)->b_size);
+ return PyInt_FromSsize_t(((CDataObject *)obj)->b_size);
PyErr_SetString(PyExc_TypeError,
"this type has no size");
return NULL;
@@ -1373,11 +1387,11 @@
dict = PyType_stgdict(obj);
if (dict)
- return PyInt_FromLong(dict->align);
+ return PyInt_FromSsize_t(dict->align);
dict = PyObject_stgdict(obj);
if (dict)
- return PyInt_FromLong(dict->align);
+ return PyInt_FromSsize_t(dict->align);
PyErr_SetString(PyExc_TypeError,
"no alignment info");
Modified: python/branches/cpy_merge/Modules/_ctypes/cfield.c
==============================================================================
--- python/branches/cpy_merge/Modules/_ctypes/cfield.c (original)
+++ python/branches/cpy_merge/Modules/_ctypes/cfield.c Thu Jun 14 21:06:29 2007
@@ -35,14 +35,14 @@
* prev_desc points to the type of the previous bitfield, if any.
*/
PyObject *
-CField_FromDesc(PyObject *desc, int index,
- int *pfield_size, int bitsize, int *pbitofs,
- int *psize, int *poffset, int *palign,
+CField_FromDesc(PyObject *desc, Py_ssize_t index,
+ Py_ssize_t *pfield_size, int bitsize, int *pbitofs,
+ Py_ssize_t *psize, Py_ssize_t *poffset, Py_ssize_t *palign,
int pack, int big_endian)
{
CFieldObject *self;
PyObject *proto;
- int size, align, length;
+ Py_ssize_t size, align, length;
SETFUNC setfunc = NULL;
GETFUNC getfunc = NULL;
StgDictObject *dict;
@@ -147,7 +147,7 @@
else
align = dict->align;
if (align && *poffset % align) {
- int delta = align - (*poffset % align);
+ Py_ssize_t delta = align - (*poffset % align);
*psize += delta;
*poffset += delta;
}
@@ -220,21 +220,13 @@
static PyObject *
CField_get_offset(PyObject *self, void *data)
{
-#if (PY_VERSION_HEX < 0x02050000)
- return PyInt_FromLong(((CFieldObject *)self)->offset);
-#else
return PyInt_FromSsize_t(((CFieldObject *)self)->offset);
-#endif
}
static PyObject *
CField_get_size(PyObject *self, void *data)
{
-#if (PY_VERSION_HEX < 0x02050000)
- return PyInt_FromLong(((CFieldObject *)self)->size);
-#else
return PyInt_FromSsize_t(((CFieldObject *)self)->size);
-#endif
}
static PyGetSetDef CField_getset[] = {
@@ -268,8 +260,8 @@
CField_repr(CFieldObject *self)
{
PyObject *result;
- int bits = self->size >> 16;
- int size = self->size & 0xFFFF;
+ Py_ssize_t bits = self->size >> 16;
+ Py_ssize_t size = self->size & 0xFFFF;
const char *name;
name = ((PyTypeObject *)self->proto)->tp_name;
@@ -279,7 +271,7 @@
#if (PY_VERSION_HEX < 0x02050000)
"<Field type=%s, ofs=%d:%d, bits=%d>",
#else
- "<Field type=%s, ofs=%zd:%d, bits=%d>",
+ "<Field type=%s, ofs=%zd:%zd, bits=%zd>",
#endif
name, self->offset, size, bits);
else
@@ -287,7 +279,7 @@
#if (PY_VERSION_HEX < 0x02050000)
"<Field type=%s, ofs=%d, size=%d>",
#else
- "<Field type=%s, ofs=%zd, size=%d>",
+ "<Field type=%s, ofs=%zd, size=%zd>",
#endif
name, self->offset, size);
return result;
@@ -519,7 +511,7 @@
*/
static PyObject *
-b_set(void *ptr, PyObject *value, unsigned size)
+b_set(void *ptr, PyObject *value, Py_ssize_t size)
{
long val;
if (get_long(value, &val) < 0)
@@ -530,7 +522,7 @@
static PyObject *
-b_get(void *ptr, unsigned size)
+b_get(void *ptr, Py_ssize_t size)
{
signed char val = *(signed char *)ptr;
GET_BITFIELD(val, size);
@@ -538,7 +530,7 @@
}
static PyObject *
-B_set(void *ptr, PyObject *value, unsigned size)
+B_set(void *ptr, PyObject *value, Py_ssize_t size)
{
unsigned long val;
if (get_ulong(value, &val) < 0)
@@ -550,7 +542,7 @@
static PyObject *
-B_get(void *ptr, unsigned size)
+B_get(void *ptr, Py_ssize_t size)
{
unsigned char val = *(unsigned char *)ptr;
GET_BITFIELD(val, size);
@@ -558,7 +550,7 @@
}
static PyObject *
-h_set(void *ptr, PyObject *value, unsigned size)
+h_set(void *ptr, PyObject *value, Py_ssize_t size)
{
long val;
short x;
@@ -572,7 +564,7 @@
static PyObject *
-h_set_sw(void *ptr, PyObject *value, unsigned size)
+h_set_sw(void *ptr, PyObject *value, Py_ssize_t size)
{
long val;
short field;
@@ -587,7 +579,7 @@
}
static PyObject *
-h_get(void *ptr, unsigned size)
+h_get(void *ptr, Py_ssize_t size)
{
short val;
memcpy(&val, ptr, sizeof(val));
@@ -596,7 +588,7 @@
}
static PyObject *
-h_get_sw(void *ptr, unsigned size)
+h_get_sw(void *ptr, Py_ssize_t size)
{
short val;
memcpy(&val, ptr, sizeof(val));
@@ -606,7 +598,7 @@
}
static PyObject *
-H_set(void *ptr, PyObject *value, unsigned size)
+H_set(void *ptr, PyObject *value, Py_ssize_t size)
{
unsigned long val;
unsigned short x;
@@ -619,7 +611,7 @@
}
static PyObject *
-H_set_sw(void *ptr, PyObject *value, unsigned size)
+H_set_sw(void *ptr, PyObject *value, Py_ssize_t size)
{
unsigned long val;
unsigned short field;
@@ -635,7 +627,7 @@
static PyObject *
-H_get(void *ptr, unsigned size)
+H_get(void *ptr, Py_ssize_t size)
{
unsigned short val;
memcpy(&val, ptr, sizeof(val));
@@ -644,7 +636,7 @@
}
static PyObject *
-H_get_sw(void *ptr, unsigned size)
+H_get_sw(void *ptr, Py_ssize_t size)
{
unsigned short val;
memcpy(&val, ptr, sizeof(val));
@@ -654,7 +646,7 @@
}
static PyObject *
-i_set(void *ptr, PyObject *value, unsigned size)
+i_set(void *ptr, PyObject *value, Py_ssize_t size)
{
long val;
int x;
@@ -667,7 +659,7 @@
}
static PyObject *
-i_set_sw(void *ptr, PyObject *value, unsigned size)
+i_set_sw(void *ptr, PyObject *value, Py_ssize_t size)
{
long val;
int field;
@@ -683,7 +675,7 @@
static PyObject *
-i_get(void *ptr, unsigned size)
+i_get(void *ptr, Py_ssize_t size)
{
int val;
memcpy(&val, ptr, sizeof(val));
@@ -692,7 +684,7 @@
}
static PyObject *
-i_get_sw(void *ptr, unsigned size)
+i_get_sw(void *ptr, Py_ssize_t size)
{
int val;
memcpy(&val, ptr, sizeof(val));
@@ -704,7 +696,7 @@
#ifdef MS_WIN32
/* short BOOL - VARIANT_BOOL */
static PyObject *
-vBOOL_set(void *ptr, PyObject *value, unsigned size)
+vBOOL_set(void *ptr, PyObject *value, Py_ssize_t size)
{
switch (PyObject_IsTrue(value)) {
case -1:
@@ -719,7 +711,7 @@
}
static PyObject *
-vBOOL_get(void *ptr, unsigned size)
+vBOOL_get(void *ptr, Py_ssize_t size)
{
return PyBool_FromLong((long)*(short int *)ptr);
}
@@ -734,7 +726,7 @@
#endif
static PyObject *
-t_set(void *ptr, PyObject *value, unsigned size)
+t_set(void *ptr, PyObject *value, Py_ssize_t size)
{
switch (PyObject_IsTrue(value)) {
case -1:
@@ -749,13 +741,13 @@
}
static PyObject *
-t_get(void *ptr, unsigned size)
+t_get(void *ptr, Py_ssize_t size)
{
return PyBool_FromLong((long)*(BOOL_TYPE *)ptr);
}
static PyObject *
-I_set(void *ptr, PyObject *value, unsigned size)
+I_set(void *ptr, PyObject *value, Py_ssize_t size)
{
unsigned long val;
unsigned int x;
@@ -768,7 +760,7 @@
}
static PyObject *
-I_set_sw(void *ptr, PyObject *value, unsigned size)
+I_set_sw(void *ptr, PyObject *value, Py_ssize_t size)
{
unsigned long val;
unsigned int field;
@@ -783,7 +775,7 @@
static PyObject *
-I_get(void *ptr, unsigned size)
+I_get(void *ptr, Py_ssize_t size)
{
unsigned int val;
memcpy(&val, ptr, sizeof(val));
@@ -792,7 +784,7 @@
}
static PyObject *
-I_get_sw(void *ptr, unsigned size)
+I_get_sw(void *ptr, Py_ssize_t size)
{
unsigned int val;
memcpy(&val, ptr, sizeof(val));
@@ -802,7 +794,7 @@
}
static PyObject *
-l_set(void *ptr, PyObject *value, unsigned size)
+l_set(void *ptr, PyObject *value, Py_ssize_t size)
{
long val;
long x;
@@ -815,7 +807,7 @@
}
static PyObject *
-l_set_sw(void *ptr, PyObject *value, unsigned size)
+l_set_sw(void *ptr, PyObject *value, Py_ssize_t size)
{
long val;
long field;
@@ -831,7 +823,7 @@
static PyObject *
-l_get(void *ptr, unsigned size)
+l_get(void *ptr, Py_ssize_t size)
{
long val;
memcpy(&val, ptr, sizeof(val));
@@ -840,7 +832,7 @@
}
static PyObject *
-l_get_sw(void *ptr, unsigned size)
+l_get_sw(void *ptr, Py_ssize_t size)
{
long val;
memcpy(&val, ptr, sizeof(val));
@@ -850,7 +842,7 @@
}
static PyObject *
-L_set(void *ptr, PyObject *value, unsigned size)
+L_set(void *ptr, PyObject *value, Py_ssize_t size)
{
unsigned long val;
unsigned long x;
@@ -863,7 +855,7 @@
}
static PyObject *
-L_set_sw(void *ptr, PyObject *value, unsigned size)
+L_set_sw(void *ptr, PyObject *value, Py_ssize_t size)
{
unsigned long val;
unsigned long field;
@@ -879,7 +871,7 @@
static PyObject *
-L_get(void *ptr, unsigned size)
+L_get(void *ptr, Py_ssize_t size)
{
unsigned long val;
memcpy(&val, ptr, sizeof(val));
@@ -888,7 +880,7 @@
}
static PyObject *
-L_get_sw(void *ptr, unsigned size)
+L_get_sw(void *ptr, Py_ssize_t size)
{
unsigned long val;
memcpy(&val, ptr, sizeof(val));
@@ -899,7 +891,7 @@
#ifdef HAVE_LONG_LONG
static PyObject *
-q_set(void *ptr, PyObject *value, unsigned size)
+q_set(void *ptr, PyObject *value, Py_ssize_t size)
{
PY_LONG_LONG val;
PY_LONG_LONG x;
@@ -912,7 +904,7 @@
}
static PyObject *
-q_set_sw(void *ptr, PyObject *value, unsigned size)
+q_set_sw(void *ptr, PyObject *value, Py_ssize_t size)
{
PY_LONG_LONG val;
PY_LONG_LONG field;
@@ -927,7 +919,7 @@
}
static PyObject *
-q_get(void *ptr, unsigned size)
+q_get(void *ptr, Py_ssize_t size)
{
PY_LONG_LONG val;
memcpy(&val, ptr, sizeof(val));
@@ -936,7 +928,7 @@
}
static PyObject *
-q_get_sw(void *ptr, unsigned size)
+q_get_sw(void *ptr, Py_ssize_t size)
{
PY_LONG_LONG val;
memcpy(&val, ptr, sizeof(val));
@@ -946,7 +938,7 @@
}
static PyObject *
-Q_set(void *ptr, PyObject *value, unsigned size)
+Q_set(void *ptr, PyObject *value, Py_ssize_t size)
{
unsigned PY_LONG_LONG val;
unsigned PY_LONG_LONG x;
@@ -959,7 +951,7 @@
}
static PyObject *
-Q_set_sw(void *ptr, PyObject *value, unsigned size)
+Q_set_sw(void *ptr, PyObject *value, Py_ssize_t size)
{
unsigned PY_LONG_LONG val;
unsigned PY_LONG_LONG field;
@@ -974,7 +966,7 @@
}
static PyObject *
-Q_get(void *ptr, unsigned size)
+Q_get(void *ptr, Py_ssize_t size)
{
unsigned PY_LONG_LONG val;
memcpy(&val, ptr, sizeof(val));
@@ -983,7 +975,7 @@
}
static PyObject *
-Q_get_sw(void *ptr, unsigned size)
+Q_get_sw(void *ptr, Py_ssize_t size)
{
unsigned PY_LONG_LONG val;
memcpy(&val, ptr, sizeof(val));
@@ -1000,7 +992,7 @@
static PyObject *
-d_set(void *ptr, PyObject *value, unsigned size)
+d_set(void *ptr, PyObject *value, Py_ssize_t size)
{
double x;
@@ -1016,7 +1008,7 @@
}
static PyObject *
-d_get(void *ptr, unsigned size)
+d_get(void *ptr, Py_ssize_t size)
{
double val;
memcpy(&val, ptr, sizeof(val));
@@ -1024,7 +1016,7 @@
}
static PyObject *
-d_set_sw(void *ptr, PyObject *value, unsigned size)
+d_set_sw(void *ptr, PyObject *value, Py_ssize_t size)
{
double x;
@@ -1046,7 +1038,7 @@
}
static PyObject *
-d_get_sw(void *ptr, unsigned size)
+d_get_sw(void *ptr, Py_ssize_t size)
{
#ifdef WORDS_BIGENDIAN
return PyFloat_FromDouble(_PyFloat_Unpack8(ptr, 1));
@@ -1056,7 +1048,7 @@
}
static PyObject *
-f_set(void *ptr, PyObject *value, unsigned size)
+f_set(void *ptr, PyObject *value, Py_ssize_t size)
{
float x;
@@ -1072,7 +1064,7 @@
}
static PyObject *
-f_get(void *ptr, unsigned size)
+f_get(void *ptr, Py_ssize_t size)
{
float val;
memcpy(&val, ptr, sizeof(val));
@@ -1080,7 +1072,7 @@
}
static PyObject *
-f_set_sw(void *ptr, PyObject *value, unsigned size)
+f_set_sw(void *ptr, PyObject *value, Py_ssize_t size)
{
float x;
@@ -1102,7 +1094,7 @@
}
static PyObject *
-f_get_sw(void *ptr, unsigned size)
+f_get_sw(void *ptr, Py_ssize_t size)
{
#ifdef WORDS_BIGENDIAN
return PyFloat_FromDouble(_PyFloat_Unpack4(ptr, 1));
@@ -1122,7 +1114,7 @@
Py_DECREF on destruction. Maybe only when b_needsfree is non-zero.
*/
static PyObject *
-O_get(void *ptr, unsigned size)
+O_get(void *ptr, Py_ssize_t size)
{
PyObject *ob = *(PyObject **)ptr;
if (ob == NULL) {
@@ -1137,7 +1129,7 @@
}
static PyObject *
-O_set(void *ptr, PyObject *value, unsigned size)
+O_set(void *ptr, PyObject *value, Py_ssize_t size)
{
/* Hm, does the memory block need it's own refcount or not? */
*(PyObject **)ptr = value;
@@ -1147,7 +1139,7 @@
static PyObject *
-c_set(void *ptr, PyObject *value, unsigned size)
+c_set(void *ptr, PyObject *value, Py_ssize_t size)
{
if (!PyString_Check(value) || (1 != PyString_Size(value))) {
PyErr_Format(PyExc_TypeError,
@@ -1160,7 +1152,7 @@
static PyObject *
-c_get(void *ptr, unsigned size)
+c_get(void *ptr, Py_ssize_t size)
{
return PyString_FromStringAndSize((char *)ptr, 1);
}
@@ -1168,9 +1160,9 @@
#ifdef CTYPES_UNICODE
/* u - a single wchar_t character */
static PyObject *
-u_set(void *ptr, PyObject *value, unsigned size)
+u_set(void *ptr, PyObject *value, Py_ssize_t size)
{
- int len;
+ Py_ssize_t len;
if (PyString_Check(value)) {
value = PyUnicode_FromEncodedObject(value,
@@ -1202,17 +1194,17 @@
static PyObject *
-u_get(void *ptr, unsigned size)
+u_get(void *ptr, Py_ssize_t size)
{
return PyUnicode_FromWideChar((wchar_t *)ptr, 1);
}
/* U - a unicode string */
static PyObject *
-U_get(void *ptr, unsigned size)
+U_get(void *ptr, Py_ssize_t size)
{
PyObject *result;
- unsigned int len;
+ Py_ssize_t len;
Py_UNICODE *p;
size /= sizeof(wchar_t); /* we count character units here, not bytes */
@@ -1240,9 +1232,9 @@
}
static PyObject *
-U_set(void *ptr, PyObject *value, unsigned length)
+U_set(void *ptr, PyObject *value, Py_ssize_t length)
{
- unsigned int size;
+ Py_ssize_t size;
/* It's easier to calculate in characters than in bytes */
length /= sizeof(wchar_t);
@@ -1263,7 +1255,11 @@
size = PyUnicode_GET_SIZE(value);
if (size > length) {
PyErr_Format(PyExc_ValueError,
+#if (PY_VERSION_HEX < 0x02050000)
"string too long (%d, maximum length %d)",
+#else
+ "string too long (%zd, maximum length %zd)",
+#endif
size, length);
Py_DECREF(value);
return NULL;
@@ -1277,9 +1273,10 @@
#endif
static PyObject *
-s_get(void *ptr, unsigned size)
+s_get(void *ptr, Py_ssize_t size)
{
PyObject *result;
+ size_t slen;
result = PyString_FromString((char *)ptr);
if (!result)
@@ -1287,7 +1284,8 @@
/* chop off at the first NUL character, if any.
* On error, result will be deallocated and set to NULL.
*/
- size = min(size, strlen(PyString_AS_STRING(result)));
+ slen = strlen(PyString_AS_STRING(result));
+ size = min(size, (Py_ssize_t)slen);
if (result->ob_refcnt == 1) {
/* shorten the result */
_PyString_Resize(&result, size);
@@ -1298,10 +1296,10 @@
}
static PyObject *
-s_set(void *ptr, PyObject *value, unsigned length)
+s_set(void *ptr, PyObject *value, Py_ssize_t length)
{
char *data;
- unsigned size;
+ Py_ssize_t size;
data = PyString_AsString(value);
if (!data)
@@ -1314,7 +1312,11 @@
++size;
} else if (size > length) {
PyErr_Format(PyExc_ValueError,
+#if (PY_VERSION_HEX < 0x02050000)
"string too long (%d, maximum length %d)",
+#else
+ "string too long (%zd, maximum length %zd)",
+#endif
size, length);
return NULL;
}
@@ -1324,7 +1326,7 @@
}
static PyObject *
-z_set(void *ptr, PyObject *value, unsigned size)
+z_set(void *ptr, PyObject *value, Py_ssize_t size)
{
if (value == Py_None) {
*(char **)ptr = NULL;
@@ -1358,7 +1360,7 @@
}
static PyObject *
-z_get(void *ptr, unsigned size)
+z_get(void *ptr, Py_ssize_t size)
{
/* XXX What about invalid pointers ??? */
if (*(void **)ptr) {
@@ -1379,7 +1381,7 @@
#ifdef CTYPES_UNICODE
static PyObject *
-Z_set(void *ptr, PyObject *value, unsigned size)
+Z_set(void *ptr, PyObject *value, Py_ssize_t size)
{
if (value == Py_None) {
*(wchar_t **)ptr = NULL;
@@ -1447,7 +1449,7 @@
}
static PyObject *
-Z_get(void *ptr, unsigned size)
+Z_get(void *ptr, Py_ssize_t size)
{
wchar_t *p;
p = *(wchar_t **)ptr;
@@ -1470,7 +1472,7 @@
#ifdef MS_WIN32
static PyObject *
-BSTR_set(void *ptr, PyObject *value, unsigned size)
+BSTR_set(void *ptr, PyObject *value, Py_ssize_t size)
{
BSTR bstr;
@@ -1494,8 +1496,13 @@
/* create a BSTR from value */
if (value) {
+ Py_ssize_t size = PyUnicode_GET_SIZE(value);
+ if ((unsigned) size != size) {
+ PyErr_SetString(PyExc_ValueError, "String too long for BSTR");
+ return NULL;
+ }
bstr = SysAllocStringLen(PyUnicode_AS_UNICODE(value),
- PyUnicode_GET_SIZE(value));
+ (unsigned)size);
Py_DECREF(value);
} else
bstr = NULL;
@@ -1513,7 +1520,7 @@
static PyObject *
-BSTR_get(void *ptr, unsigned size)
+BSTR_get(void *ptr, Py_ssize_t size)
{
BSTR p;
p = *(BSTR *)ptr;
@@ -1530,7 +1537,7 @@
#endif
static PyObject *
-P_set(void *ptr, PyObject *value, unsigned size)
+P_set(void *ptr, PyObject *value, Py_ssize_t size)
{
void *v;
if (value == Py_None) {
@@ -1563,7 +1570,7 @@
}
static PyObject *
-P_get(void *ptr, unsigned size)
+P_get(void *ptr, Py_ssize_t size)
{
if (*(void **)ptr == NULL) {
Py_INCREF(Py_None);
Modified: python/branches/cpy_merge/Modules/_ctypes/ctypes.h
==============================================================================
--- python/branches/cpy_merge/Modules/_ctypes/ctypes.h (original)
+++ python/branches/cpy_merge/Modules/_ctypes/ctypes.h Thu Jun 14 21:06:29 2007
@@ -4,6 +4,7 @@
#if (PY_VERSION_HEX < 0x02050000)
typedef int Py_ssize_t;
+#define PyInt_FromSsize_t PyInt_FromLong
#endif
#ifndef MS_WIN32
@@ -23,16 +24,10 @@
#define PY_LONG_LONG LONG_LONG
#endif
-#if SIZEOF_VOID_P == SIZEOF_LONG
-#define PY_VOID_P_CODE "k"
-#elif defined(HAVE_LONG_LONG) && (SIZEOF_VOID_P == SIZEOF_LONG_LONG)
-#define PY_VOID_P_CODE "K"
-#endif
-
typedef struct tagPyCArgObject PyCArgObject;
typedef struct tagCDataObject CDataObject;
-typedef PyObject *(* GETFUNC)(void *, unsigned size);
-typedef PyObject *(* SETFUNC)(void *, PyObject *value, unsigned size);
+typedef PyObject *(* GETFUNC)(void *, Py_ssize_t size);
+typedef PyObject *(* SETFUNC)(void *, PyObject *value, Py_ssize_t size);
typedef PyCArgObject *(* PARAMFUNC)(CDataObject *obj);
/* A default buffer in CDataObject, which can be used for small C types. If
@@ -137,9 +132,9 @@
extern PyObject *
-CField_FromDesc(PyObject *desc, int index,
- int *pfield_size, int bitsize, int *pbitofs,
- int *psize, int *poffset, int *palign,
+CField_FromDesc(PyObject *desc, Py_ssize_t index,
+ Py_ssize_t *pfield_size, int bitsize, int *pbitofs,
+ Py_ssize_t *psize, Py_ssize_t *poffset, Py_ssize_t *palign,
int pack, int is_big_endian);
extern PyObject *CData_AtAddress(PyObject *type, void *buf);
@@ -310,7 +305,7 @@
void *p;
} value;
PyObject *obj;
- int size; /* for the 'V' tag */
+ Py_ssize_t size; /* for the 'V' tag */
};
extern PyTypeObject PyCArg_Type;
@@ -387,7 +382,7 @@
# define PyUnicode_AsWideChar My_PyUnicode_AsWideChar
extern PyObject *My_PyUnicode_FromWideChar(const wchar_t *, Py_ssize_t);
-extern int My_PyUnicode_AsWideChar(PyUnicodeObject *, wchar_t *, Py_ssize_t);
+extern Py_ssize_t My_PyUnicode_AsWideChar(PyUnicodeObject *, wchar_t *, Py_ssize_t);
#endif
Modified: python/branches/cpy_merge/Modules/_ctypes/libffi/src/x86/ffi.c
==============================================================================
--- python/branches/cpy_merge/Modules/_ctypes/libffi/src/x86/ffi.c (original)
+++ python/branches/cpy_merge/Modules/_ctypes/libffi/src/x86/ffi.c Thu Jun 14 21:06:29 2007
@@ -174,7 +174,7 @@
/*@out@*/ extended_cif *,
unsigned, unsigned,
/*@out@*/ unsigned *,
- void (*fn)());
+ void (*fn)(void));
/*@=declundef@*/
/*@=exportheader@*/
@@ -185,13 +185,13 @@
/*@out@*/ extended_cif *,
unsigned, unsigned,
/*@out@*/ unsigned *,
- void (*fn)());
+ void (*fn)(void));
/*@=declundef@*/
/*@=exportheader@*/
#endif /* X86_WIN32 */
void ffi_call(/*@dependent@*/ ffi_cif *cif,
- void (*fn)(),
+ void (*fn)(void),
/*@out@*/ void *rvalue,
/*@dependent@*/ void **avalue)
{
@@ -405,7 +405,7 @@
/*@out@*/ extended_cif *,
unsigned, unsigned,
/*@out@*/ unsigned *,
- void (*fn)());
+ void (*fn)(void));
#ifdef X86_WIN32
extern void
@@ -413,12 +413,12 @@
/*@out@*/ extended_cif *,
unsigned, unsigned,
/*@out@*/ unsigned *,
- void (*fn)());
+ void (*fn)(void));
#endif /* X86_WIN32 */
void
ffi_raw_call(/*@dependent@*/ ffi_cif *cif,
- void (*fn)(),
+ void (*fn)(void),
/*@out@*/ void *rvalue,
/*@dependent@*/ ffi_raw *fake_avalue)
{
Modified: python/branches/cpy_merge/Modules/_ctypes/libffi/src/x86/ffi64.c
==============================================================================
--- python/branches/cpy_merge/Modules/_ctypes/libffi/src/x86/ffi64.c (original)
+++ python/branches/cpy_merge/Modules/_ctypes/libffi/src/x86/ffi64.c Thu Jun 14 21:06:29 2007
@@ -42,7 +42,7 @@
};
extern void ffi_call_unix64 (void *args, unsigned long bytes, unsigned flags,
- void *raddr, void (*fnaddr)(), unsigned ssecount);
+ void *raddr, void (*fnaddr)(void), unsigned ssecount);
/* All reference to register classes here is identical to the code in
gcc/config/i386/i386.c. Do *not* change one without the other. */
@@ -339,7 +339,7 @@
}
void
-ffi_call (ffi_cif *cif, void (*fn)(), void *rvalue, void **avalue)
+ffi_call (ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
{
enum x86_64_reg_class classes[MAX_CLASSES];
char *stack, *argp;
Modified: python/branches/cpy_merge/Modules/_ctypes/stgdict.c
==============================================================================
--- python/branches/cpy_merge/Modules/_ctypes/stgdict.c (original)
+++ python/branches/cpy_merge/Modules/_ctypes/stgdict.c Thu Jun 14 21:06:29 2007
@@ -50,7 +50,7 @@
StgDict_clone(StgDictObject *dst, StgDictObject *src)
{
char *d, *s;
- int size;
+ Py_ssize_t size;
StgDict_clear(dst);
PyMem_Free(dst->ffi_type_pointer.elements);
@@ -285,13 +285,13 @@
StructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct)
{
StgDictObject *stgdict, *basedict;
- int len, offset, size, align, i;
- int union_size, total_align;
- int field_size = 0;
+ Py_ssize_t len, offset, size, align, i;
+ Py_ssize_t union_size, total_align;
+ Py_ssize_t field_size = 0;
int bitofs;
PyObject *isPacked;
int pack = 0;
- int ffi_ofs;
+ Py_ssize_t ffi_ofs;
int big_endian;
/* HACK Alert: I cannot be bothered to fix ctypes.com, so there has to
@@ -402,7 +402,11 @@
if (dict == NULL) {
Py_DECREF(pair);
PyErr_Format(PyExc_TypeError,
+#if (PY_VERSION_HEX < 0x02050000)
"second item in _fields_ tuple (index %d) must be a C type",
+#else
+ "second item in _fields_ tuple (index %zd) must be a C type",
+#endif
i);
return -1;
}
@@ -480,7 +484,9 @@
/* Adjust the size according to the alignment requirements */
size = ((size + total_align - 1) / total_align) * total_align;
- stgdict->ffi_type_pointer.alignment = total_align;
+ stgdict->ffi_type_pointer.alignment = Py_SAFE_DOWNCAST(total_align,
+ Py_ssize_t,
+ unsigned short);
stgdict->ffi_type_pointer.size = size;
stgdict->size = size;
Modified: python/branches/cpy_merge/Modules/_sqlite/cache.c
==============================================================================
--- python/branches/cpy_merge/Modules/_sqlite/cache.c (original)
+++ python/branches/cpy_merge/Modules/_sqlite/cache.c Thu Jun 14 21:06:29 2007
@@ -243,6 +243,7 @@
}
template = PyString_FromString("%s <- %s ->%s\n");
if (!template) {
+ Py_DECREF(fmt_args);
return NULL;
}
display_str = PyString_Format(template, fmt_args);
Modified: python/branches/cpy_merge/Modules/_sqlite/module.c
==============================================================================
--- python/branches/cpy_merge/Modules/_sqlite/module.c (original)
+++ python/branches/cpy_merge/Modules/_sqlite/module.c Thu Jun 14 21:06:29 2007
@@ -287,12 +287,12 @@
/*** Create DB-API Exception hierarchy */
- if (!(pysqlite_Error = PyErr_NewException(MODULE_NAME ".Error", PyExc_StandardError, NULL))) {
+ if (!(pysqlite_Error = PyErr_NewException(MODULE_NAME ".Error", PyExc_Exception, NULL))) {
goto error;
}
PyDict_SetItemString(dict, "Error", pysqlite_Error);
- if (!(pysqlite_Warning = PyErr_NewException(MODULE_NAME ".Warning", PyExc_StandardError, NULL))) {
+ if (!(pysqlite_Warning = PyErr_NewException(MODULE_NAME ".Warning", PyExc_Exception, NULL))) {
goto error;
}
PyDict_SetItemString(dict, "Warning", pysqlite_Warning);
Modified: python/branches/cpy_merge/Modules/_testcapimodule.c
==============================================================================
--- python/branches/cpy_merge/Modules/_testcapimodule.c (original)
+++ python/branches/cpy_merge/Modules/_testcapimodule.c Thu Jun 14 21:06:29 2007
@@ -728,7 +728,7 @@
e->tv_sec -=1;
e->tv_usec += 1000000;
}
- printf("Test %d: %d.%06ds\n", test, (int)e->tv_sec, e->tv_usec);
+ printf("Test %d: %d.%06ds\n", test, (int)e->tv_sec, (int)e->tv_usec);
}
static PyObject *
@@ -888,6 +888,10 @@
unsigned long ulong_member;
float float_member;
double double_member;
+#ifdef HAVE_LONG_LONG
+ PY_LONG_LONG longlong_member;
+ unsigned PY_LONG_LONG ulonglong_member;
+#endif
} all_structmembers;
typedef struct {
@@ -906,23 +910,40 @@
{"T_ULONG", T_ULONG, offsetof(test_structmembers, structmembers.ulong_member), 0, NULL},
{"T_FLOAT", T_FLOAT, offsetof(test_structmembers, structmembers.float_member), 0, NULL},
{"T_DOUBLE", T_DOUBLE, offsetof(test_structmembers, structmembers.double_member), 0, NULL},
+#ifdef HAVE_LONG_LONG
+ {"T_LONGLONG", T_LONGLONG, offsetof(test_structmembers, structmembers.longlong_member), 0, NULL},
+ {"T_ULONGLONG", T_ULONGLONG, offsetof(test_structmembers, structmembers.ulonglong_member), 0, NULL},
+#endif
{NULL}
};
static PyObject *test_structmembers_new(PyTypeObject *type, PyObject *args, PyObject *kwargs){
static char *keywords[]={"T_BYTE", "T_UBYTE", "T_SHORT", "T_USHORT", "T_INT", "T_UINT",
- "T_LONG", "T_ULONG", "T_FLOAT", "T_DOUBLE", NULL};
+ "T_LONG", "T_ULONG", "T_FLOAT", "T_DOUBLE",
+ #ifdef HAVE_LONG_LONG
+ "T_LONGLONG", "T_ULONGLONG",
+ #endif
+ NULL};
+ static char *fmt="|bBhHiIlkfd"
+ #ifdef HAVE_LONG_LONG
+ "LK"
+ #endif
+ ;
test_structmembers *ob=PyObject_New(test_structmembers, type);
if (ob==NULL)
return NULL;
memset(&ob->structmembers, 0, sizeof(all_structmembers));
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|bBhHiIlkfd", keywords,
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, fmt, keywords,
&ob->structmembers.byte_member, &ob->structmembers.ubyte_member,
&ob->structmembers.short_member, &ob->structmembers.ushort_member,
&ob->structmembers.int_member, &ob->structmembers.uint_member,
&ob->structmembers.long_member, &ob->structmembers.ulong_member,
- &ob->structmembers.float_member, &ob->structmembers.double_member)){
+ &ob->structmembers.float_member, &ob->structmembers.double_member
+ #ifdef HAVE_LONG_LONG
+ ,&ob->structmembers.longlong_member, &ob->structmembers.ulonglong_member
+ #endif
+ )){
Py_DECREF(ob);
return NULL;
}
@@ -1005,6 +1026,9 @@
PyModule_AddObject(m, "FLT_MIN", PyFloat_FromDouble(FLT_MIN));
PyModule_AddObject(m, "DBL_MAX", PyFloat_FromDouble(DBL_MAX));
PyModule_AddObject(m, "DBL_MIN", PyFloat_FromDouble(DBL_MIN));
+ PyModule_AddObject(m, "LLONG_MAX", PyLong_FromLongLong(PY_LLONG_MAX));
+ PyModule_AddObject(m, "LLONG_MIN", PyLong_FromLongLong(PY_LLONG_MIN));
+ PyModule_AddObject(m, "ULLONG_MAX", PyLong_FromUnsignedLongLong(PY_ULLONG_MAX));
PyModule_AddObject(m, "PY_SSIZE_T_MAX", PyInt_FromSsize_t(PY_SSIZE_T_MAX));
PyModule_AddObject(m, "PY_SSIZE_T_MIN", PyInt_FromSsize_t(PY_SSIZE_T_MIN));
Modified: python/branches/cpy_merge/Modules/cjkcodecs/multibytecodec.c
==============================================================================
--- python/branches/cpy_merge/Modules/cjkcodecs/multibytecodec.c (original)
+++ python/branches/cpy_merge/Modules/cjkcodecs/multibytecodec.c Thu Jun 14 21:06:29 2007
@@ -1214,6 +1214,8 @@
cres = NULL;
for (;;) {
+ int endoffile;
+
if (sizehint < 0)
cres = PyObject_CallMethod(self->stream,
(char *)method, NULL);
@@ -1230,6 +1232,8 @@
goto errorexit;
}
+ endoffile = (PyString_GET_SIZE(cres) == 0);
+
if (self->pendingsize > 0) {
PyObject *ctr;
char *ctrdata;
@@ -1257,7 +1261,7 @@
(MultibyteStatefulDecoderContext *)self, &buf))
goto errorexit;
- if (rsize == 0 || sizehint < 0) { /* end of file */
+ if (endoffile || sizehint < 0) {
if (buf.inbuf < buf.inbuf_end &&
multibytecodec_decerror(self->codec, &self->state,
&buf, self->errors, MBERR_TOOFEW))
Modified: python/branches/cpy_merge/Modules/getbuildinfo.c
==============================================================================
--- python/branches/cpy_merge/Modules/getbuildinfo.c (original)
+++ python/branches/cpy_merge/Modules/getbuildinfo.c Thu Jun 14 21:06:29 2007
@@ -20,7 +20,14 @@
#endif
#endif
+/* on unix, SVNVERSION is passed on the command line.
+ * on Windows, the string is interpolated using
+ * subwcrev.exe
+ */
+#ifndef SVNVERSION
#define SVNVERSION "$WCRANGE$$WCMODS?M:$"
+#endif
+
const char *
Py_GetBuildInfo(void)
{
@@ -39,7 +46,7 @@
{
/* the following string can be modified by subwcrev.exe */
static const char svnversion[] = SVNVERSION;
- if (!strstr(svnversion, "$"))
- return svnversion; /* it was interpolated */
+ if (svnversion[0] != '$')
+ return svnversion; /* it was interpolated, or passed on command line */
return "exported";
}
Modified: python/branches/cpy_merge/Modules/socketmodule.c
==============================================================================
--- python/branches/cpy_merge/Modules/socketmodule.c (original)
+++ python/branches/cpy_merge/Modules/socketmodule.c Thu Jun 14 21:06:29 2007
@@ -363,8 +363,11 @@
#define BTPROTO_L2CAP BLUETOOTH_PROTO_L2CAP
#define BTPROTO_RFCOMM BLUETOOTH_PROTO_RFCOMM
#define BTPROTO_HCI BLUETOOTH_PROTO_HCI
+#define SOL_HCI SOL_HCI_RAW
+#define HCI_FILTER SO_HCI_RAW_FILTER
#define sockaddr_l2 sockaddr_l2cap
#define sockaddr_rc sockaddr_rfcomm
+#define hci_dev hci_node
#define _BT_L2_MEMB(sa, memb) ((sa)->l2cap_##memb)
#define _BT_RC_MEMB(sa, memb) ((sa)->rfcomm_##memb)
#define _BT_HCI_MEMB(sa, memb) ((sa)->hci_##memb)
@@ -4447,10 +4450,10 @@
PyModule_AddIntConstant(m, "BTPROTO_L2CAP", BTPROTO_L2CAP);
PyModule_AddIntConstant(m, "BTPROTO_HCI", BTPROTO_HCI);
PyModule_AddIntConstant(m, "SOL_HCI", SOL_HCI);
- PyModule_AddIntConstant(m, "HCI_TIME_STAMP", HCI_TIME_STAMP);
- PyModule_AddIntConstant(m, "HCI_DATA_DIR", HCI_DATA_DIR);
PyModule_AddIntConstant(m, "HCI_FILTER", HCI_FILTER);
#if !defined(__FreeBSD__)
+ PyModule_AddIntConstant(m, "HCI_TIME_STAMP", HCI_TIME_STAMP);
+ PyModule_AddIntConstant(m, "HCI_DATA_DIR", HCI_DATA_DIR);
PyModule_AddIntConstant(m, "BTPROTO_SCO", BTPROTO_SCO);
#endif
PyModule_AddIntConstant(m, "BTPROTO_RFCOMM", BTPROTO_RFCOMM);
Modified: python/branches/cpy_merge/Objects/abstract.c
==============================================================================
--- python/branches/cpy_merge/Objects/abstract.c (original)
+++ python/branches/cpy_merge/Objects/abstract.c Thu Jun 14 21:06:29 2007
@@ -971,6 +971,22 @@
return PyFloat_FromString(o);
}
+
+PyObject *
+PyNumber_ToBase(PyObject *n, int base)
+{
+ PyObject *res;
+ PyObject *index = PyNumber_Index(n);
+
+ if (!index)
+ return NULL;
+ assert(PyLong_Check(index));
+ res = _PyLong_Format(index, base);
+ Py_DECREF(index);
+ return res;
+}
+
+
/* Operations on sequences */
int
@@ -2133,8 +2149,9 @@
PyObject_IsInstance(PyObject *inst, PyObject *cls)
{
PyObject *t, *v, *tb;
+ PyObject *checker;
PyErr_Fetch(&t, &v, &tb);
- PyObject *checker = PyObject_GetAttrString(cls, "__instancecheck__");
+ checker = PyObject_GetAttrString(cls, "__instancecheck__");
PyErr_Restore(t, v, tb);
if (checker != NULL) {
PyObject *res;
@@ -2203,8 +2220,9 @@
PyObject_IsSubclass(PyObject *derived, PyObject *cls)
{
PyObject *t, *v, *tb;
+ PyObject *checker;
PyErr_Fetch(&t, &v, &tb);
- PyObject *checker = PyObject_GetAttrString(cls, "__subclasscheck__");
+ checker = PyObject_GetAttrString(cls, "__subclasscheck__");
PyErr_Restore(t, v, tb);
if (checker != NULL) {
PyObject *res;
Modified: python/branches/cpy_merge/Objects/bufferobject.c
==============================================================================
--- python/branches/cpy_merge/Objects/bufferobject.c (original)
+++ python/branches/cpy_merge/Objects/bufferobject.c Thu Jun 14 21:06:29 2007
@@ -19,7 +19,7 @@
READ_BUFFER,
WRITE_BUFFER,
CHAR_BUFFER,
- ANY_BUFFER,
+ ANY_BUFFER
};
static int
Modified: python/branches/cpy_merge/Objects/exceptions.c
==============================================================================
--- python/branches/cpy_merge/Objects/exceptions.c (original)
+++ python/branches/cpy_merge/Objects/exceptions.c Thu Jun 14 21:06:29 2007
@@ -334,17 +334,9 @@
/*
- * StandardError extends Exception
+ * TypeError extends Exception
*/
-SimpleExtendsException(PyExc_Exception, StandardError,
- "Base class for all standard Python exceptions that do not represent\n"
- "interpreter exiting.");
-
-
-/*
- * TypeError extends StandardError
- */
-SimpleExtendsException(PyExc_StandardError, TypeError,
+SimpleExtendsException(PyExc_Exception, TypeError,
"Inappropriate argument type.");
@@ -425,14 +417,14 @@
/*
- * ImportError extends StandardError
+ * ImportError extends Exception
*/
-SimpleExtendsException(PyExc_StandardError, ImportError,
+SimpleExtendsException(PyExc_Exception, ImportError,
"Import can't find module, or can't find name in module.");
/*
- * EnvironmentError extends StandardError
+ * EnvironmentError extends Exception
*/
/* Where a function has a single filename, such as open() or some
@@ -657,7 +649,7 @@
{NULL}
};
-ComplexExtendsException(PyExc_StandardError, EnvironmentError,
+ComplexExtendsException(PyExc_Exception, EnvironmentError,
EnvironmentError, EnvironmentError_dealloc,
EnvironmentError_methods, EnvironmentError_members,
EnvironmentError_str,
@@ -867,16 +859,16 @@
/*
- * EOFError extends StandardError
+ * EOFError extends Exception
*/
-SimpleExtendsException(PyExc_StandardError, EOFError,
+SimpleExtendsException(PyExc_Exception, EOFError,
"Read beyond end of file.");
/*
- * RuntimeError extends StandardError
+ * RuntimeError extends Exception
*/
-SimpleExtendsException(PyExc_StandardError, RuntimeError,
+SimpleExtendsException(PyExc_Exception, RuntimeError,
"Unspecified run-time error.");
@@ -887,9 +879,9 @@
"Method or function hasn't been implemented yet.");
/*
- * NameError extends StandardError
+ * NameError extends Exception
*/
-SimpleExtendsException(PyExc_StandardError, NameError,
+SimpleExtendsException(PyExc_Exception, NameError,
"Name not found globally.");
/*
@@ -899,14 +891,14 @@
"Local name referenced but not bound to a value.");
/*
- * AttributeError extends StandardError
+ * AttributeError extends Exception
*/
-SimpleExtendsException(PyExc_StandardError, AttributeError,
+SimpleExtendsException(PyExc_Exception, AttributeError,
"Attribute not found.");
/*
- * SyntaxError extends StandardError
+ * SyntaxError extends Exception
*/
static int
@@ -1085,7 +1077,7 @@
{NULL} /* Sentinel */
};
-ComplexExtendsException(PyExc_StandardError, SyntaxError, SyntaxError,
+ComplexExtendsException(PyExc_Exception, SyntaxError, SyntaxError,
SyntaxError_dealloc, 0, SyntaxError_members,
SyntaxError_str, "Invalid syntax.");
@@ -1105,9 +1097,9 @@
/*
- * LookupError extends StandardError
+ * LookupError extends Exception
*/
-SimpleExtendsException(PyExc_StandardError, LookupError,
+SimpleExtendsException(PyExc_Exception, LookupError,
"Base class for lookup errors.");
@@ -1144,9 +1136,9 @@
/*
- * ValueError extends StandardError
+ * ValueError extends Exception
*/
-SimpleExtendsException(PyExc_StandardError, ValueError,
+SimpleExtendsException(PyExc_Exception, ValueError,
"Inappropriate argument value (of correct type).");
/*
@@ -1763,16 +1755,16 @@
/*
- * AssertionError extends StandardError
+ * AssertionError extends Exception
*/
-SimpleExtendsException(PyExc_StandardError, AssertionError,
+SimpleExtendsException(PyExc_Exception, AssertionError,
"Assertion failed.");
/*
- * ArithmeticError extends StandardError
+ * ArithmeticError extends Exception
*/
-SimpleExtendsException(PyExc_StandardError, ArithmeticError,
+SimpleExtendsException(PyExc_Exception, ArithmeticError,
"Base class for arithmetic errors.");
@@ -1798,9 +1790,9 @@
/*
- * SystemError extends StandardError
+ * SystemError extends Exception
*/
-SimpleExtendsException(PyExc_StandardError, SystemError,
+SimpleExtendsException(PyExc_Exception, SystemError,
"Internal error in the Python interpreter.\n"
"\n"
"Please report this to the Python maintainer, along with the traceback,\n"
@@ -1808,16 +1800,16 @@
/*
- * ReferenceError extends StandardError
+ * ReferenceError extends Exception
*/
-SimpleExtendsException(PyExc_StandardError, ReferenceError,
+SimpleExtendsException(PyExc_Exception, ReferenceError,
"Weak ref proxy used after referent went away.");
/*
- * MemoryError extends StandardError
+ * MemoryError extends Exception
*/
-SimpleExtendsException(PyExc_StandardError, MemoryError, "Out of memory.");
+SimpleExtendsException(PyExc_Exception, MemoryError, "Out of memory.");
/* Warning category docstrings */
@@ -1930,7 +1922,6 @@
PRE_INIT(BaseException)
PRE_INIT(Exception)
- PRE_INIT(StandardError)
PRE_INIT(TypeError)
PRE_INIT(StopIteration)
PRE_INIT(GeneratorExit)
@@ -1992,7 +1983,6 @@
POST_INIT(BaseException)
POST_INIT(Exception)
- POST_INIT(StandardError)
POST_INIT(TypeError)
POST_INIT(StopIteration)
POST_INIT(GeneratorExit)
Modified: python/branches/cpy_merge/Objects/intobject.c
==============================================================================
--- python/branches/cpy_merge/Objects/intobject.c (original)
+++ python/branches/cpy_merge/Objects/intobject.c Thu Jun 14 21:06:29 2007
@@ -922,32 +922,6 @@
}
static PyObject *
-int_oct(PyIntObject *v)
-{
- char buf[100];
- long x = v -> ob_ival;
- if (x < 0)
- PyOS_snprintf(buf, sizeof(buf), "-0%lo", -x);
- else if (x == 0)
- strcpy(buf, "0");
- else
- PyOS_snprintf(buf, sizeof(buf), "0%lo", x);
- return PyString_FromString(buf);
-}
-
-static PyObject *
-int_hex(PyIntObject *v)
-{
- char buf[100];
- long x = v -> ob_ival;
- if (x < 0)
- PyOS_snprintf(buf, sizeof(buf), "-0x%lx", -x);
- else
- PyOS_snprintf(buf, sizeof(buf), "0x%lx", x);
- return PyString_FromString(buf);
-}
-
-static PyObject *
int_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds);
static PyObject *
@@ -1074,8 +1048,8 @@
(unaryfunc)int_int, /*nb_int*/
(unaryfunc)int_long, /*nb_long*/
(unaryfunc)int_float, /*nb_float*/
- (unaryfunc)int_oct, /*nb_oct*/
- (unaryfunc)int_hex, /*nb_hex*/
+ 0, /*nb_oct*/ /* not in use */
+ 0, /*nb_hex*/ /* not in use */
0, /*nb_inplace_add*/
0, /*nb_inplace_subtract*/
0, /*nb_inplace_multiply*/
Modified: python/branches/cpy_merge/Objects/longobject.c
==============================================================================
--- python/branches/cpy_merge/Objects/longobject.c (original)
+++ python/branches/cpy_merge/Objects/longobject.c Thu Jun 14 21:06:29 2007
@@ -80,7 +80,6 @@
static PyLongObject *mul1(PyLongObject *, wdigit);
static PyLongObject *muladd1(PyLongObject *, wdigit, wdigit);
static PyLongObject *divrem1(PyLongObject *, digit, digit *);
-static PyObject *long_format(PyObject *aa, int base);
#define SIGCHECK(PyTryBlock) \
if (--_Py_Ticker < 0) { \
@@ -1384,7 +1383,7 @@
/* Divide long pin, w/ size digits, by non-zero digit n, storing quotient
in pout, and returning the remainder. pin and pout point at the LSD.
It's OK for pin == pout on entry, which saves oodles of mallocs/frees in
- long_format, but that should be done with great care since longs are
+ _PyLong_Format, but that should be done with great care since longs are
immutable. */
static digit
@@ -1424,10 +1423,10 @@
/* Convert a long int object to a string, using a given conversion base.
Return a string object.
- If base is 8 or 16, add the proper prefix '0' or '0x'. */
+ If base is 2, 8 or 16, add the proper prefix '0b', '0o' or '0x'. */
-static PyObject *
-long_format(PyObject *aa, int base)
+PyObject *
+_PyLong_Format(PyObject *aa, int base)
{
register PyLongObject *a = (PyLongObject *)aa;
PyStringObject *str;
@@ -1551,14 +1550,18 @@
Py_DECREF(scratch);
}
- if (base == 8) {
- if (size_a != 0)
- *--p = '0';
- }
- else if (base == 16) {
+ if (base == 16) {
*--p = 'x';
*--p = '0';
}
+ else if (base == 8) {
+ *--p = 'o';
+ *--p = '0';
+ }
+ else if (base == 2) {
+ *--p = 'b';
+ *--p = '0';
+ }
else if (base != 10) {
*--p = '#';
*--p = '0' + base%10;
@@ -1675,9 +1678,9 @@
PyObject *
PyLong_FromString(char *str, char **pend, int base)
{
- int sign = 1;
+ int sign = 1, error_if_nonzero = 0;
char *start, *orig_str = str;
- PyLongObject *z;
+ PyLongObject *z = NULL;
PyObject *strobj, *strrepr;
Py_ssize_t slen;
@@ -1701,10 +1704,21 @@
base = 10;
else if (str[1] == 'x' || str[1] == 'X')
base = 16;
- else
+ else if (str[1] == 'o' || str[1] == 'O')
base = 8;
+ else if (str[1] == 'b' || str[1] == 'B')
+ base = 2;
+ else {
+ /* "old" (C-style) octal literal, now invalid.
+ it might still be zero though */
+ error_if_nonzero = 1;
+ base = 10;
+ }
}
- if (base == 16 && str[0] == '0' && (str[1] == 'x' || str[1] == 'X'))
+ if (str[0] == '0' &&
+ ((base == 16 && (str[1] == 'x' || str[1] == 'X')) ||
+ (base == 8 && (str[1] == 'o' || str[1] == 'O')) ||
+ (base == 2 && (str[1] == 'b' || str[1] == 'B'))))
str += 2;
start = str;
@@ -1908,6 +1922,15 @@
}
if (z == NULL)
return NULL;
+ if (error_if_nonzero) {
+ /* reset the base to 0, else the exception message
+ doesn't make too much sense */
+ base = 0;
+ if (z->ob_size != 0)
+ goto onError;
+ /* there might still be other problems, therefore base
+ remains zero here for the same reason */
+ }
if (str == start)
goto onError;
if (sign < 0)
@@ -2130,7 +2153,7 @@
static PyObject *
long_repr(PyObject *v)
{
- return long_format(v, 10);
+ return _PyLong_Format(v, 10);
}
static int
@@ -3489,18 +3512,6 @@
}
static PyObject *
-long_oct(PyObject *v)
-{
- return long_format(v, 8);
-}
-
-static PyObject *
-long_hex(PyObject *v)
-{
- return long_format(v, 16);
-}
-
-static PyObject *
long_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds);
static PyObject *
@@ -3624,8 +3635,8 @@
long_int, /*nb_int*/
long_long, /*nb_long*/
long_float, /*nb_float*/
- long_oct, /*nb_oct*/
- long_hex, /*nb_hex*/
+ 0, /*nb_oct*/ /* not used */
+ 0, /*nb_hex*/ /* not used */
0, /* nb_inplace_add */
0, /* nb_inplace_subtract */
0, /* nb_inplace_multiply */
Modified: python/branches/cpy_merge/Objects/stringobject.c
==============================================================================
--- python/branches/cpy_merge/Objects/stringobject.c (original)
+++ python/branches/cpy_merge/Objects/stringobject.c Thu Jun 14 21:06:29 2007
@@ -3309,7 +3309,7 @@
{
const char *e, *p;
char *q;
- Py_ssize_t i, j;
+ Py_ssize_t i, j, old_j;
PyObject *u;
int tabsize = 8;
@@ -3317,21 +3317,38 @@
return NULL;
/* First pass: determine size of output string */
- i = j = 0;
+ i = j = old_j = 0;
e = PyString_AS_STRING(self) + PyString_GET_SIZE(self);
for (p = PyString_AS_STRING(self); p < e; p++)
if (*p == '\t') {
- if (tabsize > 0)
+ if (tabsize > 0) {
j += tabsize - (j % tabsize);
+ if (old_j > j) {
+ PyErr_SetString(PyExc_OverflowError,
+ "new string is too long");
+ return NULL;
+ }
+ old_j = j;
+ }
}
else {
j++;
if (*p == '\n' || *p == '\r') {
i += j;
- j = 0;
+ old_j = j = 0;
+ if (i < 0) {
+ PyErr_SetString(PyExc_OverflowError,
+ "new string is too long");
+ return NULL;
+ }
}
}
+ if ((i + j) < 0) {
+ PyErr_SetString(PyExc_OverflowError, "new string is too long");
+ return NULL;
+ }
+
/* Second pass: create output string and fill it */
u = PyString_FromStringAndSize(NULL, i + j);
if (!u)
@@ -4243,12 +4260,13 @@
result = val->ob_type->tp_str(val);
break;
case 'o':
- result = val->ob_type->tp_as_number->nb_oct(val);
+ numnondigits = 2;
+ result = PyNumber_ToBase(val, 8);
break;
case 'x':
case 'X':
numnondigits = 2;
- result = val->ob_type->tp_as_number->nb_hex(val);
+ result = PyNumber_ToBase(val, 16);
break;
default:
assert(!"'type' not in [duoxX]");
@@ -4283,32 +4301,16 @@
assert(numdigits > 0);
/* Get rid of base marker unless F_ALT */
- if ((flags & F_ALT) == 0) {
- /* Need to skip 0x, 0X or 0. */
- int skipped = 0;
- switch (type) {
- case 'o':
- assert(buf[sign] == '0');
- /* If 0 is only digit, leave it alone. */
- if (numdigits > 1) {
- skipped = 1;
- --numdigits;
- }
- break;
- case 'x':
- case 'X':
- assert(buf[sign] == '0');
- assert(buf[sign + 1] == 'x');
- skipped = 2;
- numnondigits -= 2;
- break;
- }
- if (skipped) {
- buf += skipped;
- len -= skipped;
- if (sign)
- buf[0] = '-';
- }
+ if (((flags & F_ALT) == 0 &&
+ (type == 'o' || type == 'x' || type == 'X'))) {
+ assert(buf[sign] == '0');
+ assert(buf[sign+1] == 'x' || buf[sign+1] == 'X' ||
+ buf[sign+1] == 'o');
+ numnondigits -= 2;
+ buf += 2;
+ len -= 2;
+ if (sign)
+ buf[0] = '-';
assert(len == numnondigits + numdigits);
assert(numdigits > 0);
}
@@ -4377,9 +4379,10 @@
prec = 1;
if ((flags & F_ALT) &&
- (type == 'x' || type == 'X')) {
- /* When converting under %#x or %#X, there are a number
+ (type == 'x' || type == 'X' || type == 'o')) {
+ /* When converting under %#o, %#x or %#X, there are a number
* of issues that cause pain:
+ * - for %#o, we want a different base marker than C
* - when 0 is being converted, the C standard leaves off
* the '0x' or '0X', which is inconsistent with other
* %#x/%#X conversions and inconsistent with Python's
@@ -4407,7 +4410,7 @@
prec, type);
}
- /* buf = '+'/'-'/'' + '0'/'0x'/'' + '[0-9]'*max(prec, len(x in octal))
+ /* buf = '+'/'-'/'' + '0o'/'0x'/'' + '[0-9]'*max(prec, len(x in octal))
* worst case buf = '-0x' + [0-9]*prec, where prec >= 11
*/
if (buflen <= 14 || buflen <= (size_t)3 + (size_t)prec) {
@@ -4805,7 +4808,8 @@
if (width > len)
width--;
}
- if ((flags & F_ALT) && (c == 'x' || c == 'X')) {
+ if ((flags & F_ALT) &&
+ (c == 'x' || c == 'X' || c == 'o')) {
assert(pbuf[0] == '0');
assert(pbuf[1] == c);
if (fill != ' ') {
@@ -4828,7 +4832,7 @@
if (sign)
*res++ = sign;
if ((flags & F_ALT) &&
- (c == 'x' || c == 'X')) {
+ (c == 'x' || c == 'X' || c == 'o')) {
assert(pbuf[0] == '0');
assert(pbuf[1] == c);
*res++ = *pbuf++;
Modified: python/branches/cpy_merge/Objects/typeobject.c
==============================================================================
--- python/branches/cpy_merge/Objects/typeobject.c (original)
+++ python/branches/cpy_merge/Objects/typeobject.c Thu Jun 14 21:06:29 2007
@@ -1,6 +1,7 @@
/* Type object implementation */
#include "Python.h"
+#include "frameobject.h"
#include "structmember.h"
#include <ctype.h>
@@ -3236,8 +3237,6 @@
COPYNUM(nb_int);
COPYNUM(nb_long);
COPYNUM(nb_float);
- COPYNUM(nb_oct);
- COPYNUM(nb_hex);
COPYNUM(nb_inplace_add);
COPYNUM(nb_inplace_subtract);
COPYNUM(nb_inplace_multiply);
@@ -4556,8 +4555,6 @@
SLOT0(slot_nb_int, "__int__")
SLOT0(slot_nb_long, "__long__")
SLOT0(slot_nb_float, "__float__")
-SLOT0(slot_nb_oct, "__oct__")
-SLOT0(slot_nb_hex, "__hex__")
SLOT1(slot_nb_inplace_add, "__iadd__", PyObject *, "O")
SLOT1(slot_nb_inplace_subtract, "__isub__", PyObject *, "O")
SLOT1(slot_nb_inplace_multiply, "__imul__", PyObject *, "O")
@@ -5208,10 +5205,6 @@
"long(x)"),
UNSLOT("__float__", nb_float, slot_nb_float, wrap_unaryfunc,
"float(x)"),
- UNSLOT("__oct__", nb_oct, slot_nb_oct, wrap_unaryfunc,
- "oct(x)"),
- UNSLOT("__hex__", nb_hex, slot_nb_hex, wrap_unaryfunc,
- "hex(x)"),
NBSLOT("__index__", nb_index, slot_nb_index, wrap_unaryfunc,
"x[y:z] <==> x[y.__index__():z.__index__()]"),
IBSLOT("__iadd__", nb_inplace_add, slot_nb_inplace_add,
@@ -5874,14 +5867,76 @@
super_init(PyObject *self, PyObject *args, PyObject *kwds)
{
superobject *su = (superobject *)self;
- PyTypeObject *type;
+ PyTypeObject *type = NULL;
PyObject *obj = NULL;
PyTypeObject *obj_type = NULL;
if (!_PyArg_NoKeywords("super", kwds))
return -1;
- if (!PyArg_ParseTuple(args, "O!|O:super", &PyType_Type, &type, &obj))
+ if (!PyArg_ParseTuple(args, "|O!O:super", &PyType_Type, &type, &obj))
return -1;
+
+ if (type == NULL) {
+ /* Call super(), without args -- fill in from __class__
+ and first local variable on the stack. */
+ PyFrameObject *f = PyThreadState_GET()->frame;
+ PyCodeObject *co = f->f_code;
+ int i, n;
+ if (co == NULL) {
+ PyErr_SetString(PyExc_SystemError,
+ "super(): no code object");
+ return -1;
+ }
+ if (co->co_argcount == 0) {
+ PyErr_SetString(PyExc_SystemError,
+ "super(): no arguments");
+ return -1;
+ }
+ obj = f->f_localsplus[0];
+ if (obj == NULL) {
+ PyErr_SetString(PyExc_SystemError,
+ "super(): arg[0] deleted");
+ return -1;
+ }
+ if (co->co_freevars == NULL)
+ n = 0;
+ else {
+ assert(PyTuple_Check(co->co_freevars));
+ n = PyTuple_GET_SIZE(co->co_freevars);
+ }
+ for (i = 0; i < n; i++) {
+ PyObject *name = PyTuple_GET_ITEM(co->co_freevars, i);
+ assert(PyString_Check(name)); /* XXX PyUnicode? */
+ if (!strcmp(PyString_AS_STRING(name), "__class__")) {
+ PyObject *cell =
+ f->f_localsplus[co->co_nlocals + i];
+ if (cell == NULL || !PyCell_Check(cell)) {
+ PyErr_SetString(PyExc_SystemError,
+ "super(): bad __class__ cell");
+ return -1;
+ }
+ type = (PyTypeObject *) PyCell_GET(cell);
+ if (type == NULL) {
+ PyErr_SetString(PyExc_SystemError,
+ "super(): empty __class__ cell");
+ return -1;
+ }
+ if (!PyType_Check(type)) {
+ PyErr_Format(PyExc_SystemError,
+ "super(): __class__ is not a type (%s)",
+ type->ob_type->tp_name);
+ return -1;
+ }
+ break;
+ }
+ }
+ if (type == NULL) {
+ PyErr_SetString(PyExc_SystemError,
+ "super(): __class__ cell not found");
+ return -1;
+ }
+ }
+
if (obj == Py_None)
obj = NULL;
if (obj != NULL) {
@@ -5898,13 +5953,19 @@
}
PyDoc_STRVAR(super_doc,
+"super() -> same as super(__class__, <first argument>)\n"
"super(type) -> unbound super object\n"
"super(type, obj) -> bound super object; requires isinstance(obj, type)\n"
"super(type, type2) -> bound super object; requires issubclass(type2, type)\n"
"Typical use to call a cooperative superclass method:\n"
"class C(B):\n"
" def meth(self, arg):\n"
-" super(C, self).meth(arg)");
+" super().meth(arg)\n"
+"This works for class methods too:\n"
+"class C(B):\n"
+" @classmethod\n"
+" def cmeth(cls, arg):\n"
+" super().cmeth(arg)\n");
static int
super_traverse(PyObject *self, visitproc visit, void *arg)
Modified: python/branches/cpy_merge/Objects/unicodeobject.c
==============================================================================
--- python/branches/cpy_merge/Objects/unicodeobject.c (original)
+++ python/branches/cpy_merge/Objects/unicodeobject.c Thu Jun 14 21:06:29 2007
@@ -5693,7 +5693,7 @@
Py_UNICODE *e;
Py_UNICODE *p;
Py_UNICODE *q;
- Py_ssize_t i, j;
+ Py_ssize_t i, j, old_j;
PyUnicodeObject *u;
int tabsize = 8;
@@ -5701,21 +5701,38 @@
return NULL;
/* First pass: determine size of output string */
- i = j = 0;
+ i = j = old_j = 0;
e = self->str + self->length;
for (p = self->str; p < e; p++)
if (*p == '\t') {
- if (tabsize > 0)
+ if (tabsize > 0) {
j += tabsize - (j % tabsize);
+ if (old_j > j) {
+ PyErr_SetString(PyExc_OverflowError,
+ "new string is too long");
+ return NULL;
+ }
+ old_j = j;
+ }
}
else {
j++;
if (*p == '\n' || *p == '\r') {
i += j;
- j = 0;
+ old_j = j = 0;
+ if (i < 0) {
+ PyErr_SetString(PyExc_OverflowError,
+ "new string is too long");
+ return NULL;
+ }
}
}
+ if ((i + j) < 0) {
+ PyErr_SetString(PyExc_OverflowError, "new string is too long");
+ return NULL;
+ }
+
/* Second pass: create output string and fill it */
u = _PyUnicode_New(i + j);
if (!u)
@@ -7354,9 +7371,10 @@
}
if ((flags & F_ALT) &&
- (type == 'x' || type == 'X')) {
- /* When converting under %#x or %#X, there are a number
+ (type == 'x' || type == 'X' || type == 'o')) {
+ /* When converting under %#o, %#x or %#X, there are a number
* of issues that cause pain:
+ * - for %#o, we want a different base marker than C
* - when 0 is being converted, the C standard leaves off
* the '0x' or '0X', which is inconsistent with other
* %#x/%#X conversions and inconsistent with Python's
@@ -7814,7 +7832,7 @@
if (width > len)
width--;
}
- if ((flags & F_ALT) && (c == 'x' || c == 'X')) {
+ if ((flags & F_ALT) && (c == 'x' || c == 'X' || c == 'o')) {
assert(pbuf[0] == '0');
assert(pbuf[1] == c);
if (fill != ' ') {
@@ -7836,7 +7854,7 @@
if (fill == ' ') {
if (sign)
*res++ = sign;
- if ((flags & F_ALT) && (c == 'x' || c == 'X')) {
+ if ((flags & F_ALT) && (c == 'x' || c == 'X' || c == 'o')) {
assert(pbuf[0] == '0');
assert(pbuf[1] == c);
*res++ = *pbuf++;
Modified: python/branches/cpy_merge/PC/os2emx/python25.def
==============================================================================
--- python/branches/cpy_merge/PC/os2emx/python25.def (original)
+++ python/branches/cpy_merge/PC/os2emx/python25.def Thu Jun 14 21:06:29 2007
@@ -767,7 +767,6 @@
"_PyExc_Fini"
"PyExc_BaseException"
"PyExc_Exception"
- "PyExc_StandardError"
"PyExc_TypeError"
"PyExc_StopIteration"
"PyExc_GeneratorExit"
Modified: python/branches/cpy_merge/PC/os2vacpp/python.def
==============================================================================
--- python/branches/cpy_merge/PC/os2vacpp/python.def (original)
+++ python/branches/cpy_merge/PC/os2vacpp/python.def Thu Jun 14 21:06:29 2007
@@ -30,7 +30,6 @@
PyExc_OSError
PyExc_OverflowError
PyExc_RuntimeError
- PyExc_StandardError
PyExc_SyntaxError
PyExc_SystemError
PyExc_SystemExit
Modified: python/branches/cpy_merge/PC/pyconfig.h
==============================================================================
--- python/branches/cpy_merge/PC/pyconfig.h (original)
+++ python/branches/cpy_merge/PC/pyconfig.h Thu Jun 14 21:06:29 2007
@@ -247,6 +247,9 @@
#define COMPILER "[gcc]"
#define hypot _hypot
#define PY_LONG_LONG long long
+#define PY_LLONG_MIN LLONG_MIN
+#define PY_LLONG_MAX LLONG_MAX
+#define PY_ULLONG_MAX ULLONG_MAX
#endif /* GNUC */
/* ------------------------------------------------------------------------*/
@@ -272,6 +275,9 @@
#define HAVE_LONG_LONG 1
#ifndef PY_LONG_LONG
# define PY_LONG_LONG __int64
+# define PY_LLONG_MAX LLONG_MAX
+# define PY_LLONG_MIN LLONG_MIN
+# define PY_ULLONG_MAX ULLONG_MAX
#endif
/* For Windows the Python core is in a DLL by default. Test
Modified: python/branches/cpy_merge/PCbuild/_bsddb.vcproj
==============================================================================
--- python/branches/cpy_merge/PCbuild/_bsddb.vcproj (original)
+++ python/branches/cpy_merge/PCbuild/_bsddb.vcproj Thu Jun 14 21:06:29 2007
@@ -213,7 +213,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
- AdditionalDependencies="..\..\db-4.4.20\build_win32\Release_AMD64\libdb44s.lib"
+ AdditionalDependencies="..\..\db-4.4.20\build_win32\Release_AMD64\libdb44s.lib bufferoverflowU.lib"
OutputFile="./_bsddb.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
Modified: python/branches/cpy_merge/PCbuild/_ssl.mak
==============================================================================
--- python/branches/cpy_merge/PCbuild/_ssl.mak (original)
+++ python/branches/cpy_merge/PCbuild/_ssl.mak Thu Jun 14 21:06:29 2007
@@ -1,3 +1,4 @@
+EXTRA_LIBS=
!IFDEF DEBUG
SUFFIX=_d.pyd
@@ -26,12 +27,12 @@
@if not exist "$(TEMP)/_ssl/." mkdir "$(TEMP)/_ssl"
cl /nologo /c $(SSL_SOURCE) $(CFLAGS) /Fo$(TEMP)\_ssl\$*.obj $(INCLUDES)
link /nologo @<<
- /dll /out:_ssl$(SUFFIX) $(TEMP)\_ssl\$*.obj $(SSL_LIBS)
+ /dll /out:_ssl$(SUFFIX) $(TEMP)\_ssl\$*.obj $(SSL_LIBS) $(EXTRA_LIBS)
<<
_hashlib$(SUFFIX): $(HASH_SOURCE) $(SSL_LIB_DIR)/libeay32.lib ../PC/*.h ../Include/*.h
@if not exist "$(TEMP)/_hashlib/." mkdir "$(TEMP)/_hashlib"
cl /nologo /c $(HASH_SOURCE) $(CFLAGS) $(EXTRA_CFLAGS) /Fo$(TEMP)\_hashlib\$*.obj $(INCLUDES)
link /nologo @<<
- /dll /out:_hashlib$(SUFFIX) $(HASH_LIBS) $(TEMP)\_hashlib\$*.obj
+ /dll /out:_hashlib$(SUFFIX) $(HASH_LIBS) $(EXTRA_LIBS) $(TEMP)\_hashlib\$*.obj
<<
Modified: python/branches/cpy_merge/PCbuild/build_ssl.bat
==============================================================================
--- python/branches/cpy_merge/PCbuild/build_ssl.bat (original)
+++ python/branches/cpy_merge/PCbuild/build_ssl.bat Thu Jun 14 21:06:29 2007
@@ -1,3 +1,5 @@
+if "%1" == "ReleaseAMD64" call "%MSSdk%\SetEnv" /XP64 /RETAIL
+
@echo off
if not defined HOST_PYTHON (
if %1 EQU Debug (
Modified: python/branches/cpy_merge/PCbuild/build_ssl.py
==============================================================================
--- python/branches/cpy_merge/PCbuild/build_ssl.py (original)
+++ python/branches/cpy_merge/PCbuild/build_ssl.py Thu Jun 14 21:06:29 2007
@@ -170,7 +170,7 @@
if debug:
defs = defs + " " + "DEBUG=1"
if arch in ('amd64', 'ia64'):
- defs = defs + " EXTRA_CFLAGS=/GS-"
+ defs = defs + " EXTRA_CFLAGS=/GS- EXTRA_LIBS=bufferoverflowU.lib"
makeCommand = 'nmake /nologo -f _ssl.mak ' + defs + " " + make_flags
print "Executing:", makeCommand
sys.stdout.flush()
Modified: python/branches/cpy_merge/PCbuild/pcbuild.sln
==============================================================================
--- python/branches/cpy_merge/PCbuild/pcbuild.sln (original)
+++ python/branches/cpy_merge/PCbuild/pcbuild.sln Thu Jun 14 21:06:29 2007
@@ -259,12 +259,14 @@
{F22F40F4-D318-40DC-96B3-88DC81CE0894}.Release.ActiveCfg = Release|Win32
{F22F40F4-D318-40DC-96B3-88DC81CE0894}.Release.Build.0 = Release|Win32
{F22F40F4-D318-40DC-96B3-88DC81CE0894}.ReleaseAMD64.ActiveCfg = ReleaseAMD64|Win32
+ {F22F40F4-D318-40DC-96B3-88DC81CE0894}.ReleaseAMD64.Build.0 = ReleaseAMD64|Win32
{F22F40F4-D318-40DC-96B3-88DC81CE0894}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32
{8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Debug.ActiveCfg = Debug|Win32
{8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Debug.Build.0 = Debug|Win32
{8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Release.ActiveCfg = Release|Win32
{8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Release.Build.0 = Release|Win32
{8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.ReleaseAMD64.ActiveCfg = ReleaseAMD64|Win32
+ {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.ReleaseAMD64.Build.0 = ReleaseAMD64|Win32
{8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32
{2FF0A312-22F9-4C34-B070-842916DE27A9}.Debug.ActiveCfg = Debug|Win32
{2FF0A312-22F9-4C34-B070-842916DE27A9}.Debug.Build.0 = Debug|Win32
Modified: python/branches/cpy_merge/Parser/tokenizer.c
==============================================================================
--- python/branches/cpy_merge/Parser/tokenizer.c (original)
+++ python/branches/cpy_merge/Parser/tokenizer.c Thu Jun 14 21:06:29 2007
@@ -1310,7 +1310,7 @@
/* Number */
if (isdigit(c)) {
if (c == '0') {
- /* Hex or octal -- maybe. */
+ /* Hex, octal or binary -- maybe. */
c = tok_nextc(tok);
if (c == '.')
goto fraction;
@@ -1324,18 +1324,27 @@
c = tok_nextc(tok);
} while (isxdigit(c));
}
+ else if (c == 'o' || c == 'O') {
+ /* Octal */
+ do {
+ c = tok_nextc(tok);
+ } while ('0' <= c && c < '8');
+ }
+ else if (c == 'b' || c == 'B') {
+ /* Binary */
+ do {
+ c = tok_nextc(tok);
+ } while (c == '0' || c == '1');
+ }
else {
- int found_decimal = 0;
- /* Octal; c is first char of it */
- /* There's no 'isoctdigit' macro, sigh */
- while ('0' <= c && c < '8') {
+ int nonzero = 0;
+ /* maybe old-style octal; c is first char of it */
+ /* in any case, allow '0' as a literal */
+ while (c == '0')
+ c = tok_nextc(tok);
+ while (isdigit(c)) {
+ nonzero = 1;
c = tok_nextc(tok);
- }
- if (isdigit(c)) {
- found_decimal = 1;
- do {
- c = tok_nextc(tok);
- } while (isdigit(c));
}
if (c == '.')
goto fraction;
@@ -1345,7 +1354,7 @@
else if (c == 'j' || c == 'J')
goto imaginary;
#endif
- else if (found_decimal) {
+ else if (nonzero) {
tok->done = E_TOKEN;
tok_backup(tok, c);
return ERRORTOKEN;
Modified: python/branches/cpy_merge/Python/ast.c
==============================================================================
--- python/branches/cpy_merge/Python/ast.c (original)
+++ python/branches/cpy_merge/Python/ast.c Thu Jun 14 21:06:29 2007
@@ -1922,6 +1922,10 @@
return NULL;
}
key = e->v.Name.id;
+ if (!strcmp(PyString_AS_STRING(key), "None")) {
+ ast_error(CHILD(ch, 0), "assignment to None");
+ return NULL;
+ }
e = ast_for_expr(c, CHILD(ch, 2));
if (!e)
return NULL;
@@ -3029,8 +3033,6 @@
#ifndef WITHOUT_COMPLEX
imflag = *end == 'j' || *end == 'J';
#endif
- if (*end == 'l' || *end == 'L')
- return PyLong_FromString((char *)s, (char **)0, 0);
if (s[0] == '0') {
x = (long) PyOS_strtoul((char *)s, (char **)&end, 0);
if (x < 0 && errno == 0) {
Modified: python/branches/cpy_merge/Python/bltinmodule.c
==============================================================================
--- python/branches/cpy_merge/Python/bltinmodule.c (original)
+++ python/branches/cpy_merge/Python/bltinmodule.c Thu Jun 14 21:06:29 2007
@@ -33,7 +33,8 @@
static PyObject *
builtin___build_class__(PyObject *self, PyObject *args, PyObject *kwds)
{
- PyObject *func, *name, *bases, *mkw, *meta, *prep, *ns, *res;
+ PyObject *func, *name, *bases, *mkw, *meta, *prep, *ns, *cell;
+ PyObject *cls = NULL;
Py_ssize_t nargs, nbases;
assert(args != NULL);
@@ -114,22 +115,25 @@
return NULL;
}
}
- res = PyObject_CallFunctionObjArgs(func, ns, NULL);
- if (res != NULL) {
+ cell = PyObject_CallFunctionObjArgs(func, ns, NULL);
+ if (cell != NULL) {
PyObject *margs;
- Py_DECREF(res);
- res = NULL;
margs = Py_BuildValue("OOO", name, bases, ns);
if (margs != NULL) {
- res = PyEval_CallObjectWithKeywords(meta, margs, mkw);
+ cls = PyEval_CallObjectWithKeywords(meta, margs, mkw);
Py_DECREF(margs);
}
+ if (cls != NULL && PyCell_Check(cell)) {
+ Py_INCREF(cls);
+ PyCell_SET(cell, cls);
+ }
+ Py_DECREF(cell);
}
Py_DECREF(ns);
Py_DECREF(meta);
Py_XDECREF(mkw);
Py_DECREF(bases);
- return res;
+ return cls;
}
PyDoc_STRVAR(build_class_doc,
@@ -247,6 +251,18 @@
static PyObject *
+builtin_bin(PyObject *self, PyObject *v)
+{
+ return PyNumber_ToBase(v, 2);
+}
+
+PyDoc_STRVAR(bin_doc,
+"bin(number) -> string\n\
+\n\
+Return the binary representation of an integer or long integer.");
+
+
+static PyObject *
builtin_filter(PyObject *self, PyObject *args)
{
PyObject *func, *seq, *result, *it, *arg;
@@ -1230,24 +1246,7 @@
static PyObject *
builtin_hex(PyObject *self, PyObject *v)
{
- PyNumberMethods *nb;
- PyObject *res;
-
- if ((nb = v->ob_type->tp_as_number) == NULL ||
- nb->nb_hex == NULL) {
- PyErr_SetString(PyExc_TypeError,
- "hex() argument can't be converted to hex");
- return NULL;
- }
- res = (*nb->nb_hex)(v);
- if (res && !PyString_Check(res)) {
- PyErr_Format(PyExc_TypeError,
- "__hex__ returned non-string (type %.200s)",
- res->ob_type->tp_name);
- Py_DECREF(res);
- return NULL;
- }
- return res;
+ return PyNumber_ToBase(v, 16);
}
PyDoc_STRVAR(hex_doc,
@@ -1430,24 +1429,7 @@
static PyObject *
builtin_oct(PyObject *self, PyObject *v)
{
- PyNumberMethods *nb;
- PyObject *res;
-
- if (v == NULL || (nb = v->ob_type->tp_as_number) == NULL ||
- nb->nb_oct == NULL) {
- PyErr_SetString(PyExc_TypeError,
- "oct() argument can't be converted to oct");
- return NULL;
- }
- res = (*nb->nb_oct)(v);
- if (res && !PyString_Check(res)) {
- PyErr_Format(PyExc_TypeError,
- "__oct__ returned non-string (type %.200s)",
- res->ob_type->tp_name);
- Py_DECREF(res);
- return NULL;
- }
- return res;
+ return PyNumber_ToBase(v, 8);
}
PyDoc_STRVAR(oct_doc,
@@ -1949,6 +1931,7 @@
{"abs", builtin_abs, METH_O, abs_doc},
{"all", builtin_all, METH_O, all_doc},
{"any", builtin_any, METH_O, any_doc},
+ {"bin", builtin_bin, METH_O, bin_doc},
{"chr", builtin_chr, METH_VARARGS, chr_doc},
{"cmp", builtin_cmp, METH_VARARGS, cmp_doc},
{"compile", (PyCFunction)builtin_compile, METH_VARARGS | METH_KEYWORDS, compile_doc},
Modified: python/branches/cpy_merge/Python/compile.c
==============================================================================
--- python/branches/cpy_merge/Python/compile.c (original)
+++ python/branches/cpy_merge/Python/compile.c Thu Jun 14 21:06:29 2007
@@ -373,10 +373,12 @@
while (PyDict_Next(src, &pos, &k, &v)) {
/* XXX this should probably be a macro in symtable.h */
+ long vi;
assert(PyInt_Check(v));
- scope = (PyInt_AS_LONG(v) >> SCOPE_OFFSET) & SCOPE_MASK;
+ vi = PyInt_AS_LONG(v);
+ scope = (vi >> SCOPE_OFFSET) & SCOPE_MASK;
- if (scope == scope_type || PyInt_AS_LONG(v) & flag) {
+ if (scope == scope_type || vi & flag) {
PyObject *tuple, *item = PyInt_FromLong(i);
if (item == NULL) {
Py_DECREF(dest);
@@ -1125,7 +1127,8 @@
if (!asdl_seq_LEN(stmts))
return 1;
st = (stmt_ty)asdl_seq_GET(stmts, 0);
- if (compiler_isdocstring(st)) {
+ if (compiler_isdocstring(st) && Py_OptimizeFlag < 2) {
+ /* don't generate docstrings if -OO */
i = 1;
VISIT(c, expr, st->v.Expr.value);
if (!compiler_nameop(c, __doc__, Store))
@@ -1251,7 +1254,8 @@
else /* (reftype == FREE) */
arg = compiler_lookup_arg(c->u->u_freevars, name);
if (arg == -1) {
- printf("lookup %s in %s %d %d\n"
+ fprintf(stderr,
+ "lookup %s in %s %d %d\n"
"freevars of %s: %s\n",
PyObject_REPR(name),
PyString_AS_STRING(c->u->u_name),
@@ -1474,7 +1478,6 @@
static int
compiler_class(struct compiler *c, stmt_ty s)
{
- static PyObject *build_class = NULL;
static PyObject *locals = NULL;
PyCodeObject *co;
PyObject *str;
@@ -1485,13 +1488,7 @@
if (!compiler_decorators(c, decos))
return 0;
-
/* initialize statics */
- if (build_class == NULL) {
- build_class = PyString_FromString("__build_class__");
- if (build_class == NULL)
- return 0;
- }
if (locals == NULL) {
locals = PyString_FromString("__locals__");
if (locals == NULL)
@@ -1501,14 +1498,16 @@
/* ultimately generate code for:
<name> = __build_class__(<func>, <name>, *<bases>, **<keywords>)
where:
- <func> is a function/closure created from the class body
+ <func> is a function/closure created from the class body;
+ it has a single argument (__locals__) where the dict
+ (or MutableSequence) representing the locals is passed
<name> is the class name
<bases> is the positional arguments and *varargs argument
<keywords> is the keyword arguments and **kwds argument
This borrows from compiler_call.
*/
- /* 0. Create a fake variable named __locals__ */
+ /* 0. Create a fake argument named __locals__ */
ste = PySymtable_Lookup(c->c_st, s);
if (ste == NULL)
return 0;
@@ -1528,11 +1527,11 @@
c->u->u_private = s->v.ClassDef.name;
/* force it to have one mandatory argument */
c->u->u_argcount = 1;
- /* load the first argument ... */
+ /* load the first argument (__locals__) ... */
ADDOP_I(c, LOAD_FAST, 0);
/* ... and store it into f_locals */
ADDOP_IN_SCOPE(c, STORE_LOCALS);
- /* load __name__ ... */
+ /* load (global) __name__ ... */
str = PyString_InternFromString("__name__");
if (!str || !compiler_nameop(c, str, Load)) {
Py_XDECREF(str);
@@ -1553,8 +1552,24 @@
compiler_exit_scope(c);
return 0;
}
- /* return None */
- ADDOP_O(c, LOAD_CONST, Py_None, consts);
+ /* return the (empty) __class__ cell */
+ str = PyString_InternFromString("__class__");
+ if (str == NULL) {
+ compiler_exit_scope(c);
+ return 0;
+ }
+ i = compiler_lookup_arg(c->u->u_cellvars, str);
+ Py_DECREF(str);
+ if (i == -1) {
+ /* This happens when nobody references the cell */
+ PyErr_Clear();
+ /* Return None */
+ ADDOP_O(c, LOAD_CONST, Py_None, consts);
+ }
+ else {
+ /* Return the cell where to store __class__ */
+ ADDOP_I(c, LOAD_CLOSURE, i);
+ }
ADDOP_IN_SCOPE(c, RETURN_VALUE);
/* create the code object */
co = assemble(c, 1);
@@ -2421,7 +2436,7 @@
return compiler_error(c, "can not assign to __debug__");
}
-mangled = _Py_Mangle(c->u->u_private, name);
+ mangled = _Py_Mangle(c->u->u_private, name);
if (!mangled)
return 0;
@@ -2947,6 +2962,7 @@
static int
expr_constant(expr_ty e)
{
+ char *id;
switch (e->kind) {
case Ellipsis_kind:
return 1;
@@ -2955,11 +2971,13 @@
case Str_kind:
return PyObject_IsTrue(e->v.Str.s);
case Name_kind:
- /* __debug__ is not assignable, so we can optimize
- * it away in if and while statements */
- if (strcmp(PyString_AS_STRING(e->v.Name.id),
- "__debug__") == 0)
- return ! Py_OptimizeFlag;
+ /* optimize away names that can't be reassigned */
+ id = PyString_AS_STRING(e->v.Name.id);
+ if (strcmp(id, "True") == 0) return 1;
+ if (strcmp(id, "False") == 0) return 0;
+ if (strcmp(id, "None") == 0) return 0;
+ if (strcmp(id, "__debug__") == 0)
+ return ! Py_OptimizeFlag;
/* fall through */
default:
return -1;
Modified: python/branches/cpy_merge/Python/mystrtoul.c
==============================================================================
--- python/branches/cpy_merge/Python/mystrtoul.c (original)
+++ python/branches/cpy_merge/Python/mystrtoul.c Thu Jun 14 21:06:29 2007
@@ -91,7 +91,7 @@
** This is a general purpose routine for converting
** an ascii string to an integer in an arbitrary base.
** Leading white space is ignored. If 'base' is zero
-** it looks for a leading 0, 0x or 0X to tell which
+** it looks for a leading 0b, 0o or 0x to tell which
** base. If these are absent it defaults to 10.
** Base must be 0 or between 2 and 36 (inclusive).
** If 'ptr' is non-NULL it will contain a pointer to
@@ -110,29 +110,57 @@
while (*str && isspace(Py_CHARMASK(*str)))
++str;
- /* check for leading 0 or 0x for auto-base or base 16 */
+ /* check for leading 0b, 0o or 0x for auto-base or base 16 */
switch (base) {
- case 0: /* look for leading 0, 0x or 0X */
- if (*str == '0') {
+ case 0: /* look for leading 0b, 0o or 0x */
+ if (*str == '0') {
+ ++str;
+ if (*str == 'x' || *str == 'X') {
++str;
- if (*str == 'x' || *str == 'X') {
- ++str;
- base = 16;
- }
- else
- base = 8;
- }
- else
- base = 10;
- break;
-
- case 16: /* skip leading 0x or 0X */
- if (*str == '0') {
+ base = 16;
+ } else if (*str == 'o' || *str == 'O') {
++str;
- if (*str == 'x' || *str == 'X')
+ base = 8;
+ } else if (*str == 'b' || *str == 'B') {
+ ++str;
+ base = 2;
+ } else {
+ /* skip all zeroes... */
+ while (*str == '0')
+ ++str;
+ while (isspace(Py_CHARMASK(*str)))
++str;
+ if (ptr)
+ *ptr = str;
+ return 0;
}
- break;
+ }
+ else
+ base = 10;
+ break;
+
+ /* even with explicit base, skip leading 0? prefix */
+ case 16:
+ if (*str == '0') {
+ ++str;
+ if (*str == 'x' || *str == 'X')
+ ++str;
+ }
+ break;
+ case 8:
+ if (*str == '0') {
+ ++str;
+ if (*str == 'o' || *str == 'O')
+ ++str;
+ }
+ break;
+ case 2:
+ if(*str == '0') {
+ ++str;
+ if (*str == 'b' || *str == 'B')
+ ++str;
+ }
+ break;
}
/* catch silly bases */
Modified: python/branches/cpy_merge/Python/peephole.c
==============================================================================
--- python/branches/cpy_merge/Python/peephole.c (original)
+++ python/branches/cpy_merge/Python/peephole.c Thu Jun 14 21:06:29 2007
@@ -257,6 +257,37 @@
return blocks;
}
+/* Helper to replace LOAD_NAME None/True/False with LOAD_CONST
+ Returns: 0 if no change, 1 if change, -1 if error */
+static int
+load_global(unsigned char *codestr, Py_ssize_t i, char *name, PyObject *consts)
+{
+ Py_ssize_t j;
+ PyObject *obj;
+ if (name == NULL)
+ return 0;
+ if (strcmp(name, "None") == 0)
+ obj = Py_None;
+ else if (strcmp(name, "True") == 0)
+ obj = Py_True;
+ else if (strcmp(name, "False") == 0)
+ obj = Py_False;
+ else
+ return 0;
+ for (j = 0; j < PyList_GET_SIZE(consts); j++) {
+ if (PyList_GET_ITEM(consts, j) == obj)
+ break;
+ }
+ if (j == PyList_GET_SIZE(consts)) {
+ if (PyList_Append(consts, obj) < 0)
+ return -1;
+ }
+ assert(PyList_GET_ITEM(consts, j) == obj);
+ codestr[i] = LOAD_CONST;
+ SETARG(codestr, i, j);
+ return 1;
+}
+
/* Perform basic peephole optimizations to components of a code object.
The consts object should still be in list form to allow new constants
to be appended.
@@ -302,7 +333,7 @@
/* Avoid situations where jump retargeting could overflow */
assert(PyString_Check(code));
- codelen = PyString_Size(code);
+ codelen = PyString_GET_SIZE(code);
if (codelen > 32700)
goto exitUnchanged;
@@ -371,25 +402,17 @@
codestr[i+3] = NOP;
break;
- /* Replace LOAD_GLOBAL/LOAD_NAME None
- with LOAD_CONST None */
+ /* Replace LOAD_GLOBAL/LOAD_NAME None/True/False
+ with LOAD_CONST None/True/False */
case LOAD_NAME:
case LOAD_GLOBAL:
j = GETARG(codestr, i);
name = PyString_AsString(PyTuple_GET_ITEM(names, j));
- if (name == NULL || strcmp(name, "None") != 0)
+ h = load_global(codestr, i, name, consts);
+ if (h < 0)
+ goto exitUnchanged;
+ else if (h == 0)
continue;
- for (j=0 ; j < PyList_GET_SIZE(consts) ; j++) {
- if (PyList_GET_ITEM(consts, j) == Py_None)
- break;
- }
- if (j == PyList_GET_SIZE(consts)) {
- if (PyList_Append(consts, Py_None) == -1)
- goto exitUnchanged;
- }
- assert(PyList_GET_ITEM(consts, j) == Py_None);
- codestr[i] = LOAD_CONST;
- SETARG(codestr, i, j);
cumlc = lastlc + 1;
break;
Modified: python/branches/cpy_merge/Python/structmember.c
==============================================================================
--- python/branches/cpy_merge/Python/structmember.c (original)
+++ python/branches/cpy_merge/Python/structmember.c Thu Jun 14 21:06:29 2007
@@ -289,31 +289,25 @@
}
break;
#ifdef HAVE_LONG_LONG
- case T_LONGLONG:
- if (!PyLong_Check(v)) {
- PyErr_BadArgument();
+ case T_LONGLONG:{
+ PY_LONG_LONG value;
+ *(PY_LONG_LONG*)addr = value = PyLong_AsLongLong(v);
+ if ((value == -1) && PyErr_Occurred())
return -1;
- } else {
- PY_LONG_LONG value;
- *(PY_LONG_LONG*)addr = value = PyLong_AsLongLong(v);
- if ((value == -1) && PyErr_Occurred()) {
- return -1;
- }
- }
- break;
- case T_ULONGLONG:
- if (!PyLong_Check(v)) {
- PyErr_BadArgument();
- return -1;
- } else {
- unsigned PY_LONG_LONG value;
- *(unsigned PY_LONG_LONG*)addr = value = PyLong_AsUnsignedLongLong(v);
- if ((value == (unsigned PY_LONG_LONG)-1) &&
- PyErr_Occurred()) {
- return -1;
- }
- }
- break;
+ break;
+ }
+ case T_ULONGLONG:{
+ unsigned PY_LONG_LONG value;
+ /* ??? PyLong_AsLongLong accepts an int, but PyLong_AsUnsignedLongLong
+ doesn't ??? */
+ if (PyLong_Check(v))
+ *(unsigned PY_LONG_LONG*)addr = value = PyLong_AsUnsignedLongLong(v);
+ else
+ *(unsigned PY_LONG_LONG*)addr = value = PyInt_AsLong(v);
+ if ((value == (unsigned PY_LONG_LONG)-1) && PyErr_Occurred())
+ return -1;
+ break;
+ }
#endif /* HAVE_LONG_LONG */
default:
PyErr_Format(PyExc_SystemError,
Modified: python/branches/cpy_merge/Python/symtable.c
==============================================================================
--- python/branches/cpy_merge/Python/symtable.c (original)
+++ python/branches/cpy_merge/Python/symtable.c Thu Jun 14 21:06:29 2007
@@ -187,7 +187,7 @@
static identifier top = NULL, lambda = NULL, genexpr = NULL,
- listcomp = NULL, setcomp = NULL;
+ listcomp = NULL, setcomp = NULL, __class__ = NULL;
#define GET_IDENTIFIER(VAR) \
((VAR) ? (VAR) : ((VAR) = PyString_InternFromString(# VAR)))
@@ -321,7 +321,7 @@
/* Analyze raw symbol information to determine scope of each name.
- The next several functions are helpers for PySymtable_Analyze(),
+ The next several functions are helpers for symtable_analyze(),
which determines whether a name is local, global, or free. In addition,
it determines which local variables are cell variables; they provide
bindings that are used for free variables in enclosed blocks.
@@ -468,10 +468,13 @@
Note that the current block's free variables are included in free.
That's safe because no name can be free and local in the same scope.
+
+ The 'restrict' argument may be set to a string to restrict the analysis
+ to the one variable whose name equals that string (e.g. "__class__").
*/
static int
-analyze_cells(PyObject *scopes, PyObject *free)
+analyze_cells(PyObject *scopes, PyObject *free, const char *restrict)
{
PyObject *name, *v, *v_cell;
int success = 0;
@@ -488,6 +491,9 @@
continue;
if (!PySet_Contains(free, name))
continue;
+ if (restrict != NULL &&
+ strcmp(PyString_AS_STRING(name), restrict))
+ continue;
/* Replace LOCAL with CELL for this name, and remove
from free. It is safe to replace the value of name
in the dict, because it will not cause a resize.
@@ -596,7 +602,7 @@
}
Py_DECREF(v_new);
}
- /* It's a cell, or already a free variable in this scope */
+ /* It's a cell, or already free in this scope */
Py_DECREF(name);
continue;
}
@@ -682,8 +688,7 @@
goto error;
}
- /* Populate global and bound sets to be passed to children.
- */
+ /* Populate global and bound sets to be passed to children. */
if (ste->ste_type != ClassBlock) {
/* Add function locals to bound set */
if (ste->ste_type == FunctionBlock) {
@@ -702,6 +707,14 @@
goto error;
Py_DECREF(newglobal);
}
+ else {
+ /* Special-case __class__ */
+ if (!GET_IDENTIFIER(__class__))
+ goto error;
+ assert(PySet_Contains(local, __class__) == 1);
+ if (PySet_Add(newbound, __class__) < 0)
+ goto error;
+ }
/* Recursively call analyze_block() on each child block */
for (i = 0; i < PyList_GET_SIZE(ste->ste_children); ++i) {
@@ -716,8 +729,12 @@
ste->ste_child_free = 1;
}
- /* Check if any local variables need to be converted to cell variables */
- if (ste->ste_type == FunctionBlock && !analyze_cells(scopes, newfree))
+ /* Check if any local variables must be converted to cell variables */
+ if (ste->ste_type == FunctionBlock && !analyze_cells(scopes, newfree,
+ NULL))
+ goto error;
+ else if (ste->ste_type == ClassBlock && !analyze_cells(scopes, newfree,
+ "__class__"))
goto error;
/* Records the results of the analysis in the symbol table entry */
if (!update_symbols(ste->ste_symbols, scopes, bound, newfree,
@@ -1034,6 +1051,11 @@
if (!symtable_enter_block(st, s->v.ClassDef.name, ClassBlock,
(void *)s, s->lineno))
return 0;
+ if (!GET_IDENTIFIER(__class__) ||
+ !symtable_add_def(st, __class__, DEF_LOCAL)) {
+ symtable_exit_block(st, s);
+ return 0;
+ }
tmp = st->st_private;
st->st_private = s->v.ClassDef.name;
VISIT_SEQ_IN_BLOCK(st, stmt, s->v.ClassDef.body, s);
@@ -1301,6 +1323,14 @@
if (!symtable_add_def(st, e->v.Name.id,
e->v.Name.ctx == Load ? USE : DEF_LOCAL))
return 0;
+ /* Special-case super: it counts as a use of __class__ */
+ if (e->v.Name.ctx == Load &&
+ st->st_cur->ste_type == FunctionBlock &&
+ !strcmp(PyString_AS_STRING(e->v.Name.id), "super")) {
+ if (!GET_IDENTIFIER(__class__) ||
+ !symtable_add_def(st, __class__, USE))
+ return 0;
+ }
break;
/* child nodes of List and Tuple will have expr_context set */
case List_kind:
Modified: python/branches/cpy_merge/README
==============================================================================
--- python/branches/cpy_merge/README (original)
+++ python/branches/cpy_merge/README Thu Jun 14 21:06:29 2007
@@ -666,7 +666,11 @@
News regarding these platforms with more recent Cygwin
versions would be appreciated!
-AtheOS: From Octavian Cerna <tavy at ylabs.com>:
+AtheOS: Official support has been stopped as of Python 2.6. All code will be
+ removed in Python 2.7 unless a maintainer steps forward for this
+ platform.
+
+ From Octavian Cerna <tavy at ylabs.com>:
Before building:
Modified: python/branches/cpy_merge/Tools/i18n/msgfmt.py
==============================================================================
--- python/branches/cpy_merge/Tools/i18n/msgfmt.py (original)
+++ python/branches/cpy_merge/Tools/i18n/msgfmt.py Thu Jun 14 21:06:29 2007
@@ -83,7 +83,7 @@
voffsets += [l2, o2+valuestart]
offsets = koffsets + voffsets
output = struct.pack("Iiiiiii",
- 0x950412deL, # Magic
+ 0x950412de, # Magic
0, # Version
len(keys), # # of entries
7*4, # start of key index
Modified: python/branches/cpy_merge/Tools/pybench/Arithmetic.py
==============================================================================
--- python/branches/cpy_merge/Tools/pybench/Arithmetic.py (original)
+++ python/branches/cpy_merge/Tools/pybench/Arithmetic.py Thu Jun 14 21:06:29 2007
@@ -476,9 +476,9 @@
for i in range(self.rounds):
- a = 2220001L
- b = 100001L
- c = 30005L
+ a = 2220001
+ b = 100001
+ c = 30005
c = a + b
c = b + c
@@ -504,9 +504,9 @@
c = b / a
c = c / b
- a = 2220001L
- b = 100001L
- c = 30005L
+ a = 2220001
+ b = 100001
+ c = 30005
c = a + b
c = b + c
@@ -532,9 +532,9 @@
c = b / a
c = c / b
- a = 2220001L
- b = 100001L
- c = 30005L
+ a = 2220001
+ b = 100001
+ c = 30005
c = a + b
c = b + c
@@ -560,9 +560,9 @@
c = b / a
c = c / b
- a = 2220001L
- b = 100001L
- c = 30005L
+ a = 2220001
+ b = 100001
+ c = 30005
c = a + b
c = b + c
@@ -588,9 +588,9 @@
c = b / a
c = c / b
- a = 2220001L
- b = 100001L
- c = 30005L
+ a = 2220001
+ b = 100001
+ c = 30005
c = a + b
c = b + c
Modified: python/branches/cpy_merge/Tools/pybench/CommandLine.py
==============================================================================
--- python/branches/cpy_merge/Tools/pybench/CommandLine.py (original)
+++ python/branches/cpy_merge/Tools/pybench/CommandLine.py Thu Jun 14 21:06:29 2007
@@ -82,7 +82,7 @@
else:
f = open(name, mode)
if 'w' in mode:
- os.chmod(name, 0600)
+ os.chmod(name, 0o600)
return f
def option_dict(options):
Modified: python/branches/cpy_merge/Tools/pybench/Numbers.py
==============================================================================
--- python/branches/cpy_merge/Tools/pybench/Numbers.py (original)
+++ python/branches/cpy_merge/Tools/pybench/Numbers.py Thu Jun 14 21:06:29 2007
@@ -598,185 +598,185 @@
for i in range(self.rounds):
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
+ 1234567890 < 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 == 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 < 3456789012345
+
+ 1234567890 < 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 == 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 < 3456789012345
+
+ 1234567890 < 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 == 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 < 3456789012345
+
+ 1234567890 < 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 == 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 < 3456789012345
+
+ 1234567890 < 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 == 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 < 3456789012345
+
+ 1234567890 < 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 == 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 < 3456789012345
+
+ 1234567890 < 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 == 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 < 3456789012345
+
+ 1234567890 < 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 == 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 < 3456789012345
+
+ 1234567890 < 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 == 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 < 3456789012345
+
+ 1234567890 < 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 == 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 < 3456789012345
+
+ 1234567890 < 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 == 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 < 3456789012345
+
+ 1234567890 < 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 == 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 < 3456789012345
+
+ 1234567890 < 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 == 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 < 3456789012345
+
+ 1234567890 < 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 == 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 < 3456789012345
+
+ 1234567890 < 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 == 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 < 3456789012345
+
+ 1234567890 < 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 == 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 < 3456789012345
+
+ 1234567890 < 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 == 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 < 3456789012345
+
+ 1234567890 < 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 == 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 < 3456789012345
+
+ 1234567890 < 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 == 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 < 3456789012345
+
+ 1234567890 < 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 == 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 < 3456789012345
+
+ 1234567890 < 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 == 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 < 3456789012345
+
+ 1234567890 < 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 == 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 < 3456789012345
+
+ 1234567890 < 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 == 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 < 3456789012345
+
+ 1234567890 < 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 == 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 < 3456789012345
+
+ 1234567890 < 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 == 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 < 3456789012345
+
+ 1234567890 < 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 == 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 < 3456789012345
+
+ 1234567890 < 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 == 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 < 3456789012345
+
+ 1234567890 < 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 == 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 < 3456789012345
+
+ 1234567890 < 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 == 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 < 3456789012345
+
+ 1234567890 < 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 == 3456789012345
+ 1234567890 > 3456789012345
+ 1234567890 < 3456789012345
def calibrate(self):
Modified: python/branches/cpy_merge/Tools/pybench/systimes.py
==============================================================================
--- python/branches/cpy_merge/Tools/pybench/systimes.py (original)
+++ python/branches/cpy_merge/Tools/pybench/systimes.py Thu Jun 14 21:06:29 2007
@@ -180,9 +180,9 @@
### Testing
def some_workload():
- x = 0L
- for i in range(10000000L):
- x = x + 1L
+ x = 0
+ for i in range(10000000):
+ x = x + 1
def test_workload():
print 'Testing systimes() under load conditions'
Modified: python/branches/cpy_merge/Tools/scripts/classfix.py
==============================================================================
--- python/branches/cpy_merge/Tools/scripts/classfix.py (original)
+++ python/branches/cpy_merge/Tools/scripts/classfix.py Thu Jun 14 21:06:29 2007
@@ -129,7 +129,7 @@
# First copy the file's mode to the temp file
try:
statbuf = os.stat(filename)
- os.chmod(tempname, statbuf[ST_MODE] & 07777)
+ os.chmod(tempname, statbuf[ST_MODE] & 0o7777)
except os.error as msg:
err('%s: warning: chmod failed (%r)\n' % (tempname, msg))
# Then make a backup of the original file as filename~
Modified: python/branches/cpy_merge/Tools/scripts/fixcid.py
==============================================================================
--- python/branches/cpy_merge/Tools/scripts/fixcid.py (original)
+++ python/branches/cpy_merge/Tools/scripts/fixcid.py Thu Jun 14 21:06:29 2007
@@ -174,7 +174,7 @@
# First copy the file's mode to the temp file
try:
statbuf = os.stat(filename)
- os.chmod(tempname, statbuf[ST_MODE] & 07777)
+ os.chmod(tempname, statbuf[ST_MODE] & 0o7777)
except os.error as msg:
err(tempname + ': warning: chmod failed (' + str(msg) + ')\n')
# Then make a backup of the original file as filename~
Modified: python/branches/cpy_merge/Tools/scripts/ftpmirror.py
==============================================================================
--- python/branches/cpy_merge/Tools/scripts/ftpmirror.py (original)
+++ python/branches/cpy_merge/Tools/scripts/ftpmirror.py Thu Jun 14 21:06:29 2007
@@ -375,7 +375,7 @@
return
dirname = os.path.dirname(pathname)
if dirname: makedir(dirname)
- os.mkdir(pathname, 0777)
+ os.mkdir(pathname, 0o777)
# Write a dictionary to a file in a way that can be read back using
# rval() but is still somewhat readable (i.e. not a single long line).
Modified: python/branches/cpy_merge/Tools/scripts/linktree.py
==============================================================================
--- python/branches/cpy_merge/Tools/scripts/linktree.py (original)
+++ python/branches/cpy_merge/Tools/scripts/linktree.py Thu Jun 14 21:06:29 2007
@@ -31,7 +31,7 @@
print oldtree + ': not a directory'
return 1
try:
- os.mkdir(newtree, 0777)
+ os.mkdir(newtree, 0o777)
except os.error as msg:
print newtree + ': cannot mkdir:', msg
return 1
@@ -63,7 +63,7 @@
if os.path.isdir(oldname) and \
not os.path.islink(oldname):
try:
- os.mkdir(newname, 0777)
+ os.mkdir(newname, 0o777)
ok = 1
except:
print newname + \
Modified: python/branches/cpy_merge/Tools/scripts/methfix.py
==============================================================================
--- python/branches/cpy_merge/Tools/scripts/methfix.py (original)
+++ python/branches/cpy_merge/Tools/scripts/methfix.py Thu Jun 14 21:06:29 2007
@@ -140,7 +140,7 @@
# First copy the file's mode to the temp file
try:
statbuf = os.stat(filename)
- os.chmod(tempname, statbuf[ST_MODE] & 07777)
+ os.chmod(tempname, statbuf[ST_MODE] & 0o7777)
except os.error as msg:
err('%s: warning: chmod failed (%r)\n' % (tempname, msg))
# Then make a backup of the original file as filename~
Modified: python/branches/cpy_merge/Tools/scripts/pathfix.py
==============================================================================
--- python/branches/cpy_merge/Tools/scripts/pathfix.py (original)
+++ python/branches/cpy_merge/Tools/scripts/pathfix.py Thu Jun 14 21:06:29 2007
@@ -121,7 +121,7 @@
# First copy the file's mode to the temp file
try:
statbuf = os.stat(filename)
- os.chmod(tempname, statbuf[ST_MODE] & 07777)
+ os.chmod(tempname, statbuf[ST_MODE] & 0o7777)
except os.error as msg:
err('%s: warning: chmod failed (%r)\n' % (tempname, msg))
# Then make a backup of the original file as filename~
Modified: python/branches/cpy_merge/Tools/scripts/which.py
==============================================================================
--- python/branches/cpy_merge/Tools/scripts/which.py (original)
+++ python/branches/cpy_merge/Tools/scripts/which.py Thu Jun 14 21:06:29 2007
@@ -35,7 +35,7 @@
msg(filename + ': not a disk file')
else:
mode = S_IMODE(st[ST_MODE])
- if mode & 0111:
+ if mode & 0o111:
if not ident:
print filename
ident = st[:3]
Modified: python/branches/cpy_merge/Tools/unicode/makeunicodedata.py
==============================================================================
--- python/branches/cpy_merge/Tools/unicode/makeunicodedata.py (original)
+++ python/branches/cpy_merge/Tools/unicode/makeunicodedata.py Thu Jun 14 21:06:29 2007
@@ -757,7 +757,7 @@
h = 0
for c in map(ord, s.upper()):
h = (h * magic) + c
- ix = h & 0xff000000L
+ ix = h & 0xff000000
if ix:
h = (h ^ ((ix>>24) & 0xff)) & 0x00ffffff
return h
Modified: python/branches/cpy_merge/Tools/versioncheck/pyversioncheck.py
==============================================================================
--- python/branches/cpy_merge/Tools/versioncheck/pyversioncheck.py (original)
+++ python/branches/cpy_merge/Tools/versioncheck/pyversioncheck.py Thu Jun 14 21:06:29 2007
@@ -1,5 +1,4 @@
"""pyversioncheck - Module to help with checking versions"""
-import types
import rfc822
import urllib
import sys
@@ -35,7 +34,7 @@
def checkonly(package, url, version, verbose=0):
if verbose >= VERBOSE_EACHFILE:
print '%s:'%package
- if type(url) == types.StringType:
+ if isinstance(url, str):
ok, newversion, fp = _check1version(package, url, version, verbose)
else:
for u in url:
Modified: python/branches/cpy_merge/Tools/webchecker/websucker.py
==============================================================================
--- python/branches/cpy_merge/Tools/webchecker/websucker.py (original)
+++ python/branches/cpy_merge/Tools/webchecker/websucker.py Thu Jun 14 21:06:29 2007
@@ -119,7 +119,7 @@
print "Huh? Don't know how to make dir", dir
return
makedirs(head)
- os.mkdir(dir, 0777)
+ os.mkdir(dir, 0o777)
if __name__ == '__main__':
sys.exit(main() or 0)
Modified: python/branches/cpy_merge/configure
==============================================================================
--- python/branches/cpy_merge/configure (original)
+++ python/branches/cpy_merge/configure Thu Jun 14 21:06:29 2007
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 53610 .
+# From configure.in Revision: 54283 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 3.0.
#
@@ -3753,7 +3753,7 @@
# Check for unsupported systems
case $ac_sys_system/$ac_sys_release in
-Linux*/1*)
+atheos*|Linux*/1*)
echo This system \($ac_sys_system/$ac_sys_release\) is no longer supported.
echo See README for details.
exit 1;;
Modified: python/branches/cpy_merge/configure.in
==============================================================================
--- python/branches/cpy_merge/configure.in (original)
+++ python/branches/cpy_merge/configure.in Thu Jun 14 21:06:29 2007
@@ -450,7 +450,7 @@
# Check for unsupported systems
case $ac_sys_system/$ac_sys_release in
-Linux*/1*)
+atheos*|Linux*/1*)
echo This system \($ac_sys_system/$ac_sys_release\) is no longer supported.
echo See README for details.
exit 1;;
Modified: python/branches/cpy_merge/setup.py
==============================================================================
--- python/branches/cpy_merge/setup.py (original)
+++ python/branches/cpy_merge/setup.py Thu Jun 14 21:06:29 2007
@@ -1503,8 +1503,8 @@
def install(self):
outfiles = install_lib.install(self)
- self.set_file_modes(outfiles, 0644, 0755)
- self.set_dir_modes(self.install_dir, 0755)
+ self.set_file_modes(outfiles, 0o644, 0o755)
+ self.set_dir_modes(self.install_dir, 0o755)
return outfiles
def set_file_modes(self, files, defaultMode, sharedLibMode):
More information about the Python-checkins
mailing list