Commit Graph

40912 Commits

Author SHA1 Message Date
Benjamin Peterson 26eb9d0b47 Merged revisions 82342 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82342 | benjamin.peterson | 2010-06-28 14:43:42 -0500 (Mon, 28 Jun 2010) | 1 line

  update error message
........
2010-06-28 19:46:35 +00:00
Senthil Kumaran 783df8d491 Merged revisions 82336 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82336 | senthil.kumaran | 2010-06-28 23:01:40 +0530 (Mon, 28 Jun 2010) | 9 lines

  Merged revisions 82334 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r82334 | senthil.kumaran | 2010-06-28 22:37:40 +0530 (Mon, 28 Jun 2010) | 3 lines

    Documentation correction. urllib2.urlopen.info returns a mimetools.Message instance not HTTPMessage object.
  ........
................
2010-06-28 17:35:17 +00:00
Alexander Belopolsky 6b131cb110 Blocked revisions 82328 via svnmerge
........
  r82328 | alexander.belopolsky | 2010-06-28 10:36:55 -0400 (Mon, 28 Jun 2010) | 1 line

  Added missing white space
........
2010-06-28 14:38:44 +00:00
Senthil Kumaran 930049bda9 Merged revisions 82326 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82326 | senthil.kumaran | 2010-06-28 19:38:00 +0530 (Mon, 28 Jun 2010) | 9 lines

  Merged revisions 82324 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r82324 | senthil.kumaran | 2010-06-28 19:26:46 +0530 (Mon, 28 Jun 2010) | 3 lines

    Fix Issue8653 - Docstring for urlunsplit function.
  ........
................
2010-06-28 14:12:18 +00:00
Ronald Oussoren ddb62e9f4c Merged revisions 82286 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82286 | ronald.oussoren | 2010-06-27 16:26:30 +0200 (Sun, 27 Jun 2010) | 11 lines

  Merged revisions 82284 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r82284 | ronald.oussoren | 2010-06-27 15:59:39 +0200 (Sun, 27 Jun 2010) | 4 lines

    Fix for Issue8883: without this patch test_urllib will fail
    when there is a bare IP address in the "Bypass proxy settings
    for these Hosts & Domains" list on MacOSX.
  ........
................
2010-06-27 14:27:27 +00:00
Ronald Oussoren 536ad94edb Merged revisions 82281 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82281 | ronald.oussoren | 2010-06-27 14:51:31 +0200 (Sun, 27 Jun 2010) | 19 lines

  Merged revisions 82150 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r82150 | ronald.oussoren | 2010-06-22 11:32:22 +0200 (Tue, 22 Jun 2010) | 12 lines

    The code in _scproxy (a mac specific helper module to
    detect proxy settings) had the wrong logic for detecting
    if the checkbox 'Exclude simple hostnames' is checked. This
    checkin fixes that.

    As a result the test failure 'Issue8455' goes away on systems
    where the checkbox is not checked.

    I'm carefully avoiding saying that is fixes that issue,
    test_urllib2_localnet assumes that system proxy settings are
    empty (not just on OSX, see Issue8455 for details).
  ........
................
2010-06-27 12:52:17 +00:00
Ronald Oussoren a75facfdc7 Merged revisions 82278 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82278 | ronald.oussoren | 2010-06-27 14:45:47 +0200 (Sun, 27 Jun 2010) | 12 lines

  Merged revisions 82276 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r82276 | ronald.oussoren | 2010-06-27 14:43:47 +0200 (Sun, 27 Jun 2010) | 5 lines

    The uuid library on OSX 10.5 seems to contain the same bug as the one
    on OSX 10.6, therefore don't use it there either.

    This fixes issue8621.
  ........
................
2010-06-27 12:46:19 +00:00
Ronald Oussoren 0f2985c1c2 Merged revisions 82273 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82273 | ronald.oussoren | 2010-06-27 14:37:46 +0200 (Sun, 27 Jun 2010) | 15 lines

  Merged revisions 82272 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r82272 | ronald.oussoren | 2010-06-27 14:36:16 +0200 (Sun, 27 Jun 2010) | 8 lines

    Two small fixes for the support for SDKs on MacOSX:

    1) The code that checks if an path should be located in the SDK
       explicitly excludes /usr/local. This fixes issue9046

    2) The SDK variant for filtering "db_dirs_to_check" in setup.py
       was not doing anything because of a missing assignment.
  ........
................
2010-06-27 12:40:35 +00:00
Georg Brandl 525201a08c Fix duplicate paragraph. 2010-06-27 10:57:33 +00:00
R. David Murray a5bb2ca323 Blocked revisions 82247 via svnmerge
................
  r82247 | r.david.murray | 2010-06-26 14:44:14 -0400 (Sat, 26 Jun 2010) | 14 lines

  Blocked revisions 82246 via svnmerge

  ........
    r82246 | r.david.murray | 2010-06-26 14:39:50 -0400 (Sat, 26 Jun 2010) | 8 lines

    #9085: email versions have gotten out of sync, 2.7 is actually 4.0.3.

    In 2.5 the email version was bumped to 4.0.2 just before release but
    after the maintenance branch was set up.  The bump was not backported
    to trunk, and 2.6 went out the door with a version number of 4.0.1.
    I bumped this to 4.0.2 because of a behavior change, but that makes
    it look the same as 2.5.  So bump it again to 4.0.3.
  ........
................
2010-06-26 19:07:29 +00:00
Alexander Belopolsky 46980d8bb1 Merged revisions 82255 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82255 | alexander.belopolsky | 2010-06-26 14:57:02 -0400 (Sat, 26 Jun 2010) | 9 lines

  Merged revisions 82251 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r82251 | alexander.belopolsky | 2010-06-26 14:49:10 -0400 (Sat, 26 Jun 2010) | 1 line

    Issue 9024: Added :cdata: tag to PyDateTimeAPI
  ........
................
2010-06-26 18:58:29 +00:00
Ezio Melotti 415f340a0c Merged revisions 82252 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82252 | ezio.melotti | 2010-06-26 21:50:39 +0300 (Sat, 26 Jun 2010) | 9 lines

  Merged revisions 82248 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r82248 | ezio.melotti | 2010-06-26 21:44:42 +0300 (Sat, 26 Jun 2010) | 1 line

    Fix extra space.
  ........
................
2010-06-26 18:52:26 +00:00
R. David Murray dbc8ed9ad8 Merged revisions 82244 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82244 | r.david.murray | 2010-06-25 23:34:33 -0400 (Fri, 25 Jun 2010) | 9 lines

  Merged revisions 82242 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r82242 | r.david.murray | 2010-06-25 23:27:32 -0400 (Fri, 25 Jun 2010) | 2 lines

    Fix indentation in recently added test.
  ........
................
2010-06-26 03:36:05 +00:00
Alexander Belopolsky 2960571723 Merged revisions 82238 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82238 | alexander.belopolsky | 2010-06-25 22:15:07 -0400 (Fri, 25 Jun 2010) | 11 lines

  Merged revisions 82236 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r82236 | alexander.belopolsky | 2010-06-25 22:05:19 -0400 (Fri, 25 Jun 2010) | 4 lines

    Issue #9024: Fixed mark-up for PyDateTime_IMPORT macro and added that
    it is typically used in module initialization function. Thanks Tim
    Golden for the patch.
  ........
................
2010-06-26 02:16:57 +00:00
R. David Murray a5b2dcf2b2 Merged revisions 82234 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82234 | r.david.murray | 2010-06-25 20:17:12 -0400 (Fri, 25 Jun 2010) | 9 lines

  Merged revisions 82233 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r82233 | r.david.murray | 2010-06-25 20:06:44 -0400 (Fri, 25 Jun 2010) | 2 lines

    #4640: add a test to optparse that proves issue is invalid.
  ........
................
2010-06-26 00:20:20 +00:00
Mark Dickinson b76207138a Merged revisions 82223 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82223 | mark.dickinson | 2010-06-25 21:22:24 +0100 (Fri, 25 Jun 2010) | 9 lines

  Merged revisions 82221 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r82221 | mark.dickinson | 2010-06-25 21:19:48 +0100 (Fri, 25 Jun 2010) | 1 line

    Fix indentation of Python code example in C comment.
  ........
................
2010-06-25 20:23:41 +00:00
Ezio Melotti 4af2c15e5f Blocked revisions 82214 via svnmerge
........
  r82214 | ezio.melotti | 2010-06-25 13:56:11 +0300 (Fri, 25 Jun 2010) | 1 line

  #9018: os.path.normcase() now raises a TypeError if the argument is not str or bytes.
........
2010-06-25 11:02:09 +00:00
Antoine Pitrou 4b261d2073 Merged revisions 82211 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82211 | antoine.pitrou | 2010-06-25 02:07:34 +0200 (ven., 25 juin 2010) | 10 lines

  Merged revisions 82210 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r82210 | antoine.pitrou | 2010-06-25 02:03:21 +0200 (ven., 25 juin 2010) | 4 lines

    Issue #9075: In the ssl module, remove the setting of a `debug` flag
    on an OpenSSL structure.
  ........
................
2010-06-25 00:13:19 +00:00
Victor Stinner eb8e851c1d Blocked revisions 82208 via svnmerge
........
  r82208 | victor.stinner | 2010-06-25 02:02:38 +0200 (ven., 25 juin 2010) | 3 lines

  Issue #8850: Remove "w" and "w#" formats from PyArg_Parse*() functions, use
  "w*" format instead. Add tests for "w*" format.
........
2010-06-25 00:03:04 +00:00
Victor Stinner 174799912f Issue #8926: getargs.c: release the buffer on error
- "t#" format: don't get the buffer if the object is not a pinned buffer
 - getbuffer(): release the buffer on error

(Commit based on r82206 from py3k)
2010-06-24 23:06:25 +00:00
Antoine Pitrou 94fbaac58d Merged revisions 82204 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82204 | antoine.pitrou | 2010-06-25 00:34:04 +0200 (ven., 25 juin 2010) | 5 lines

  Issue #8682: The ssl module now temporary increments the reference count of
  a socket object got through `PyWeakref_GetObject`, so as to avoid possible
  deallocation while the object is still being used.
........
2010-06-24 22:49:57 +00:00
Victor Stinner 53ec7d53d0 Blocked revisions 82202 via svnmerge
........
  r82202 | victor.stinner | 2010-06-25 00:31:12 +0200 (ven., 25 juin 2010) | 2 lines

  PyArg_Parse*() functions: factorize code for s/z and u/Z formats
........
2010-06-24 22:31:38 +00:00
Victor Stinner e902e260f2 Blocked revisions 82200 via svnmerge
........
  r82200 | victor.stinner | 2010-06-25 00:08:25 +0200 (ven., 25 juin 2010) | 3 lines

  Issue #8949: "z" format of PyArg_Parse*() functions doesn't accept bytes
  objects, as described in the documentation.
........
2010-06-24 22:10:45 +00:00
Stefan Krah 521ee5651c Merged revisions 82194 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82194 | stefan.krah | 2010-06-24 12:25:08 +0200 (Thu, 24 Jun 2010) | 3 lines

  Add specification for the Py_IS* macros in pyctype.h.
........
2010-06-24 10:27:19 +00:00
Alexander Belopolsky f0ae4c48dd Blocked revisions 82184 via svnmerge
........
  r82184 | alexander.belopolsky | 2010-06-23 17:40:15 -0400 (Wed, 23 Jun 2010) | 1 line

  Issue #9051: Instances of timezone class can now be pickled.
........
2010-06-23 23:04:22 +00:00
Stefan Krah c87901d56c Merged revisions 82181 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82181 | stefan.krah | 2010-06-23 20:42:39 +0200 (Wed, 23 Jun 2010) | 3 lines

  Issue #8930: Remaining indentation fixes after the Grand Unified Indenting.
........
2010-06-23 18:54:09 +00:00
Antoine Pitrou 252e8e2f61 Merged revisions 82171 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82171 | antoine.pitrou | 2010-06-22 23:49:39 +0200 (mar., 22 juin 2010) | 10 lines

  Merged revisions 82169 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r82169 | antoine.pitrou | 2010-06-22 23:42:05 +0200 (mar., 22 juin 2010) | 4 lines

    Fix misindents in compile.c (for Benjamin).
    Of course, whoever used the wrong indentation rules needs to be spanked.
  ........
................
2010-06-22 21:53:47 +00:00
Benjamin Peterson 479a38b8fd Merged revisions 82159 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82159 | benjamin.peterson | 2010-06-22 14:21:52 -0500 (Tue, 22 Jun 2010) | 9 lines

  Merged revisions 82157 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r82157 | benjamin.peterson | 2010-06-22 14:16:37 -0500 (Tue, 22 Jun 2010) | 1 line

    remove INT_MAX assertions; they can fail with large Py_ssize_t #9058
  ........
................
2010-06-22 20:11:09 +00:00
Alexander Belopolsky f4b552e7d5 Merged revisions 82152 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82152 | alexander.belopolsky | 2010-06-22 10:07:33 -0400 (Tue, 22 Jun 2010) | 1 line

  Added more test cases
........
2010-06-22 14:43:47 +00:00
Senthil Kumaran fd51270991 Merged revisions 82146 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82146 | senthil.kumaran | 2010-06-22 08:12:52 +0530 (Tue, 22 Jun 2010) | 3 lines

  Minor docs issue.
........
2010-06-22 02:46:49 +00:00
Benjamin Peterson c2037d6ec8 only use -fno-strict-aliasing when needed by compiler 2010-06-21 17:04:07 +00:00
Benjamin Peterson f7155a38cd run autoreconf 2010-06-21 16:51:22 +00:00
Benjamin Peterson 08cde2d0b1 Merged revisions 82131 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82131 | benjamin.peterson | 2010-06-21 10:37:16 -0500 (Mon, 21 Jun 2010) | 9 lines

  Merged revisions 82130 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r82130 | benjamin.peterson | 2010-06-21 10:27:46 -0500 (Mon, 21 Jun 2010) | 1 line

    fix finding visual studio 2008 on 64 bit #8854
  ........
................
2010-06-21 15:42:48 +00:00
Alexander Belopolsky 2c8253856f Blocked revisions 82128 via svnmerge
........
  r82128 | alexander.belopolsky | 2010-06-21 11:21:14 -0400 (Mon, 21 Jun 2010) | 2 lines

  Issue #9005: Prevent utctimetuple() from producing year 0 or year 10,000.
........
2010-06-21 15:22:30 +00:00
Victor Stinner eb389715fb Merged revisions 82084 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82084 | victor.stinner | 2010-06-19 01:59:45 +0200 (sam., 19 juin 2010) | 6 lines

  Issue #8939: Improve arg.rst

   * Add :ctype: to Py_BEGIN_ALLOW_THREADS and int
   * "s" and "s#" formats of Py_BuildValue(): specify that the Python object type
     is str in the description
........
2010-06-19 00:05:54 +00:00
Jean-Paul Calderone 2323d20289 Merged revisions 82076 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82076 | jean-paul.calderone | 2010-06-18 16:03:54 -0400 (Fri, 18 Jun 2010) | 19 lines

  Merged revisions 82075 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r82075 | jean-paul.calderone | 2010-06-18 16:00:17 -0400 (Fri, 18 Jun 2010) | 12 lines

    Revert r60115

    This revision introduced quoting for strings containing | based
    on a misunderstanding of the commonly used quoting rules used
    on Windows.

    | is interpreted by cmd.exe, not by the MS C runtime argv initializer.
    It only needs to be quoted if it is part of an argument passed through
    cmd.exe.

    See issue1300, issue7839, and issue8972.
  ........
................
2010-06-18 20:11:43 +00:00
Alexander Belopolsky 62f080c22e Blocked revisions 82073 via svnmerge
........
  r82073 | alexander.belopolsky | 2010-06-18 14:44:37 -0400 (Fri, 18 Jun 2010) | 4 lines

  Issue #6641: Original commit for this issue, r82053, introduced a
  regression making datetime subclass' strptime return datetime rather
  than subclass instances.  Fixed this bug and a few typos.
........
2010-06-18 18:45:58 +00:00
Alexander Belopolsky 081994de8e Blocked revisions 82071 via svnmerge
........
  r82071 | alexander.belopolsky | 2010-06-18 12:57:49 -0400 (Fri, 18 Jun 2010) | 1 line

  Added a new line at the end of the file.
........
2010-06-18 16:59:25 +00:00
Senthil Kumaran b4d1c2c861 Merged revisions 82068 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82068 | senthil.kumaran | 2010-06-18 20:38:18 +0530 (Fri, 18 Jun 2010) | 3 lines

  Fix Issue1368368 - prompt_user_passwd() in FancyURLopener masks 401 Unauthorized error page
........
2010-06-18 15:12:48 +00:00
Victor Stinner 25bb0fdb67 Merged revisions 82059,82061 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82059 | victor.stinner | 2010-06-18 01:08:50 +0200 (ven., 18 juin 2010) | 5 lines

  Issue #6543: Write the traceback in the terminal encoding instead of utf-8.
  Fix the encoding of the modules filename.

  Reindent also traceback.h, just because I hate tabs :-)
........
  r82061 | victor.stinner | 2010-06-18 01:17:37 +0200 (ven., 18 juin 2010) | 2 lines

  Issue #6543: Mention the author of the patch, Amaury Forgeot d'Arc
........
2010-06-17 23:23:37 +00:00
Victor Stinner 9b16326e5d Oops, I did't want to block r82059 (revert r82060) 2010-06-17 23:20:37 +00:00
Victor Stinner 993c674cf3 Blocked revisions 82059 via svnmerge
........
  r82059 | victor.stinner | 2010-06-18 01:08:50 +0200 (ven., 18 juin 2010) | 5 lines

  Issue #6543: Write the traceback in the terminal encoding instead of utf-8.
  Fix the encoding of the modules filename.

  Reindent also traceback.h, just because I hate tabs :-)
........
2010-06-17 23:11:18 +00:00
Victor Stinner 428b4e3eee Merged revisions 82057 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82057 | victor.stinner | 2010-06-17 23:43:33 +0200 (jeu., 17 juin 2010) | 2 lines

  Issue #8203: Fix IDLE Credits dialog: view_file() uses its encoding argument.
........
2010-06-17 21:45:56 +00:00
Alexander Belopolsky 3ff73848f2 Blocked revisions 82053 via svnmerge
........
  r82053 | alexander.belopolsky | 2010-06-17 14:30:34 -0400 (Thu, 17 Jun 2010) | 2 lines

  Issue #6641: The datetime.strptime method now supports the %z directive.
........
2010-06-17 18:32:37 +00:00
Mark Dickinson ff0aea26c3 Merged revisions 82051 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82051 | mark.dickinson | 2010-06-17 19:24:52 +0100 (Thu, 17 Jun 2010) | 2 lines

  Add note about changes to the `round` function between 2.x and 3.x.
........
2010-06-17 18:25:38 +00:00
Senthil Kumaran 28fdadb768 Merged revisions 82049 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82049 | senthil.kumaran | 2010-06-17 22:18:06 +0530 (Thu, 17 Jun 2010) | 9 lines

  Merged revisions 82047 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r82047 | senthil.kumaran | 2010-06-17 22:08:34 +0530 (Thu, 17 Jun 2010) | 3 lines

    Fix Issue4452 - Incorrect docstring of os.setpgrp
  ........
................
2010-06-17 16:51:08 +00:00
R. David Murray 0217eb8cbd Merged revisions 82045 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82045 | r.david.murray | 2010-06-17 09:23:18 -0400 (Thu, 17 Jun 2010) | 5 lines

  Don't use os.normcase when the result we are expecting is None.

  This worked fine on linux but fails on Windows.  That may or may
  not be a bug in normcase.
........
2010-06-17 13:27:40 +00:00
Mark Dickinson a58eed9cca Merged revisions 82043 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82043 | mark.dickinson | 2010-06-17 13:33:22 +0100 (Thu, 17 Jun 2010) | 6 lines

  Issue #9011: Remove buggy and unnecessary ST->AST compilation code
  dealing with unary minus applied to a constant.  The removed code was
  mutating the ST, causing a second compilation to fail.  (The peephole
  optimizer already takes care of optimizing this case, so there's no
  lost optimization opportunity here.)
........
2010-06-17 12:37:17 +00:00
R. David Murray 19d8cc524b Merged revisions 82041 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82041 | r.david.murray | 2010-06-16 22:04:29 -0400 (Wed, 16 Jun 2010) | 16 lines

  Merged revisions 82039 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r82039 | r.david.murray | 2010-06-16 21:36:52 -0400 (Wed, 16 Jun 2010) | 10 lines

    #8720: fix inspect regression by teaching getsourcefile about linecache.

    The fix for issue 4050 caused a regression:  before that fix, source
    lines in the linecache would eventually be found by inspect.  After the
    fix inspect reports an error earlier, and the source isn't found.
    The fix for the fix is to have getsourcefile look in the linecache for
    the file and return the psuedo-filename if the source is there, just as
    it already returns it if there is a PEP 302 loader.
  ........
................
2010-06-17 02:06:12 +00:00
Alexander Belopolsky 991c9f80f9 Blocked revisions 82034-82035 via svnmerge
........
  r82034 | alexander.belopolsky | 2010-06-16 18:38:15 -0400 (Wed, 16 Jun 2010) | 6 lines

  Issue #9012: "Separate compilation of time and datetime modules."
  Segregated code shared between time and datetime modules into
  Modules/_time.c.  Added a new header file, Modules/_time.h, which
  will be used instead of Include/timefuncs.h for declarations shared
  between time and datetime modules.
........
  r82035 | victor.stinner | 2010-06-16 19:05:06 -0400 (Wed, 16 Jun 2010) | 4 lines

  Issue #9012: Add _time.c and _time.h to the Visual Studio project file

  Add these new files, added by r82034, to the pythoncore project.
........
2010-06-16 23:17:44 +00:00