merge 2.6 with hash randomization fix

diff --cc Doc/library/sys.rst
index a52b0d6065355ce33ef5dddde632979ba4cf7992,76d84e480e19e8b103ca87abf2766b11b139f316..3873eb8ad173892e1d41fcdaffd8d2d5b6cc8049
--- 1/Doc/library/sys.rst
--- 2/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@@ -268,25 -256,44 +268,26 @@@ always available
     The struct sequence *flags* exposes the status of command line flags. The
     attributes are read only.
  
 -   +------------------------------+------------------------------------------+
 -   | attribute                    | flag                                     |
 -   +==============================+==========================================+
 -   | :const:`debug`               | -d                                       |
 -   +------------------------------+------------------------------------------+
 -   | :const:`py3k_warning`        | -3                                       |
 -   +------------------------------+------------------------------------------+
 -   | :const:`division_warning`    | -Q                                       |
 -   +------------------------------+------------------------------------------+
 -   | :const:`division_new`        | -Qnew                                    |
 -   +------------------------------+------------------------------------------+
 -   | :const:`inspect`             | -i                                       |
 -   +------------------------------+------------------------------------------+
 -   | :const:`interactive`         | -i                                       |
 -   +------------------------------+------------------------------------------+
 -   | :const:`optimize`            | -O or -OO                                |
 -   +------------------------------+------------------------------------------+
 -   | :const:`dont_write_bytecode` | -B                                       |
 -   +------------------------------+------------------------------------------+
 -   | :const:`no_user_site`        | -s                                       |
 -   +------------------------------+------------------------------------------+
 -   | :const:`no_site`             | -S                                       |
 -   +------------------------------+------------------------------------------+
 -   | :const:`ignore_environment`  | -E                                       |
 -   +------------------------------+------------------------------------------+
 -   | :const:`tabcheck`            | -t or -tt                                |
 -   +------------------------------+------------------------------------------+
 -   | :const:`verbose`             | -v                                       |
 -   +------------------------------+------------------------------------------+
 -   | :const:`unicode`             | -U                                       |
 -   +------------------------------+------------------------------------------+
 -   | :const:`bytes_warning`       | -b                                       |
 -   +------------------------------+------------------------------------------+
 -   +------------------------------+------------------------------------------+
 -   | :const:`hash_randomization`  | -R                                       |
 -   |                              |                                          |
 -   |                              | .. versionadded:: 2.6.8                  |
 -   +------------------------------+------------------------------------------+
 +   ============================= ===================================
 +   attribute                     flag
 +   ============================= ===================================
 +   :const:`debug`                :option:`-d`
 +   :const:`py3k_warning`         :option:`-3`
 +   :const:`division_warning`     :option:`-Q`
 +   :const:`division_new`         :option:`-Qnew <-Q>`
 +   :const:`inspect`              :option:`-i`
 +   :const:`interactive`          :option:`-i`
 +   :const:`optimize`             :option:`-O` or :option:`-OO`
 +   :const:`dont_write_bytecode`  :option:`-B`
 +   :const:`no_user_site`         :option:`-s`
 +   :const:`no_site`              :option:`-S`
 +   :const:`ignore_environment`   :option:`-E`
 +   :const:`tabcheck`             :option:`-t` or :option:`-tt <-t>`
 +   :const:`verbose`              :option:`-v`
 +   :const:`unicode`              :option:`-U`
 +   :const:`bytes_warning`        :option:`-b`
++   :const:`hash_randomization`   :option:`-R`
 +   ============================= ===================================
  
     .. versionadded:: 2.6
  

diff --cc Doc/reference/datamodel.rst
Simple merge

diff --cc Doc/using/cmdline.rst
index 29d249f00fb125dfdb39cd690c3bde5bc1a7afb7,38d724f472cf7135617e613421feb2385ed2d947..0d2924de7585be11dfbd684607a509bcfc414a03
--- 1/Doc/using/cmdline.rst
--- 2/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@@ -253,10 -239,32 +253,33 @@@ Miscellaneous option
        :pep:`238` -- Changing the division operator
  
  
+ .. cmdoption:: -R
+ 
+    Turn on hash randomization, so that the :meth:`__hash__` values of str,
+    bytes and datetime objects are "salted" with an unpredictable random value.
+    Although they remain constant within an individual Python process, they are
+    not predictable between repeated invocations of Python.
+ 
+    This is intended to provide protection against a denial-of-service caused by
+    carefully-chosen inputs that exploit the worst case performance of a dict
+    insertion, O(n^2) complexity.  See
+    http://www.ocert.org/advisories/ocert-2011-003.html for details.
+ 
+    Changing hash values affects the order in which keys are retrieved from a
+    dict.  Although Python has never made guarantees about this ordering (and it
+    typically varies between 32-bit and 64-bit builds), enough real-world code
+    implicitly relies on this non-guaranteed behavior that the randomization is
+    disabled by default.
+ 
+    See also :envvar:`PYTHONHASHSEED`.
+ 
+    .. versionadded:: 2.6.8
+ 
+ 
  .. cmdoption:: -s
  
 -   Don't add user site directory to sys.path
 +   Don't add the :data:`user site-packages directory <site.USER_SITE>` to
 +   :data:`sys.path`.
  
     .. versionadded:: 2.6
  

diff --cc Include/object.h
Simple merge

diff --cc Include/pythonrun.h
Simple merge

diff --cc Lib/os.py
Simple merge

diff --cc Lib/test/test_cmd_line.py
Simple merge

diff --cc Lib/test/test_hash.py
Simple merge

diff --cc Lib/test/test_os.py
index eec1621301773a5df08da7b2f60a52d00d4eaf35,0561499ed764ce5a0770e98cd9ca2f5adc3f54da..d52b78462e437d1f6d2d94757bbdaef129945f12
--- 1/Lib/test/test_os.py
--- 2/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@@ -7,12 -6,9 +7,13 @@@ import errn
  import unittest
  import warnings
  import sys
 +import signal
  import subprocess
 +import time
+ 
  from test import test_support
 +import mmap
 +import uuid
  
  warnings.filterwarnings("ignore", "tempnam", RuntimeWarning, __name__)
  warnings.filterwarnings("ignore", "tmpnam", RuntimeWarning, __name__)
@@@ -533,14 -507,40 +534,47 @@@ class URandomTests (unittest.TestCase)
              self.assertEqual(len(os.urandom(100)), 100)
              self.assertEqual(len(os.urandom(1000)), 1000)
              # see http://bugs.python.org/issue3708
-         except NotImplementedError:
-             pass
 +            self.assertRaises(TypeError, os.urandom, 0.9)
 +            self.assertRaises(TypeError, os.urandom, 1.1)
 +            self.assertRaises(TypeError, os.urandom, 2.0)
+             self.assertEqual(len(os.urandom(0.9)), 0)
+             self.assertEqual(len(os.urandom(1.1)), 1)
+             self.assertEqual(len(os.urandom(2.0)), 2)
+ 
+     def test_urandom_length(self):
+         self.assertEqual(len(os.urandom(0)), 0)
+         self.assertEqual(len(os.urandom(1)), 1)
+         self.assertEqual(len(os.urandom(10)), 10)
+         self.assertEqual(len(os.urandom(100)), 100)
+         self.assertEqual(len(os.urandom(1000)), 1000)
+ 
+     def test_urandom_value(self):
+         data1 = os.urandom(16)
+         data2 = os.urandom(16)
+         self.assertNotEqual(data1, data2)
+ 
+     def get_urandom_subprocess(self, count):
+         code = '\n'.join((
+             'import os, sys',
+             'data = os.urandom(%s)' % count,
+             'sys.stdout.write(data)',
+             'sys.stdout.flush()'))
+         cmd_line = [sys.executable, '-c', code]
+         p = subprocess.Popen(cmd_line, stdin=subprocess.PIPE,
+                              stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+         out, err = p.communicate()
+         out = test_support.strip_python_stderr(out)
+         self.assertEqual(len(out), count)
+         return out
+ 
+     def test_urandom_subprocess(self):
+         data1 = self.get_urandom_subprocess(16)
+         data2 = self.get_urandom_subprocess(16)
+         self.assertNotEqual(data1, data2)
++>>>>>>> other
 +
 +    def test_execvpe_with_bad_arglist(self):
 +        self.assertRaises(ValueError, os.execvpe, 'notepad', [], None)
  
  class Win32ErrorTests(unittest.TestCase):
      def test_rename(self):

diff --cc Lib/test/test_set.py
Simple merge

diff --cc Lib/test/test_support.py
index a03cf1473bb67d7b16ea31c50ce210580f6e210e,b572f9abe5e0d986d485727a4f36ee8e786dfd2d..b0a2048c8daeceeb7ca7b6b42f9749cd88523c21
--- 1/Lib/test/test_support.py
--- 2/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@@ -34,10 -24,7 +34,10 @@@ __all__ = ["Error", "TestFailed", "Reso
             "captured_stdout", "TransientResource", "transient_internet",
             "run_with_locale", "set_memlimit", "bigmemtest", "bigaddrspacetest",
             "BasicTestRunner", "run_unittest", "run_doctest", "threading_setup",
 -           "threading_cleanup", "reap_children", "strip_python_stderr"]
 +           "threading_cleanup", "reap_children", "cpython_only",
 +           "check_impl_detail", "get_attribute", "py3k_bytes",
-            "import_fresh_module"]
- 
++           "import_fresh_module", "threading_cleanup", "reap_children",
++           "strip_python_stderr"]
  
  class Error(Exception):
      """Base class for regression test exceptions."""

diff --cc Lib/test/test_sys.py
index 6e37ac4487e2ef89e688ec24b71b5d6b2db10b08,e82569ac02c23cbb05135a8a8822b504694a97d4..12d4d3119492f4f0beb0a722a250c2dbf197d4eb
--- 1/Lib/test/test_sys.py
--- 2/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@@ -438,11 -384,11 +438,11 @@@ class SysModuleTest(unittest.TestCase)
          attrs = ("debug", "py3k_warning", "division_warning", "division_new",
                   "inspect", "interactive", "optimize", "dont_write_bytecode",
                   "no_site", "ignore_environment", "tabcheck", "verbose",
-                  "unicode", "bytes_warning")
+                  "unicode", "bytes_warning", "hash_randomization")
          for attr in attrs:
 -            self.assert_(hasattr(sys.flags, attr), attr)
 +            self.assertTrue(hasattr(sys.flags, attr), attr)
              self.assertEqual(type(getattr(sys.flags, attr)), int, attr)
 -        self.assert_(repr(sys.flags))
 +        self.assertTrue(repr(sys.flags))
  
      def test_clear_type_cache(self):
          sys._clear_type_cache()

diff --cc Makefile.pre.in
index 340da24762140bbbcdeca52446c80e834fa835f9,ce4fbdc460d6984a6b9b1eba5188a9258eb83c6d..e2237a96fa4bb8d1f57e4f692d7e486ade3a95fe
--- 1/Makefile.pre.in
--- 2/Makefile.pre.in
+++ b/Makefile.pre.in
@@@ -739,12 -709,11 +740,12 @@@ buildbottest:   all platfor
                -@if which pybuildbot.identify >/dev/null 2>&1; then \
                        pybuildbot.identify "CC='$(CC)'" "CXX='$(CXX)'"; \
                fi
-               $(TESTPYTHON) $(TESTPROG) -uall -rwW $(TESTOPTS)
 -              $(TESTPYTHON) -R $(TESTPROG) -uall -rw $(TESTOPTS)
++              $(TESTPYTHON) -R $(TESTPROG) -uall -rwW $(TESTOPTS)
  
 -QUICKTESTOPTS=        $(TESTOPTS) -x test_thread test_signal test_strftime \
 -              test_unicodedata test_re test_sre test_select test_poll \
 -              test_linuxaudiodev test_struct test_sunaudiodev test_zlib
 +QUICKTESTOPTS=        $(TESTOPTS) -x test_subprocess test_io test_lib2to3 \
 +              test_multibytecodec test_urllib2_localnet test_itertools \
 +              test_multiprocessing test_mailbox test_socket test_poll \
 +              test_select test_zipfile
  quicktest:    all platform
                -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
                -$(TESTPYTHON) $(TESTPROG) $(QUICKTESTOPTS)

diff --cc Misc/NEWS
index 22adf56c0b0e371a58bcc7bd351239abe3f0d492,2b2f94cacf69b275777e118d40e9606e9220581b..1c049876abb91e7b68ccfe7873bd30ad609ce195
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -9,86 -10,75 +9,91 @@@ What's New in Python 2.7.3
  Core and Builtins
  -----------------
  
 -Library
 --------
 -
 -- Issue #14001: CVE-2012-0845: xmlrpc: Fix an endless loop in
 -  SimpleXMLRPCServer upon malformed POST request.
 -
 -- Issue #13885: CVE-2011-3389: the _ssl module would always disable the CBC
 -  IV attack countermeasure.
 -
 -
 -What's New in Python 2.6.7?
 -===========================
 -
 -*Release date: 2011-06-03*
 +- Issue #13020: Fix a reference leak when allocating a structsequence object
 +  fails.  Patch by Suman Saha.
 +
+ - Issue #13703: oCERT-2011-003: add -R command-line option and PYTHONHASHSEED
+   environment variable, to provide an opt-in way to protect against denial of
+   service attacks due to hash collisions within the dict and set types.  Patch
+   by David Malcolm, based on work by Victor Stinner.
+ 
 +- Issue #11235: Fix OverflowError when trying to import a source file whose
 +  modification time doesn't fit in a 32-bit timestamp.
  
 -*NOTE: Python 2.6 is in security-fix-only mode.  No non-security bug fixes are
 - allowed.  Python 2.6.7 and beyond will be source only releases.*
 +- Issue #11638: Unicode strings in 'name' and 'version' no longer cause
 +  UnicodeDecodeErrors.
  
 -* No changes since 2.6.7rc2.
 +- Fix the fix for issue #12149: it was incorrect, although it had the side
 +  effect of appearing to resolve the issue.  Thanks to Mark Shannon for
 +  noticing.
  
 +- Issue #13546: Fixed an overflow issue that could crash the intepreter when
 +  calling sys.setrecursionlimit((1<<31)-1).
  
 -What's New in Python 2.6.7 rc 2?
 -================================
 +- Issue #13333: The UTF-7 decoder now accepts lone surrogates (the encoder
 +  already accepts them).
  
 -*Release date: 2011-05-20*
 +- Issue #10519: Avoid unnecessary recursive function calls in
 +  setobject.c.
  
 -*NOTE: Python 2.6 is in security-fix-only mode.  No non-security bug fixes are
 - allowed.  Python 2.6.7 and beyond will be source only releases.*
 +- Issue #13268: Fix the assert statement when a tuple is passed as the message.
  
 +- Issue #13018: Fix reference leaks in error paths in dictobject.c.
 +  Patch by Suman Saha.
  
 -Library
 --------
 +- Issue #12604: VTRACE macro expanded to no-op in _sre.c to avoid compiler
 +  warnings. Patch by Josh Triplett and Petri Lehtinen.
  
 -- Issue #11662: Make urllib and urllib2 ignore redirections if the
 -  scheme is not HTTP, HTTPS or FTP (CVE-2011-1521).
 +- Issue #7833: Extension modules built using distutils on Windows will no
 +  longer include a "manifest" to prevent them failing at import time in some
 +  embedded situations.
  
 -- Issue #11442: Add a charset parameter to the Content-type in SimpleHTTPServer
 -  to avoid XSS attacks.
 +- Issue #13186: Fix __delitem__ on old-style instances when invoked through
 +  PySequence_DelItem.
  
 +- Issue #13156: Revert the patch for issue #10517 (reset TLS upon fork()),
 +  which was only relevant for the native pthread TLS implementation.
  
 -What's New in Python 2.6.7 rc 1?
 -================================
 +- Issue #7732: Fix a crash on importing a module if a directory has the same
 +  name than a Python module (e.g. "__init__.py"): don't close the file twice.
  
 -*Release date: 2011-05-06*
 +- Issue #12973: Fix overflow checks that invoked undefined behaviour in
 +  int.__pow__.  These overflow checks were causing int.__pow__ to produce
 +  incorrect results with recent versions of Clang, as a result of the
 +  compiler optimizing the check away.  Also fix similar overflow checks
 +  in list_repeat (listobject.c) and islice_next (itertoolsmodule.c).  These
 +  bugs caused test failures with recent versions of Clang.
  
 -Library
 --------
 +- Issue #12266: Fix str.capitalize() to correctly uppercase/lowercase
 +  titlecased and cased non-letter characters.
  
 -- Issue #9129: smtpd.py is vulnerable to DoS attacks deriving from missing
 -  error handling when accepting a new connection.
 +- Issues #12610 and #12609: Verify that user generated AST has correct string
 +  and identifier types before compiling.
  
 +- Issue #11627: Fix segfault when __new__ on a exception returns a
 +  non-exception class.
  
 -What's New in Python 2.6.6?
 -===========================
 +- Issue #12149: Update the method cache after a type's dictionnary gets
 +  cleared by the garbage collector.  This fixes a segfault when an instance
 +  and its type get caught in a reference cycle, and the instance's
 +  deallocator calls one of the methods on the type (e.g. when subclassing
 +  IOBase).  Diagnosis and patch by Davide Rizzo.
  
 -*Release date: 2010-08-24*
 +- Issue #12501: Remove Py3k warning for callable. callable() is supported
 +  again in Python 3.2.
  
 -* No changes since 2.6.6rc2.
 +- Issue #9611, #9015: FileIO.read(), FileIO.readinto(), FileIO.write() and
 +  os.write() clamp the length to INT_MAX on Windows.
  
 +- Issue #1195: my_fgets() now always clears errors before calling fgets(). Fix
 +  the following case: sys.stdin.read() stopped with CTRL+d (end of file),
 +  raw_input() interrupted by CTRL+c.
  
 -What's New in Python 2.6.6 rc 2?
 -================================
 +- Issue #10860: httplib now correctly handles an empty port after port
 +  delimiter in URLs.
  
 -*Release date: 2010-08-16*
 +- dict_proxy objects now display their contents rather than just the class
 +  name.
  
  Library
  -------

diff --cc Misc/python.man
index 93087876c03c1470216294e120524b2b4914e32b,0a3eca476f4d60e723eb1eaa0fa029a47c623b28..91787cdd0f1813ad4a454b7ab31dcd7e8f0295a8
--- 1/Misc/python.man
--- 2/Misc/python.man
+++ b/Misc/python.man
@@@ -31,9 -31,12 +31,12 @@@ python \- an interpreted, interactive, 
  .B \-O
  ]
  [
 -.B \-O0
 +.B \-OO
  ]
  [
+ .B \-R
+ ]
+ [
  .B -Q
  .I argument
  ]
@@@ -148,9 -151,21 +151,21 @@@ compiled (bytecode) files fro
  .I .pyc
  to \fI.pyo\fP.  Given twice, causes docstrings to be discarded.
  .TP
 -.B \-O0
 +.B \-OO
  Discard docstrings in addition to the \fB-O\fP optimizations.
  .TP
+ .B \-R
+ Turn on "hash randomization", so that the hash() values of str, bytes and
+ datetime objects are "salted" with an unpredictable pseudo-random value.
+ Although they remain constant within an individual Python process, they are
+ not predictable between repeated invocations of Python.
+ .IP
+ This is intended to provide protection against a denial of service
+ caused by carefully-chosen inputs that exploit the worst case performance
+ of a dict insertion, O(n^2) complexity.  See
+ http://www.ocert.org/advisories/ocert-2011-003.html
+ for details.
+ .TP
  .BI "\-Q " argument
  Division control; see PEP 238.  The argument must be one of "old" (the
  default, int/int and long/long return an int or long), "new" (new
@@@ -420,9 -426,20 +435,23 @@@ the \fB\-u\fP option
  If this is set to a non-empty string it is equivalent to specifying
  the \fB\-v\fP option. If set to an integer, it is equivalent to
  specifying \fB\-v\fP multiple times. 
 +.IP PYTHONWARNINGS
 +If this is set to a comma-separated string it is equivalent to
 +specifying the \fB\-W\fP option for each separate value.
+ .IP PYTHONHASHSEED
+ If this variable is set to "random", the effect is the same as specifying
+ the \fB-R\fP option: a random value is used to seed the hashes of str,
+ bytes and datetime objects.
+ 
+ If PYTHONHASHSEED is set to an integer value, it is used as a fixed seed for
+ generating the hash() of the types covered by the hash randomization.  Its
+ purpose is to allow repeatable hashing, such as for selftests for the
+ interpreter itself, or to allow a cluster of python processes to share hash
+ values.
+ 
+ The integer must be a decimal number in the range [0,4294967295].  Specifying
+ the value 0 will lead to the same hash values as when hash randomization is
+ disabled.
  .SH AUTHOR
  The Python Software Foundation: http://www.python.org/psf
  .SH INTERNET RESOURCES

diff --cc Modules/main.c
Simple merge

diff --cc Modules/posixmodule.c
index d3b14c17fc198b64118a5fc5319a9ac0d94741d8,eedd2ea2e9d4e775271af0c2d16d99ae8e117208..1bd5c1ac689025f7f41494184d6c52b8126249a3
--- 1/Modules/posixmodule.c
--- 2/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@@ -8648,84 -8400,7 +8567,83 @@@ posix_urandom(PyObject *self, PyObject 
      }
      return result;
  }
- #endif
  
 +#ifdef HAVE_SETRESUID
 +PyDoc_STRVAR(posix_setresuid__doc__,
 +"setresuid(ruid, euid, suid)\n\n\
 +Set the current process's real, effective, and saved user ids.");
 +
 +static PyObject*
 +posix_setresuid (PyObject *self, PyObject *args)
 +{
 +    /* We assume uid_t is no larger than a long. */
 +    long ruid, euid, suid;
 +    if (!PyArg_ParseTuple(args, "lll", &ruid, &euid, &suid))
 +        return NULL;
 +    if (setresuid(ruid, euid, suid) < 0)
 +        return posix_error();
 +    Py_RETURN_NONE;
 +}
 +#endif
 +
 +#ifdef HAVE_SETRESGID
 +PyDoc_STRVAR(posix_setresgid__doc__,
 +"setresgid(rgid, egid, sgid)\n\n\
 +Set the current process's real, effective, and saved group ids.");
 +
 +static PyObject*
 +posix_setresgid (PyObject *self, PyObject *args)
 +{
 +    /* We assume uid_t is no larger than a long. */
 +    long rgid, egid, sgid;
 +    if (!PyArg_ParseTuple(args, "lll", &rgid, &egid, &sgid))
 +        return NULL;
 +    if (setresgid(rgid, egid, sgid) < 0)
 +        return posix_error();
 +    Py_RETURN_NONE;
 +}
 +#endif
 +
 +#ifdef HAVE_GETRESUID
 +PyDoc_STRVAR(posix_getresuid__doc__,
 +"getresuid() -> (ruid, euid, suid)\n\n\
 +Get tuple of the current process's real, effective, and saved user ids.");
 +
 +static PyObject*
 +posix_getresuid (PyObject *self, PyObject *noargs)
 +{
 +    uid_t ruid, euid, suid;
 +    long l_ruid, l_euid, l_suid;
 +    if (getresuid(&ruid, &euid, &suid) < 0)
 +        return posix_error();
 +    /* Force the values into long's as we don't know the size of uid_t. */
 +    l_ruid = ruid;
 +    l_euid = euid;
 +    l_suid = suid;
 +    return Py_BuildValue("(lll)", l_ruid, l_euid, l_suid);
 +}
 +#endif
 +
 +#ifdef HAVE_GETRESGID
 +PyDoc_STRVAR(posix_getresgid__doc__,
 +"getresgid() -> (rgid, egid, sgid)\n\n\
 +Get tuple of the current process's real, effective, and saved group ids.");
 +
 +static PyObject*
 +posix_getresgid (PyObject *self, PyObject *noargs)
 +{
 +    uid_t rgid, egid, sgid;
 +    long l_rgid, l_egid, l_sgid;
 +    if (getresgid(&rgid, &egid, &sgid) < 0)
 +        return posix_error();
 +    /* Force the values into long's as we don't know the size of uid_t. */
 +    l_rgid = rgid;
 +    l_egid = egid;
 +    l_sgid = sgid;
 +    return Py_BuildValue("(lll)", l_rgid, l_egid, l_sgid);
 +}
 +#endif
 +
  static PyMethodDef posix_methods[] = {
      {"access",          posix_access, METH_VARARGS, posix_access__doc__},
  #ifdef HAVE_TTYNAME
@@@ -9034,26 -8704,8 +8952,20 @@@
  #endif
  #ifdef HAVE_GETLOADAVG
      {"getloadavg",      posix_getloadavg, METH_NOARGS, posix_getloadavg__doc__},
-  #ifdef MS_WINDOWS
-     {"urandom", win32_urandom, METH_VARARGS, win32_urandom__doc__},
-  #endif
-  #ifdef __VMS
-     {"urandom", vms_urandom, METH_VARARGS, vms_urandom__doc__},
-  #endif
 +#endif
 +#ifdef HAVE_SETRESUID
 +    {"setresuid",       posix_setresuid, METH_VARARGS, posix_setresuid__doc__},
 +#endif
 +#ifdef HAVE_SETRESGID
 +    {"setresgid",       posix_setresgid, METH_VARARGS, posix_setresgid__doc__},
 +#endif
 +#ifdef HAVE_GETRESUID
 +    {"getresuid",       posix_getresuid, METH_NOARGS, posix_getresuid__doc__},
 +#endif
 +#ifdef HAVE_GETRESGID
 +    {"getresgid",       posix_getresgid, METH_NOARGS, posix_getresgid__doc__},
  #endif
- 
+     {"urandom",         posix_urandom,   METH_VARARGS, posix_urandom__doc__},
      {NULL,              NULL}            /* Sentinel */
  };
  

diff --cc Objects/object.c
Simple merge

diff --cc Objects/stringobject.c
Simple merge

diff --cc Objects/unicodeobject.c
Simple merge

diff --cc PCbuild/pythoncore.vcproj
index 03a9a65f39344814e1e4222d3a7bd331d07ce953,d09e0110f4e46ec883786c91f5de6c0acbde1bb4..5a5eed4949bb5c6e03e7f4891d7ba7ec092b0f60
--- 1/PCbuild/pythoncore.vcproj
--- 2/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@@ -1,1873 -1,1821 +1,3697 @@@
++<<<<<<< local\r
 +<?xml version="1.0" encoding="Windows-1252"?>\r
 +<VisualStudioProject\r
 +      ProjectType="Visual C++"\r
 +      Version="9,00"\r
 +      Name="pythoncore"\r
 +      ProjectGUID="{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}"\r
 +      RootNamespace="pythoncore"\r
 +      TargetFrameworkVersion="131072"\r
 +      >\r
 +      <Platforms>\r
 +              <Platform\r
 +                      Name="Win32"\r
 +              />\r
 +              <Platform\r
 +                      Name="x64"\r
 +              />\r
 +      </Platforms>\r
 +      <ToolFiles>\r
 +      </ToolFiles>\r
 +      <Configurations>\r
 +              <Configuration\r
 +                      Name="Release|Win32"\r
 +                      ConfigurationType="2"\r
 +                      InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops"\r
 +                      UseOfMFC="0"\r
 +                      ATLMinimizesCRunTimeLibraryUsage="false"\r
 +                      >\r
 +                      <Tool\r
 +                              Name="VCPreBuildEventTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCustomBuildTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCXMLDataGeneratorTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCWebServiceProxyGeneratorTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCMIDLTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCLCompilerTool"\r
 +                              AdditionalOptions="/Zm200 "\r
 +                              AdditionalIncludeDirectories="..\Python;..\Modules\zlib"\r
 +                              PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"\r
 +                              RuntimeLibrary="2"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCManagedResourceCompilerTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCResourceCompilerTool"\r
 +                              PreprocessorDefinitions="NDEBUG"\r
 +                              Culture="1033"\r
 +                              AdditionalIncludeDirectories="..\Include"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCPreLinkEventTool"\r
 +                              Description="Generate build information..."\r
 +                              CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCLinkerTool"\r
 +                              AdditionalDependencies="getbuildinfo.o"\r
 +                              OutputFile="$(OutDir)\$(PyDllName).dll"\r
 +                              IgnoreDefaultLibraryNames="libc"\r
 +                              ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"\r
 +                              BaseAddress="0x1e000000"\r
 +                              ImportLibrary="$(OutDir)$(PyDllName).lib"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCALinkTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCManifestTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCXDCMakeTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCBscMakeTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCFxCopTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCAppVerifierTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCPostBuildEventTool"\r
 +                      />\r
 +              </Configuration>\r
 +              <Configuration\r
 +                      Name="Release|x64"\r
 +                      ConfigurationType="2"\r
 +                      InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops"\r
 +                      UseOfMFC="0"\r
 +                      ATLMinimizesCRunTimeLibraryUsage="false"\r
 +                      >\r
 +                      <Tool\r
 +                              Name="VCPreBuildEventTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCustomBuildTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCXMLDataGeneratorTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCWebServiceProxyGeneratorTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCMIDLTool"\r
 +                              TargetEnvironment="3"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCLCompilerTool"\r
 +                              AdditionalOptions="/Zm200 "\r
 +                              AdditionalIncludeDirectories="..\Python;..\Modules\zlib"\r
 +                              PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"\r
 +                              RuntimeLibrary="2"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCManagedResourceCompilerTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCResourceCompilerTool"\r
 +                              PreprocessorDefinitions="NDEBUG"\r
 +                              Culture="1033"\r
 +                              AdditionalIncludeDirectories="..\Include"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCPreLinkEventTool"\r
 +                              Description="Generate build information..."\r
 +                              CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCLinkerTool"\r
 +                              AdditionalDependencies="getbuildinfo.o"\r
 +                              OutputFile="$(OutDir)\$(PyDllName).dll"\r
 +                              IgnoreDefaultLibraryNames="libc"\r
 +                              ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"\r
 +                              BaseAddress="0x1e000000"\r
 +                              ImportLibrary="$(OutDir)$(PyDllName).lib"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCALinkTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCManifestTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCXDCMakeTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCBscMakeTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCFxCopTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCAppVerifierTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCPostBuildEventTool"\r
 +                      />\r
 +              </Configuration>\r
 +              <Configuration\r
 +                      Name="Debug|Win32"\r
 +                      ConfigurationType="2"\r
 +                      InheritedPropertySheets=".\pyproject.vsprops;.\debug.vsprops"\r
 +                      UseOfMFC="0"\r
 +                      ATLMinimizesCRunTimeLibraryUsage="false"\r
 +                      CharacterSet="0"\r
 +                      >\r
 +                      <Tool\r
 +                              Name="VCPreBuildEventTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCustomBuildTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCXMLDataGeneratorTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCWebServiceProxyGeneratorTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCMIDLTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCLCompilerTool"\r
 +                              AdditionalOptions="/Zm200 "\r
 +                              Optimization="0"\r
 +                              InlineFunctionExpansion="0"\r
 +                              EnableIntrinsicFunctions="false"\r
 +                              AdditionalIncludeDirectories="..\Python;..\Modules\zlib"\r
 +                              PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"\r
 +                              RuntimeLibrary="3"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCManagedResourceCompilerTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCResourceCompilerTool"\r
 +                              PreprocessorDefinitions="_DEBUG"\r
 +                              Culture="1033"\r
 +                              AdditionalIncludeDirectories="..\Include"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCPreLinkEventTool"\r
 +                              Description="Generate build information..."\r
 +                              CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Debug"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCLinkerTool"\r
 +                              AdditionalDependencies="getbuildinfo.o"\r
 +                              OutputFile="$(OutDir)\$(PyDllName)_d.dll"\r
 +                              IgnoreDefaultLibraryNames="libc"\r
 +                              ProgramDatabaseFile="$(OutDir)$(PyDllName)_d.pdb"\r
 +                              BaseAddress="0x1e000000"\r
 +                              ImportLibrary="$(OutDir)$(PyDllName)_d.lib"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCALinkTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCManifestTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCXDCMakeTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCBscMakeTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCFxCopTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCAppVerifierTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCPostBuildEventTool"\r
 +                      />\r
 +              </Configuration>\r
 +              <Configuration\r
 +                      Name="Debug|x64"\r
 +                      ConfigurationType="2"\r
 +                      InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\debug.vsprops"\r
 +                      UseOfMFC="0"\r
 +                      ATLMinimizesCRunTimeLibraryUsage="false"\r
 +                      >\r
 +                      <Tool\r
 +                              Name="VCPreBuildEventTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCustomBuildTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCXMLDataGeneratorTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCWebServiceProxyGeneratorTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCMIDLTool"\r
 +                              TargetEnvironment="3"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCLCompilerTool"\r
 +                              AdditionalOptions="/Zm200 "\r
 +                              Optimization="0"\r
 +                              InlineFunctionExpansion="0"\r
 +                              EnableIntrinsicFunctions="false"\r
 +                              AdditionalIncludeDirectories="..\Python;..\Modules\zlib"\r
 +                              PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"\r
 +                              RuntimeLibrary="3"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCManagedResourceCompilerTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCResourceCompilerTool"\r
 +                              PreprocessorDefinitions="_DEBUG"\r
 +                              Culture="1033"\r
 +                              AdditionalIncludeDirectories="..\Include"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCPreLinkEventTool"\r
 +                              Description="Generate build information..."\r
 +                              CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Debug"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCLinkerTool"\r
 +                              AdditionalDependencies="getbuildinfo.o"\r
 +                              OutputFile="$(OutDir)\$(PyDllName)_d.dll"\r
 +                              IgnoreDefaultLibraryNames="libc"\r
 +                              ProgramDatabaseFile="$(OutDir)$(PyDllName)_d.pdb"\r
 +                              BaseAddress="0x1e000000"\r
 +                              ImportLibrary="$(OutDir)$(PyDllName)_d.lib"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCALinkTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCManifestTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCXDCMakeTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCBscMakeTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCFxCopTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCAppVerifierTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCPostBuildEventTool"\r
 +                      />\r
 +              </Configuration>\r
 +              <Configuration\r
 +                      Name="PGInstrument|Win32"\r
 +                      ConfigurationType="2"\r
 +                      InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pginstrument.vsprops"\r
 +                      UseOfMFC="0"\r
 +                      ATLMinimizesCRunTimeLibraryUsage="false"\r
 +                      >\r
 +                      <Tool\r
 +                              Name="VCPreBuildEventTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCustomBuildTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCXMLDataGeneratorTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCWebServiceProxyGeneratorTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCMIDLTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCLCompilerTool"\r
 +                              AdditionalOptions="/Zm200 "\r
 +                              AdditionalIncludeDirectories="..\Python;..\Modules\zlib"\r
 +                              PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"\r
 +                              RuntimeLibrary="2"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCManagedResourceCompilerTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCResourceCompilerTool"\r
 +                              PreprocessorDefinitions="NDEBUG"\r
 +                              Culture="1033"\r
 +                              AdditionalIncludeDirectories="..\Include"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCPreLinkEventTool"\r
 +                              Description="Generate build information..."\r
 +                              CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCLinkerTool"\r
 +                              AdditionalDependencies="getbuildinfo.o"\r
 +                              OutputFile="$(OutDir)\$(PyDllName).dll"\r
 +                              IgnoreDefaultLibraryNames="libc"\r
 +                              ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"\r
 +                              BaseAddress="0x1e000000"\r
 +                              ImportLibrary="$(OutDirPGI)$(PyDllName).lib"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCALinkTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCManifestTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCXDCMakeTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCBscMakeTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCFxCopTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCAppVerifierTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCPostBuildEventTool"\r
 +                      />\r
 +              </Configuration>\r
 +              <Configuration\r
 +                      Name="PGInstrument|x64"\r
 +                      ConfigurationType="2"\r
 +                      InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pginstrument.vsprops"\r
 +                      UseOfMFC="0"\r
 +                      ATLMinimizesCRunTimeLibraryUsage="false"\r
 +                      >\r
 +                      <Tool\r
 +                              Name="VCPreBuildEventTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCustomBuildTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCXMLDataGeneratorTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCWebServiceProxyGeneratorTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCMIDLTool"\r
 +                              TargetEnvironment="3"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCLCompilerTool"\r
 +                              AdditionalOptions="/Zm200 "\r
 +                              AdditionalIncludeDirectories="..\Python;..\Modules\zlib"\r
 +                              PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"\r
 +                              RuntimeLibrary="2"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCManagedResourceCompilerTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCResourceCompilerTool"\r
 +                              PreprocessorDefinitions="NDEBUG"\r
 +                              Culture="1033"\r
 +                              AdditionalIncludeDirectories="..\Include"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCPreLinkEventTool"\r
 +                              Description="Generate build information..."\r
 +                              CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCLinkerTool"\r
 +                              AdditionalDependencies="getbuildinfo.o"\r
 +                              OutputFile="$(OutDir)\$(PyDllName).dll"\r
 +                              IgnoreDefaultLibraryNames="libc"\r
 +                              ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"\r
 +                              BaseAddress="0x1e000000"\r
 +                              ImportLibrary="$(OutDirPGI)$(PyDllName).lib"\r
 +                              TargetMachine="17"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCALinkTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCManifestTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCXDCMakeTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCBscMakeTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCFxCopTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCAppVerifierTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCPostBuildEventTool"\r
 +                      />\r
 +              </Configuration>\r
 +              <Configuration\r
 +                      Name="PGUpdate|Win32"\r
 +                      ConfigurationType="2"\r
 +                      InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pgupdate.vsprops"\r
 +                      UseOfMFC="0"\r
 +                      ATLMinimizesCRunTimeLibraryUsage="false"\r
 +                      >\r
 +                      <Tool\r
 +                              Name="VCPreBuildEventTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCustomBuildTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCXMLDataGeneratorTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCWebServiceProxyGeneratorTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCMIDLTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCLCompilerTool"\r
 +                              AdditionalOptions="/Zm200 "\r
 +                              AdditionalIncludeDirectories="..\Python;..\Modules\zlib"\r
 +                              PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"\r
 +                              RuntimeLibrary="2"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCManagedResourceCompilerTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCResourceCompilerTool"\r
 +                              PreprocessorDefinitions="NDEBUG"\r
 +                              Culture="1033"\r
 +                              AdditionalIncludeDirectories="..\Include"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCPreLinkEventTool"\r
 +                              Description="Generate build information..."\r
 +                              CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCLinkerTool"\r
 +                              AdditionalDependencies="getbuildinfo.o"\r
 +                              OutputFile="$(OutDir)\$(PyDllName).dll"\r
 +                              IgnoreDefaultLibraryNames="libc"\r
 +                              ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"\r
 +                              BaseAddress="0x1e000000"\r
 +                              ImportLibrary="$(OutDirPGI)$(PyDllName).lib"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCALinkTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCManifestTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCXDCMakeTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCBscMakeTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCFxCopTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCAppVerifierTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCPostBuildEventTool"\r
 +                      />\r
 +              </Configuration>\r
 +              <Configuration\r
 +                      Name="PGUpdate|x64"\r
 +                      ConfigurationType="2"\r
 +                      InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pgupdate.vsprops"\r
 +                      UseOfMFC="0"\r
 +                      ATLMinimizesCRunTimeLibraryUsage="false"\r
 +                      >\r
 +                      <Tool\r
 +                              Name="VCPreBuildEventTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCustomBuildTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCXMLDataGeneratorTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCWebServiceProxyGeneratorTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCMIDLTool"\r
 +                              TargetEnvironment="3"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCCLCompilerTool"\r
 +                              AdditionalOptions="/Zm200 "\r
 +                              AdditionalIncludeDirectories="..\Python;..\Modules\zlib"\r
 +                              PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"\r
 +                              RuntimeLibrary="2"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCManagedResourceCompilerTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCResourceCompilerTool"\r
 +                              PreprocessorDefinitions="NDEBUG"\r
 +                              Culture="1033"\r
 +                              AdditionalIncludeDirectories="..\Include"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCPreLinkEventTool"\r
 +                              Description="Generate build information..."\r
 +                              CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCLinkerTool"\r
 +                              AdditionalDependencies="getbuildinfo.o"\r
 +                              OutputFile="$(OutDir)\$(PyDllName).dll"\r
 +                              IgnoreDefaultLibraryNames="libc"\r
 +                              ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"\r
 +                              BaseAddress="0x1e000000"\r
 +                              ImportLibrary="$(OutDirPGI)$(PyDllName).lib"\r
 +                              TargetMachine="17"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCALinkTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCManifestTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCXDCMakeTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCBscMakeTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCFxCopTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCAppVerifierTool"\r
 +                      />\r
 +                      <Tool\r
 +                              Name="VCPostBuildEventTool"\r
 +                      />\r
 +              </Configuration>\r
 +      </Configurations>\r
 +      <References>\r
 +      </References>\r
 +      <Files>\r
 +              <Filter\r
 +                      Name="Include"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\Include\abstract.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\asdl.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\ast.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\bitset.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\boolobject.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\bufferobject.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\bytes_methods.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\bytearrayobject.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\bytesobject.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\cellobject.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\ceval.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\classobject.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\cobject.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\code.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\codecs.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\compile.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\complexobject.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\cStringIO.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\datetime.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\descrobject.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\dictobject.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\dtoa.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\enumobject.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\errcode.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\eval.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\fileobject.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\floatobject.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\frameobject.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\funcobject.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\genobject.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\graminit.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\grammar.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\import.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\intobject.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\intrcheck.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\iterobject.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\listobject.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\longintrepr.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\longobject.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\marshal.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\memoryobject.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\metagrammar.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\methodobject.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\modsupport.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\moduleobject.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\node.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\object.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\objimpl.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\opcode.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\osdefs.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\parsetok.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\patchlevel.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\pgen.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\pgenheaders.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\py_curses.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\pyarena.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\pycapsule.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\pyctype.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\pydebug.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\pyerrors.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\pyexpat.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\pyfpe.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\pygetopt.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\pymactoolbox.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\pymath.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\pymem.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\pyport.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\pystate.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\pystrcmp.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\pystrtod.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\Python-ast.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\Python.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\pythonrun.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\pythread.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\rangeobject.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\setobject.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\sliceobject.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\stringobject.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\structmember.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\structseq.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\symtable.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\sysmodule.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\timefuncs.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\token.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\traceback.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\tupleobject.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\ucnhash.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\unicodeobject.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Include\weakrefobject.h"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="Modules"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\Modules\_bisectmodule.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\_codecsmodule.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\_collectionsmodule.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\_csv.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\_functoolsmodule.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\_heapqmodule.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\_hotshot.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\_json.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\_localemodule.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\_lsprof.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\_math.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\_math.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\_randommodule.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\_sre.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\_struct.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\_weakref.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\arraymodule.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\audioop.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\binascii.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\cmathmodule.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\cPickle.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\cStringIO.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\datetimemodule.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\errnomodule.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\future_builtins.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\gcmodule.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\imageop.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\itertoolsmodule.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\main.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\mathmodule.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\md5.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\md5.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\md5module.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\mmapmodule.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\operator.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\parsermodule.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\posixmodule.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\rotatingtree.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\rotatingtree.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\sha256module.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\sha512module.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\shamodule.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\signalmodule.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\stropmodule.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\symtablemodule.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\threadmodule.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\timemodule.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\xxsubtype.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\zipimport.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Modules\zlibmodule.c"\r
 +                              >\r
 +                      </File>\r
 +                      <Filter\r
 +                              Name="zlib"\r
 +                              >\r
 +                              <File\r
 +                                      RelativePath="..\Modules\zlib\adler32.c"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\zlib\compress.c"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\zlib\crc32.c"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\zlib\crc32.h"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\zlib\deflate.c"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\zlib\deflate.h"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\zlib\gzio.c"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\zlib\infback.c"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\zlib\inffast.c"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\zlib\inffast.h"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\zlib\inffixed.h"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\zlib\inflate.c"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\zlib\inflate.h"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\zlib\inftrees.c"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\zlib\inftrees.h"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\zlib\trees.c"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\zlib\trees.h"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\zlib\uncompr.c"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\zlib\zconf.h"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\zlib\zconf.in.h"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\zlib\zlib.h"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\zlib\zutil.c"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\zlib\zutil.h"\r
 +                                      >\r
 +                              </File>\r
 +                      </Filter>\r
 +                      <Filter\r
 +                              Name="cjkcodecs"\r
 +                              >\r
 +                              <File\r
 +                                      RelativePath="..\Modules\cjkcodecs\_codecs_cn.c"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\cjkcodecs\_codecs_hk.c"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\cjkcodecs\_codecs_iso2022.c"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\cjkcodecs\_codecs_jp.c"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\cjkcodecs\_codecs_kr.c"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\cjkcodecs\_codecs_tw.c"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\cjkcodecs\alg_jisx0201.h"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\cjkcodecs\cjkcodecs.h"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\cjkcodecs\emu_jisx0213_2000.h"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\cjkcodecs\mappings_cn.h"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\cjkcodecs\mappings_hk.h"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\cjkcodecs\mappings_jisx0213_pair.h"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\cjkcodecs\mappings_jp.h"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\cjkcodecs\mappings_kr.h"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\cjkcodecs\mappings_tw.h"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\cjkcodecs\multibytecodec.c"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\cjkcodecs\multibytecodec.h"\r
 +                                      >\r
 +                              </File>\r
 +                      </Filter>\r
 +                      <Filter\r
 +                              Name="_io"\r
 +                              >\r
 +                              <File\r
 +                                      RelativePath="..\Modules\_io\_iomodule.c"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\_io\_iomodule.h"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\_io\bufferedio.c"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\_io\bytesio.c"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\_io\fileio.c"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\_io\iobase.c"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\_io\stringio.c"\r
 +                                      >\r
 +                              </File>\r
 +                              <File\r
 +                                      RelativePath="..\Modules\_io\textio.c"\r
 +                                      >\r
 +                              </File>\r
 +                      </Filter>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="Objects"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\Objects\abstract.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\boolobject.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\bufferobject.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\bytes_methods.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\bytearrayobject.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\capsule.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\cellobject.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\classobject.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\cobject.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\codeobject.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\complexobject.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\stringlib\count.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\descrobject.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\dictobject.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\enumobject.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\exceptions.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\stringlib\fastsearch.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\fileobject.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\stringlib\find.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\floatobject.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\frameobject.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\funcobject.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\genobject.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\intobject.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\iterobject.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\listobject.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\longobject.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\memoryobject.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\methodobject.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\moduleobject.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\object.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\obmalloc.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\stringlib\partition.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\rangeobject.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\setobject.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\sliceobject.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\stringlib\split.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\stringobject.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\structseq.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\tupleobject.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\typeobject.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\unicodectype.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\unicodeobject.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\unicodetype_db.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Objects\weakrefobject.c"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="Parser"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\Parser\acceler.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Parser\bitset.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Parser\firstsets.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Parser\grammar.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Parser\grammar1.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Parser\listnode.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Parser\metagrammar.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Parser\myreadline.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Parser\node.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Parser\parser.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Parser\parser.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Parser\parsetok.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Parser\tokenizer.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Parser\tokenizer.h"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="PC"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\PC\_subprocess.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\PC\_winreg.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\PC\config.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\PC\dl_nt.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\PC\errmap.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\PC\getpathp.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\PC\import_nt.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\PC\msvcrtmodule.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\PC\pyconfig.h"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="Python"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\Python\_warnings.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\asdl.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\ast.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\bltinmodule.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\ceval.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\codecs.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\compile.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\dtoa.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\dynload_win.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\errors.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\formatter_string.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\formatter_unicode.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\frozen.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\future.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\getargs.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\getcompiler.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\getcopyright.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\getopt.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\getplatform.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\getversion.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\graminit.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\import.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\importdl.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\importdl.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\marshal.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\modsupport.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\mysnprintf.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\mystrtoul.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\peephole.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\pyarena.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\pyctype.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\pyfpe.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\pymath.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\pystate.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\pystrcmp.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\pystrtod.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\Python-ast.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\pythonrun.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\structmember.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\symtable.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\sysmodule.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\thread.c"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\thread_nt.h"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
 +                              RelativePath="..\Python\traceback.c"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +              <Filter\r
 +                      Name="Resource Files"\r
 +                      >\r
 +                      <File\r
 +                              RelativePath="..\PC\python_nt.rc"\r
 +                              >\r
 +                      </File>\r
 +              </Filter>\r
 +      </Files>\r
 +      <Globals>\r
 +      </Globals>\r
 +</VisualStudioProject>\r
++=======\r
+ <?xml version="1.0" encoding="Windows-1252"?>
+ <VisualStudioProject
+       ProjectType="Visual C++"
+       Version="9,00"
+       Name="pythoncore"
+       ProjectGUID="{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}"
+       RootNamespace="pythoncore"
+       TargetFrameworkVersion="131072"
+       >
+       <Platforms>
+               <Platform
+                       Name="Win32"
+               />
+               <Platform
+                       Name="x64"
+               />
+       </Platforms>
+       <ToolFiles>
+       </ToolFiles>
+       <Configurations>
+               <Configuration
+                       Name="Release|Win32"
+                       ConfigurationType="2"
+                       InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops"
+                       UseOfMFC="0"
+                       ATLMinimizesCRunTimeLibraryUsage="false"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalOptions="/Zm200 "
+                               AdditionalIncludeDirectories="..\Python;..\Modules\zlib"
+                               PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"
+                               RuntimeLibrary="2"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                               PreprocessorDefinitions="NDEBUG"
+                               Culture="1033"
+                               AdditionalIncludeDirectories="..\Include"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Generate build information..."
+                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="getbuildinfo.o"
+                               OutputFile="$(OutDir)\$(PyDllName).dll"
+                               IgnoreDefaultLibraryNames="libc"
+                               ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
+                               BaseAddress="0x1e000000"
+                               ImportLibrary="$(OutDir)$(PyDllName).lib"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|x64"
+                       ConfigurationType="2"
+                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops"
+                       UseOfMFC="0"
+                       ATLMinimizesCRunTimeLibraryUsage="false"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                               TargetEnvironment="3"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalOptions="/Zm200 "
+                               AdditionalIncludeDirectories="..\Python;..\Modules\zlib"
+                               PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"
+                               RuntimeLibrary="2"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                               PreprocessorDefinitions="NDEBUG"
+                               Culture="1033"
+                               AdditionalIncludeDirectories="..\Include"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Generate build information..."
+                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="getbuildinfo.o"
+                               OutputFile="$(OutDir)\$(PyDllName).dll"
+                               IgnoreDefaultLibraryNames="libc"
+                               ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
+                               BaseAddress="0x1e000000"
+                               ImportLibrary="$(OutDir)$(PyDllName).lib"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Debug|Win32"
+                       ConfigurationType="2"
+                       InheritedPropertySheets=".\pyproject.vsprops;.\debug.vsprops"
+                       UseOfMFC="0"
+                       ATLMinimizesCRunTimeLibraryUsage="false"
+                       CharacterSet="0"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalOptions="/Zm200 "
+                               Optimization="0"
+                               InlineFunctionExpansion="0"
+                               EnableIntrinsicFunctions="false"
+                               AdditionalIncludeDirectories="..\Python;..\Modules\zlib"
+                               PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"
+                               RuntimeLibrary="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                               PreprocessorDefinitions="_DEBUG"
+                               Culture="1033"
+                               AdditionalIncludeDirectories="..\Include"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Generate build information..."
+                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Debug"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="getbuildinfo.o"
+                               OutputFile="$(OutDir)\$(PyDllName)_d.dll"
+                               IgnoreDefaultLibraryNames="libc"
+                               ProgramDatabaseFile="$(OutDir)$(PyDllName)_d.pdb"
+                               BaseAddress="0x1e000000"
+                               ImportLibrary="$(OutDir)$(PyDllName)_d.lib"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Debug|x64"
+                       ConfigurationType="2"
+                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\debug.vsprops"
+                       UseOfMFC="0"
+                       ATLMinimizesCRunTimeLibraryUsage="false"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                               TargetEnvironment="3"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalOptions="/Zm200 "
+                               Optimization="0"
+                               InlineFunctionExpansion="0"
+                               EnableIntrinsicFunctions="false"
+                               AdditionalIncludeDirectories="..\Python;..\Modules\zlib"
+                               PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"
+                               RuntimeLibrary="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                               PreprocessorDefinitions="_DEBUG"
+                               Culture="1033"
+                               AdditionalIncludeDirectories="..\Include"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Generate build information..."
+                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Debug"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="getbuildinfo.o"
+                               OutputFile="$(OutDir)\$(PyDllName)_d.dll"
+                               IgnoreDefaultLibraryNames="libc"
+                               ProgramDatabaseFile="$(OutDir)$(PyDllName)_d.pdb"
+                               BaseAddress="0x1e000000"
+                               ImportLibrary="$(OutDir)$(PyDllName)_d.lib"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="PGInstrument|Win32"
+                       ConfigurationType="2"
+                       InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pginstrument.vsprops"
+                       UseOfMFC="0"
+                       ATLMinimizesCRunTimeLibraryUsage="false"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalOptions="/Zm200 "
+                               AdditionalIncludeDirectories="..\Python;..\Modules\zlib"
+                               PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"
+                               RuntimeLibrary="2"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                               PreprocessorDefinitions="NDEBUG"
+                               Culture="1033"
+                               AdditionalIncludeDirectories="..\Include"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Generate build information..."
+                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="getbuildinfo.o"
+                               OutputFile="$(OutDir)\$(PyDllName).dll"
+                               IgnoreDefaultLibraryNames="libc"
+                               ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
+                               BaseAddress="0x1e000000"
+                               ImportLibrary="$(OutDirPGI)$(PyDllName).lib"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="PGInstrument|x64"
+                       ConfigurationType="2"
+                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pginstrument.vsprops"
+                       UseOfMFC="0"
+                       ATLMinimizesCRunTimeLibraryUsage="false"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                               TargetEnvironment="3"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalOptions="/Zm200 "
+                               AdditionalIncludeDirectories="..\Python;..\Modules\zlib"
+                               PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"
+                               RuntimeLibrary="2"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                               PreprocessorDefinitions="NDEBUG"
+                               Culture="1033"
+                               AdditionalIncludeDirectories="..\Include"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Generate build information..."
+                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="getbuildinfo.o"
+                               OutputFile="$(OutDir)\$(PyDllName).dll"
+                               IgnoreDefaultLibraryNames="libc"
+                               ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
+                               BaseAddress="0x1e000000"
+                               ImportLibrary="$(OutDirPGI)$(PyDllName).lib"
+                               TargetMachine="17"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="PGUpdate|Win32"
+                       ConfigurationType="2"
+                       InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pgupdate.vsprops"
+                       UseOfMFC="0"
+                       ATLMinimizesCRunTimeLibraryUsage="false"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalOptions="/Zm200 "
+                               AdditionalIncludeDirectories="..\Python;..\Modules\zlib"
+                               PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"
+                               RuntimeLibrary="2"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                               PreprocessorDefinitions="NDEBUG"
+                               Culture="1033"
+                               AdditionalIncludeDirectories="..\Include"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Generate build information..."
+                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="getbuildinfo.o"
+                               OutputFile="$(OutDir)\$(PyDllName).dll"
+                               IgnoreDefaultLibraryNames="libc"
+                               ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
+                               BaseAddress="0x1e000000"
+                               ImportLibrary="$(OutDirPGI)$(PyDllName).lib"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="PGUpdate|x64"
+                       ConfigurationType="2"
+                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pgupdate.vsprops"
+                       UseOfMFC="0"
+                       ATLMinimizesCRunTimeLibraryUsage="false"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                               TargetEnvironment="3"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalOptions="/Zm200 "
+                               AdditionalIncludeDirectories="..\Python;..\Modules\zlib"
+                               PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"
+                               RuntimeLibrary="2"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                               PreprocessorDefinitions="NDEBUG"
+                               Culture="1033"
+                               AdditionalIncludeDirectories="..\Include"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Generate build information..."
+                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="getbuildinfo.o"
+                               OutputFile="$(OutDir)\$(PyDllName).dll"
+                               IgnoreDefaultLibraryNames="libc"
+                               ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
+                               BaseAddress="0x1e000000"
+                               ImportLibrary="$(OutDirPGI)$(PyDllName).lib"
+                               TargetMachine="17"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+       </Configurations>
+       <References>
+       </References>
+       <Files>
+               <Filter
+                       Name="Include"
+                       >
+                       <File
+                               RelativePath="..\Include\abstract.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\asdl.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\ast.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\bitset.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\boolobject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\bufferobject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\bytes_methods.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\bytearrayobject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\bytesobject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\cellobject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\ceval.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\classobject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\cobject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\code.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\codecs.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\compile.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\complexobject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\cStringIO.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\datetime.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\descrobject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\dictobject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\enumobject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\errcode.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\eval.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\fileobject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\floatobject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\frameobject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\funcobject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\genobject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\graminit.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\grammar.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\import.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\intobject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\intrcheck.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\iterobject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\listobject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\longintrepr.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\longobject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\marshal.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\memoryobject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\metagrammar.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\methodobject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\modsupport.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\moduleobject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\node.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\object.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\objimpl.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\opcode.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\osdefs.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\parsetok.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\patchlevel.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\pgen.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\pgenheaders.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\py_curses.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\pyarena.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\pydebug.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\pyerrors.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\pyexpat.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\pyfpe.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\pygetopt.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\pymactoolbox.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\pymath.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\pymem.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\pyport.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\pystate.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\pystrcmp.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\pystrtod.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\Python-ast.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\Python.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\pythonrun.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\pythread.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\rangeobject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\setobject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\sliceobject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\stringobject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\structmember.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\structseq.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\symtable.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\sysmodule.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\timefuncs.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\token.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\traceback.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\tupleobject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\ucnhash.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\unicodeobject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Include\weakrefobject.h"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Modules"
+                       >
+                       <File
+                               RelativePath="..\Modules\_bisectmodule.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\_codecsmodule.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\_collectionsmodule.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\_csv.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\_fileio.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\_bytesio.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\_functoolsmodule.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\_heapqmodule.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\_hotshot.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\_json.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\_localemodule.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\_lsprof.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\_randommodule.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\_sre.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\_struct.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\_weakref.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\arraymodule.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\audioop.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\binascii.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\cmathmodule.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\cPickle.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\cStringIO.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\datetimemodule.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\errnomodule.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\future_builtins.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\gcmodule.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\imageop.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\itertoolsmodule.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\main.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\mathmodule.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\md5.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\md5.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\md5module.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\mmapmodule.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\operator.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\parsermodule.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\posixmodule.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\rotatingtree.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\rotatingtree.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\sha256module.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\sha512module.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\shamodule.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\signalmodule.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\stropmodule.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\symtablemodule.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\threadmodule.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\timemodule.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\xxsubtype.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\yuv.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\yuvconvert.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\zipimport.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Modules\zlibmodule.c"
+                               >
+                       </File>
+                       <Filter
+                               Name="zlib"
+                               >
+                               <File
+                                       RelativePath="..\Modules\zlib\adler32.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\zlib\compress.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\zlib\crc32.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\zlib\crc32.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\zlib\deflate.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\zlib\deflate.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\zlib\gzio.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\zlib\infback.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\zlib\inffast.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\zlib\inffast.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\zlib\inffixed.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\zlib\inflate.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\zlib\inflate.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\zlib\inftrees.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\zlib\inftrees.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\zlib\trees.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\zlib\trees.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\zlib\uncompr.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\zlib\zconf.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\zlib\zconf.in.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\zlib\zlib.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\zlib\zutil.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\zlib\zutil.h"
+                                       >
+                               </File>
+                       </Filter>
+                       <Filter
+                               Name="cjkcodecs"
+                               >
+                               <File
+                                       RelativePath="..\Modules\cjkcodecs\_codecs_cn.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\cjkcodecs\_codecs_hk.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\cjkcodecs\_codecs_iso2022.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\cjkcodecs\_codecs_jp.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\cjkcodecs\_codecs_kr.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\cjkcodecs\_codecs_tw.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\cjkcodecs\alg_jisx0201.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\cjkcodecs\cjkcodecs.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\cjkcodecs\emu_jisx0213_2000.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\cjkcodecs\mappings_cn.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\cjkcodecs\mappings_hk.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\cjkcodecs\mappings_jisx0213_pair.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\cjkcodecs\mappings_jp.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\cjkcodecs\mappings_kr.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\cjkcodecs\mappings_tw.h"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\cjkcodecs\multibytecodec.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\cjkcodecs\multibytecodec.h"
+                                       >
+                               </File>
+                       </Filter>
+               </Filter>
+               <Filter
+                       Name="Objects"
+                       >
+                       <File
+                               RelativePath="..\Objects\abstract.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\boolobject.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\bufferobject.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\bytes_methods.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\bytearrayobject.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\stringobject.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\cellobject.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\classobject.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\cobject.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\codeobject.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\complexobject.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\stringlib\count.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\descrobject.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\dictobject.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\enumobject.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\exceptions.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\stringlib\fastsearch.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\fileobject.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\stringlib\find.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\floatobject.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\frameobject.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\funcobject.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\genobject.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\intobject.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\iterobject.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\listobject.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\longobject.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\methodobject.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\moduleobject.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\object.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\obmalloc.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\stringlib\partition.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\rangeobject.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\setobject.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\sliceobject.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\structseq.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\tupleobject.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\typeobject.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\unicodectype.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\unicodeobject.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\unicodetype_db.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Objects\weakrefobject.c"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Parser"
+                       >
+                       <File
+                               RelativePath="..\Parser\acceler.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Parser\bitset.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Parser\firstsets.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Parser\grammar.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Parser\grammar1.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Parser\listnode.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Parser\metagrammar.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Parser\myreadline.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Parser\node.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Parser\parser.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Parser\parser.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Parser\parsetok.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Parser\tokenizer.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Parser\tokenizer.h"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="PC"
+                       >
+                       <File
+                               RelativePath="..\PC\_subprocess.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\PC\_winreg.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\PC\config.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\PC\dl_nt.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\PC\errmap.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\PC\getpathp.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\PC\import_nt.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\PC\msvcrtmodule.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\PC\pyconfig.h"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Python"
+                       >
+                       <File
+                               RelativePath="..\Python\_warnings.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\asdl.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\ast.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\bltinmodule.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\ceval.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\codecs.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\compile.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\dynload_win.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\errors.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\formatter_string.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\formatter_unicode.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\frozen.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\future.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\getargs.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\getcompiler.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\getcopyright.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\getmtime.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\getopt.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\getplatform.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\getversion.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\graminit.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\import.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\importdl.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\importdl.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\marshal.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\modsupport.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\mysnprintf.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\mystrtoul.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\peephole.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\pyarena.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\pyfpe.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\pymath.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\pystate.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\pystrcmp.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\pystrtod.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\Python-ast.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\pythonrun.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\random.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\structmember.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\symtable.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\sysmodule.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\thread.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\thread_nt.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\Python\traceback.c"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Resource Files"
+                       >
+                       <File
+                               RelativePath="..\PC\python_nt.rc"
+                               >
+                       </File>
+               </Filter>
+       </Files>
+       <Globals>
+       </Globals>
+ </VisualStudioProject>
++>>>>>>> other\r

diff --cc Python/pythonrun.c
Simple merge

diff --cc Python/sysmodule.c
Simple merge