Commits

Ronny Pfannschmidt  committed 1b135cf Merge

correction merge with the vendor/stdlib branch

  • Participants
  • Parent commits a2b38f3, 89a76ae
  • Branches stdlib-2.7.3

Comments (0)

Files changed (126)

File lib-python/2.7/ctypes/__init__.py

File contents unchanged.

File lib-python/2.7/ctypes/_endian.py

File contents unchanged.

File lib-python/2.7/ctypes/test/test_as_parameter.py

File contents unchanged.

File lib-python/2.7/ctypes/test/test_buffers.py

File contents unchanged.

File lib-python/2.7/ctypes/test/test_byteswap.py

File contents unchanged.

File lib-python/2.7/ctypes/test/test_callbacks.py

File contents unchanged.

File lib-python/2.7/ctypes/test/test_functions.py

File contents unchanged.

File lib-python/2.7/ctypes/test/test_structures.py

File contents unchanged.

File lib-python/2.7/ctypes/util.py

File contents unchanged.

File lib-python/2.7/distutils/__init__.py

File contents unchanged.

File lib-python/2.7/distutils/ccompiler.py

File contents unchanged.

File lib-python/2.7/distutils/command/bdist_dumb.py

File contents unchanged.

File lib-python/2.7/distutils/command/bdist_msi.py

File contents unchanged.

File lib-python/2.7/distutils/command/bdist_wininst.py

File contents unchanged.

File lib-python/2.7/distutils/command/build_clib.py

File contents unchanged.

File lib-python/2.7/distutils/command/build_ext.py

File contents unchanged.

File lib-python/2.7/distutils/command/check.py

File contents unchanged.

File lib-python/2.7/distutils/command/config.py

File contents unchanged.

File lib-python/2.7/distutils/command/register.py

File contents unchanged.

File lib-python/2.7/distutils/command/sdist.py

File contents unchanged.

File lib-python/2.7/distutils/dep_util.py

File contents unchanged.

File lib-python/2.7/distutils/dist.py

File contents unchanged.

File lib-python/2.7/distutils/filelist.py

File contents unchanged.

File lib-python/2.7/distutils/msvc9compiler.py

File contents unchanged.

File lib-python/2.7/distutils/spawn.py

File contents unchanged.

File lib-python/2.7/distutils/sysconfig.py

File contents unchanged.

File lib-python/2.7/distutils/tests/support.py

File contents unchanged.

File lib-python/2.7/distutils/tests/test_archive_util.py

File contents unchanged.

File lib-python/2.7/distutils/tests/test_bdist.py

File contents unchanged.

File lib-python/2.7/distutils/tests/test_build_clib.py

File contents unchanged.

File lib-python/2.7/distutils/tests/test_build_ext.py

File contents unchanged.

File lib-python/2.7/distutils/tests/test_ccompiler.py

File contents unchanged.

File lib-python/2.7/distutils/tests/test_check.py

File contents unchanged.

File lib-python/2.7/distutils/tests/test_config_cmd.py

File contents unchanged.

File lib-python/2.7/distutils/tests/test_dist.py

File contents unchanged.

File lib-python/2.7/distutils/tests/test_filelist.py

File contents unchanged.

File lib-python/2.7/distutils/tests/test_install.py

File contents unchanged.

File lib-python/2.7/distutils/tests/test_msvc9compiler.py

File contents unchanged.

File lib-python/2.7/distutils/tests/test_register.py

File contents unchanged.

File lib-python/2.7/distutils/tests/test_sdist.py

File contents unchanged.

File lib-python/2.7/distutils/util.py

File contents unchanged.

File lib-python/2.7/heapq.py

File contents unchanged.

File lib-python/2.7/httplib.py

File contents unchanged.

File lib-python/2.7/idlelib/AutoComplete.py

File contents unchanged.

File lib-python/2.7/idlelib/EditorWindow.py

File contents unchanged.

File lib-python/2.7/idlelib/IOBinding.py

File contents unchanged.

File lib-python/2.7/idlelib/PyShell.py

File contents unchanged.

File lib-python/2.7/idlelib/ScriptBinding.py

File contents unchanged.

File lib-python/2.7/idlelib/idlever.py

File contents unchanged.

File lib-python/2.7/idlelib/textView.py

File contents unchanged.

File lib-python/2.7/inspect.py

File contents unchanged.

File lib-python/2.7/json/__init__.py

File contents unchanged.

File lib-python/2.7/json/tests/test_unicode.py

File contents unchanged.

File lib-python/2.7/lib2to3/Grammar.txt

File contents unchanged.

File lib-python/2.7/lib2to3/main.py

File contents unchanged.

File lib-python/2.7/lib2to3/refactor.py

File contents unchanged.

File lib-python/2.7/lib2to3/tests/test_main.py

File contents unchanged.

File lib-python/2.7/lib2to3/tests/test_refactor.py

File contents unchanged.

File lib-python/2.7/mailbox.py

File contents unchanged.

File lib-python/2.7/multiprocessing/__init__.py

File contents unchanged.

File lib-python/2.7/multiprocessing/connection.py

File contents unchanged.

File lib-python/2.7/multiprocessing/heap.py

File contents unchanged.

File lib-python/2.7/multiprocessing/managers.py

File contents unchanged.

File lib-python/2.7/multiprocessing/pool.py

File contents unchanged.

File lib-python/2.7/multiprocessing/queues.py

File contents unchanged.

File lib-python/2.7/pickle.py

File contents unchanged.

File lib-python/2.7/pkgutil.py

File contents unchanged.

File lib-python/2.7/pydoc.py

File contents unchanged.

File lib-python/2.7/random.py

File contents unchanged.

File lib-python/2.7/site.py

File contents unchanged.

File lib-python/2.7/sqlite3/dump.py

File contents unchanged.

File lib-python/2.7/sqlite3/test/dbapi.py

File contents unchanged.

File lib-python/2.7/sqlite3/test/dump.py

File contents unchanged.

File lib-python/2.7/sqlite3/test/factory.py

File contents unchanged.

File lib-python/2.7/sqlite3/test/hooks.py

File contents unchanged.

File lib-python/2.7/sqlite3/test/regression.py

File contents unchanged.

File lib-python/2.7/sqlite3/test/userfunctions.py

File contents unchanged.

File lib-python/2.7/ssl.py

File contents unchanged.

File lib-python/2.7/subprocess.py

File contents unchanged.

File lib-python/2.7/sysconfig.py

File contents unchanged.

File lib-python/2.7/tarfile.py

File contents unchanged.

File lib-python/2.7/test/mapping_tests.py

File contents unchanged.

File lib-python/2.7/test/pickletester.py

File contents unchanged.

File lib-python/2.7/test/regrtest.py

File contents unchanged.

File lib-python/2.7/test/test_aifc.py

File contents unchanged.

File lib-python/2.7/test/test_argparse.py

File contents unchanged.

File lib-python/2.7/test/test_array.py

File contents unchanged.

File lib-python/2.7/test/test_ast.py

File contents unchanged.

File lib-python/2.7/test/test_csv.py

File contents unchanged.

File lib-python/2.7/test/test_descr.py

File contents unchanged.

File lib-python/2.7/test/test_dis.py

File contents unchanged.

File lib-python/2.7/test/test_doctest.py

File contents unchanged.

File lib-python/2.7/test/test_fcntl.py

File contents unchanged.

File lib-python/2.7/test/test_import.py

File contents unchanged.

File lib-python/2.7/test/test_inspect.py

File contents unchanged.

File lib-python/2.7/test/test_io.py

File contents unchanged.

File lib-python/2.7/test/test_itertools.py

File contents unchanged.

File lib-python/2.7/test/test_mailbox.py

File contents unchanged.

File lib-python/2.7/test/test_module.py

File contents unchanged.

File lib-python/2.7/test/test_multibytecodec_support.py

File contents unchanged.

File lib-python/2.7/test/test_multiprocessing.py

File contents unchanged.

File lib-python/2.7/test/test_os.py

File contents unchanged.

File lib-python/2.7/test/test_pydoc.py

File contents unchanged.

File lib-python/2.7/test/test_set.py

File contents unchanged.

File lib-python/2.7/test/test_site.py

File contents unchanged.

File lib-python/2.7/test/test_socket.py

File contents unchanged.

File lib-python/2.7/test/test_ssl.py

File contents unchanged.

File lib-python/2.7/test/test_subprocess.py

File contents unchanged.

File lib-python/2.7/test/test_support.py

File contents unchanged.

File lib-python/2.7/test/test_sys.py

File contents unchanged.

File lib-python/2.7/test/test_sys_settrace.py

File contents unchanged.

File lib-python/2.7/test/test_sysconfig.py

File contents unchanged.

File lib-python/2.7/test/test_tarfile.py

File contents unchanged.

File lib-python/2.7/test/test_telnetlib.py

File contents unchanged.

File lib-python/2.7/test/test_tempfile.py

File contents unchanged.

File lib-python/2.7/test/test_threading.py

File contents unchanged.

File lib-python/2.7/test/test_unicode.py

File contents unchanged.

File lib-python/2.7/test/test_urllib2.py

File contents unchanged.

File lib-python/2.7/test/test_warnings.py

File contents unchanged.

File lib-python/2.7/test/test_xml_etree.py

File contents unchanged.

File lib-python/2.7/test/test_xpickle.py

File contents unchanged.

File lib-python/2.7/test/test_zipfile.py

File contents unchanged.

File lib-python/2.7/trace.py

File contents unchanged.

File lib-python/2.7/urllib2.py

File contents unchanged.

File lib-python/2.7/zipfile.py

File contents unchanged.

File lib-python/stdlib-version.txt

 the putputs for hg id of each are:
 
     2.7::
-        5395f96588d4 (2.7) v2.7.1
+        70274d53c1dd (2.7) v2.7.3
     3.2::
         3d0686d90f55 (3.2) v3.2.3