]> granicus.if.org Git - python/commit
Recorded merge of revisions 81032 via svnmerge from
authorAntoine Pitrou <solipsis@pitrou.net>
Sun, 9 May 2010 16:14:21 +0000 (16:14 +0000)
committerAntoine Pitrou <solipsis@pitrou.net>
Sun, 9 May 2010 16:14:21 +0000 (16:14 +0000)
commit7f14f0d8a0228c50d5b5de2acbfe9a64ebc6749a
treed25489e9531c01f1e9244012bbfaa929f382883e
parentb7d943625cf4353f6cb72df16252759f2dbd8e06
Recorded merge of revisions 81032 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r81032 | antoine.pitrou | 2010-05-09 17:52:27 +0200 (dim., 09 mai 2010) | 9 lines

  Recorded merge of revisions 81029 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines

    Untabify C files. Will watch buildbots.
  ........
................
251 files changed:
Demo/embed/demo.c
Demo/embed/loop.c
Demo/pysvr/pysvr.c
Include/abstract.h
Include/ceval.h
Include/datetime.h
Include/descrobject.h
Include/dictobject.h
Include/object.h
Include/objimpl.h
Include/pyerrors.h
Include/pymacconfig.h
Include/pyport.h
Include/pythonrun.h
Include/setobject.h
Include/structseq.h
Include/symtable.h
Include/unicodeobject.h
Misc/setuid-prog.c
Modules/_bisectmodule.c
Modules/_codecsmodule.c
Modules/_collectionsmodule.c
Modules/_csv.c
Modules/_ctypes/_ctypes.c
Modules/_ctypes/_ctypes_test.c
Modules/_ctypes/callbacks.c
Modules/_ctypes/callproc.c
Modules/_ctypes/cfield.c
Modules/_ctypes/ctypes.h
Modules/_ctypes/darwin/dlfcn_simple.c
Modules/_ctypes/malloc_closure.c
Modules/_ctypes/stgdict.c
Modules/_curses_panel.c
Modules/_dbmmodule.c
Modules/_functoolsmodule.c
Modules/_gdbmmodule.c
Modules/_gestalt.c
Modules/_heapqmodule.c
Modules/_json.c
Modules/_localemodule.c
Modules/_lsprof.c
Modules/_multiprocessing/connection.h
Modules/_multiprocessing/multiprocessing.c
Modules/_multiprocessing/multiprocessing.h
Modules/_multiprocessing/pipe_connection.c
Modules/_multiprocessing/semaphore.c
Modules/_multiprocessing/socket_connection.c
Modules/_multiprocessing/win32_functions.c
Modules/_randommodule.c
Modules/_scproxy.c
Modules/_sqlite/module.c
Modules/_struct.c
Modules/_testcapimodule.c
Modules/_threadmodule.c
Modules/_tkinter.c
Modules/addrinfo.h
Modules/arraymodule.c
Modules/audioop.c
Modules/binascii.c
Modules/bz2module.c
Modules/cjkcodecs/_codecs_cn.c
Modules/cjkcodecs/_codecs_hk.c
Modules/cjkcodecs/_codecs_iso2022.c
Modules/cjkcodecs/_codecs_jp.c
Modules/cjkcodecs/_codecs_kr.c
Modules/cjkcodecs/_codecs_tw.c
Modules/cjkcodecs/alg_jisx0201.h
Modules/cjkcodecs/cjkcodecs.h
Modules/cjkcodecs/emu_jisx0213_2000.h
Modules/cjkcodecs/multibytecodec.c
Modules/cjkcodecs/multibytecodec.h
Modules/cmathmodule.c
Modules/cryptmodule.c
Modules/datetimemodule.c
Modules/errnomodule.c
Modules/fcntlmodule.c
Modules/fpectlmodule.c
Modules/fpetestmodule.c
Modules/gcmodule.c
Modules/getaddrinfo.c
Modules/getbuildinfo.c
Modules/getnameinfo.c
Modules/getpath.c
Modules/grpmodule.c
Modules/itertoolsmodule.c
Modules/main.c
Modules/mathmodule.c
Modules/md5module.c
Modules/mmapmodule.c
Modules/nismodule.c
Modules/operator.c
Modules/ossaudiodev.c
Modules/parsermodule.c
Modules/pwdmodule.c
Modules/pyexpat.c
Modules/python.c
Modules/readline.c
Modules/resource.c
Modules/rotatingtree.c
Modules/selectmodule.c
Modules/sha1module.c
Modules/sha256module.c
Modules/sha512module.c
Modules/signalmodule.c
Modules/socketmodule.c
Modules/socketmodule.h
Modules/spwdmodule.c
Modules/symtablemodule.c
Modules/syslogmodule.c
Modules/termios.c
Modules/testcapi_long.h
Modules/timemodule.c
Modules/tkappinit.c
Modules/unicodedata.c
Modules/xxmodule.c
Modules/xxsubtype.c
Modules/zipimport.c
Modules/zlibmodule.c
Objects/abstract.c
Objects/boolobject.c
Objects/bytes_methods.c
Objects/bytesobject.c
Objects/cellobject.c
Objects/classobject.c
Objects/codeobject.c
Objects/complexobject.c
Objects/descrobject.c
Objects/dictobject.c
Objects/enumobject.c
Objects/exceptions.c
Objects/fileobject.c
Objects/floatobject.c
Objects/frameobject.c
Objects/funcobject.c
Objects/genobject.c
Objects/iterobject.c
Objects/listobject.c
Objects/longobject.c
Objects/methodobject.c
Objects/moduleobject.c
Objects/object.c
Objects/obmalloc.c
Objects/rangeobject.c
Objects/setobject.c
Objects/sliceobject.c
Objects/stringlib/eq.h
Objects/stringlib/partition.h
Objects/stringlib/string_format.h
Objects/stringlib/transmogrify.h
Objects/structseq.c
Objects/tupleobject.c
Objects/typeobject.c
Objects/unicodectype.c
Objects/weakrefobject.c
PC/VS7.1/make_buildinfo.c
PC/VS8.0/make_buildinfo.c
PC/_msi.c
PC/_subprocess.c
PC/bdist_wininst/archive.h
PC/bdist_wininst/extract.c
PC/bdist_wininst/install.c
PC/config.c
PC/dl_nt.c
PC/errmap.h
PC/example_nt/example.c
PC/frozen_dllmain.c
PC/generrmap.c
PC/getpathp.c
PC/import_nt.c
PC/make_versioninfo.c
PC/msvcrtmodule.c
PC/os2emx/config.c
PC/os2emx/dlfcn.c
PC/os2emx/dllentry.c
PC/os2emx/getpathp.c
PC/os2emx/pythonpm.c
PC/os2vacpp/getpathp.c
PC/winreg.c
PC/winsound.c
PCbuild/make_buildinfo.c
Parser/acceler.c
Parser/bitset.c
Parser/firstsets.c
Parser/grammar.c
Parser/grammar1.c
Parser/intrcheck.c
Parser/listnode.c
Parser/metagrammar.c
Parser/myreadline.c
Parser/node.c
Parser/parser.c
Parser/parsetok.c
Parser/pgen.c
Parser/pgenmain.c
Parser/printgrammar.c
Parser/tokenizer.c
Parser/tokenizer.h
Python/_warnings.c
Python/asdl.c
Python/ast.c
Python/bltinmodule.c
Python/ceval.c
Python/codecs.c
Python/compile.c
Python/dynload_aix.c
Python/dynload_atheos.c
Python/dynload_hpux.c
Python/dynload_next.c
Python/dynload_os2.c
Python/dynload_shlib.c
Python/dynload_win.c
Python/errors.c
Python/frozen.c
Python/frozenmain.c
Python/future.c
Python/getargs.c
Python/getcwd.c
Python/getopt.c
Python/import.c
Python/importdl.c
Python/importdl.h
Python/makeopcodetargets.py
Python/marshal.c
Python/modsupport.c
Python/mysnprintf.c
Python/mystrtoul.c
Python/opcode_targets.h
Python/peephole.c
Python/pyarena.c
Python/pymath.c
Python/pystate.c
Python/pystrcmp.c
Python/pystrtod.c
Python/pythonrun.c
Python/structmember.c
Python/symtable.c
Python/sysmodule.c
Python/thread.c
Python/thread_atheos.h
Python/thread_cthread.h
Python/thread_foobar.h
Python/thread_lwp.h
Python/thread_nt.h
Python/thread_os2.h
Python/thread_pth.h
Python/thread_pthread.h
Python/thread_sgi.h
Python/thread_solaris.h
Python/thread_wince.h
Python/traceback.c
Tools/msi/msisupport.c