Commit Graph

40474 Commits

Author SHA1 Message Date
Benjamin Peterson c8f5540062 revert part of r77938 which broke hashlib constructors #8167 2010-03-18 21:27:29 +00:00
Benjamin Peterson 903fc51649 Merged revisions 79052 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r79052 | benjamin.peterson | 2010-03-18 16:23:05 -0500 (Thu, 18 Mar 2010) | 9 lines

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

  ........
    r79051 | benjamin.peterson | 2010-03-18 16:20:35 -0500 (Thu, 18 Mar 2010) | 1 line

    don't try to compile anything in lib2to3/tests/data #8169
  ........
................
2010-03-18 21:25:12 +00:00
Matthias Klose e1609b7793 Merged revisions 78989 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78989 | matthias.klose | 2010-03-16 11:51:28 +0100 (Tue, 16 Mar 2010) | 10 lines

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

  ........
    r78988 | matthias.klose | 2010-03-16 11:48:52 +0100 (Tue, 16 Mar 2010) | 3 lines

    - Issue #4961: Inconsistent/wrong result of askyesno function in tkMessageBox
      with Tcl/Tk-8.5.
  ........
................
2010-03-16 10:53:02 +00:00
Matthias Klose ffb5384ab1 Merged revisions 78980 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78980 | matthias.klose | 2010-03-15 14:46:04 +0100 (Mo, 15 Mär 2010) | 10 lines

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

  ........
    r78979 | matthias.klose | 2010-03-15 14:42:23 +0100 (Mo, 15 Mär 2010) | 3 lines

    - Issue #7356: ctypes.util: Make parsing of ldconfig output independent of
      the locale.
  ........
................
2010-03-15 13:51:00 +00:00
Ezio Melotti 8209fcc3a9 Merged revisions 78950 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r78950 | ezio.melotti | 2010-03-14 11:51:37 +0200 (Sun, 14 Mar 2010) | 1 line

  #7057: fix several errors.
........
2010-03-14 09:53:34 +00:00
Georg Brandl 8c8430e2af Merged revisions 78924 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k

................
  r78924 | georg.brandl | 2010-03-13 14:42:16 +0100 (Sa, 13 Mär 2010) | 9 lines

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

  ........
    r78921 | georg.brandl | 2010-03-13 14:39:46 +0100 (Sa, 13 Mär 2010) | 1 line

    Change/fix handling of docs download location: for daily builds, put them right next to the HTML.
  ........
................
2010-03-13 13:43:01 +00:00
Georg Brandl e869313e85 Merged revisions 78915 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k

................
  r78915 | georg.brandl | 2010-03-13 12:02:07 +0100 (Sa, 13 Mär 2010) | 9 lines

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

  ........
    r78908 | georg.brandl | 2010-03-13 11:12:39 +0100 (Sa, 13 Mär 2010) | 1 line

    Add Makefile targets for automatic doc build.  Add script that will be used for daily build.
  ........
................
2010-03-13 11:03:05 +00:00
Georg Brandl 0c812842e7 Merged revisions 78911 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k

................
  r78911 | georg.brandl | 2010-03-13 11:56:09 +0100 (Sa, 13 Mär 2010) | 9 lines

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

  ........
    r78910 | georg.brandl | 2010-03-13 11:54:12 +0100 (Sa, 13 Mär 2010) | 1 line

    Bump externals versions for doc build.
  ........
................
2010-03-13 10:57:09 +00:00
Georg Brandl da746d7a0e Merged revisions 77173 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k

................
  r77173 | benjamin.peterson | 2009-12-31 04:35:15 +0100 (Do, 31 Dez 2009) | 13 lines

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

  ........
    r77151 | georg.brandl | 2009-12-30 12:32:50 -0600 (Wed, 30 Dec 2009) | 1 line

    #7487: update Pygments version.
  ........
    r77152 | georg.brandl | 2009-12-30 12:36:09 -0600 (Wed, 30 Dec 2009) | 1 line

    #7602: improve "clean" and "checkout" targets now that all tools are in externals.
  ........
................
2010-03-13 10:02:01 +00:00
Georg Brandl 87e62f0722 Blocked revisions 78804 via svnmerge
................
  r78804 | r.david.murray | 2010-03-08 18:48:38 +0100 (Mo, 08 Mär 2010) | 13 lines

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

  ........
    r78416 | dirkjan.ochtman | 2010-02-23 23:12:11 -0500 (Tue, 23 Feb 2010) | 1 line

    Issue #8004: add a serve target to the Doc Makefile.
  ........
    r78430 | dirkjan.ochtman | 2010-02-24 12:06:31 -0500 (Wed, 24 Feb 2010) | 1 line

    Add some notes about Tools/scripts/serve.py.
  ........
................
2010-03-13 10:01:12 +00:00
Mark Dickinson 37b9c10603 Blocked revisions 78902 via svnmerge
........
  r78902 | mark.dickinson | 2010-03-13 09:48:39 +0000 (Sat, 13 Mar 2010) | 2 lines

  Issue #7845:  Make 1j.__le__(2j) return NotImplemented rather than raising TypeError.
........
2010-03-13 09:49:51 +00:00
Ezio Melotti 7b7320e3b7 Merged revisions 78896 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78896 | ezio.melotti | 2010-03-13 03:28:34 +0200 (Sat, 13 Mar 2010) | 9 lines

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

  ........
    r78895 | ezio.melotti | 2010-03-13 03:21:34 +0200 (Sat, 13 Mar 2010) | 1 line

    #8011: use exc.tb_lineno instead of traceback.tb_lineno() and pep8ify variable names.
  ........
................
2010-03-13 01:30:13 +00:00
Ezio Melotti 9ebc18724b Merged revisions 78891 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78891 | ezio.melotti | 2010-03-13 02:26:04 +0200 (Sat, 13 Mar 2010) | 9 lines

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

  ........
    r78887 | ezio.melotti | 2010-03-13 02:15:36 +0200 (Sat, 13 Mar 2010) | 1 line

    fix broken links
  ........
................
2010-03-13 00:27:48 +00:00
Victor Stinner abcbe0a5f0 Blocked revisions 78888 via svnmerge
................
  r78888 | victor.stinner | 2010-03-13 01:19:17 +0100 (sam., 13 mars 2010) | 9 lines

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

  ........
    r78886 | victor.stinner | 2010-03-13 01:13:22 +0100 (sam., 13 mars 2010) | 2 lines

    Issue #7818: set().test_c_api() doesn't expect a set('abc'), modify the set.
  ........
................
2010-03-13 00:23:46 +00:00
Ezio Melotti ede5d83f12 Merged revisions 78884 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r78884 | ezio.melotti | 2010-03-13 00:45:38 +0200 (Sat, 13 Mar 2010) | 1 line

  #8057: fix strings -> byte strings
........
2010-03-12 22:48:16 +00:00
Georg Brandl 416d662f30 Merged revisions 78882 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k

................
  r78882 | georg.brandl | 2010-03-12 22:29:28 +0100 (Fr, 12 Mär 2010) | 9 lines

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

  ........
    r78880 | georg.brandl | 2010-03-12 22:27:23 +0100 (Fr, 12 Mär 2010) | 1 line

    Deactivate automatic upload of the docs to python.org, they will now be built by a job on that machine.
  ........
................
2010-03-12 21:30:42 +00:00
Benjamin Peterson 2417634087 Merged revisions 78818 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78818 | benjamin.peterson | 2010-03-09 15:46:49 -0600 (Tue, 09 Mar 2010) | 9 lines

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

  ........
    r78817 | benjamin.peterson | 2010-03-09 15:43:36 -0600 (Tue, 09 Mar 2010) | 1 line

    handle an empty OPT variable correctly #8100
  ........
................
2010-03-10 22:28:52 +00:00
Ronald Oussoren d4be7a24d4 Merged revisions 78808 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r78808 | ronald.oussoren | 2010-03-09 07:40:19 +0100 (Tue, 09 Mar 2010) | 2 lines

  Bugfix for the fix for issue 8067
........
2010-03-09 06:41:58 +00:00
Ronald Oussoren 095d2820bb Merged revisions 78782 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r78782 | ronald.oussoren | 2010-03-08 08:02:03 +0100 (Mon, 08 Mar 2010) | 2 lines

  Fix for issue 8067
........
2010-03-08 07:03:14 +00:00
Benjamin Peterson d01444d325 Merged revisions 78766 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r78766 | benjamin.peterson | 2010-03-07 11:10:51 -0600 (Sun, 07 Mar 2010) | 1 line

  prevent generator finalization from invalidating sys.exc_info() #7173
........
2010-03-07 17:14:15 +00:00
Senthil Kumaran 056c060589 Reverting the change made in r78434 2010-03-07 04:13:48 +00:00
Benjamin Peterson 83b32fddd6 start working towards 3.1.2 final 2010-03-06 22:45:53 +00:00
Benjamin Peterson 347bc22b9c tagging 3.1.2 release candidate 2010-03-06 20:40:49 +00:00
Benjamin Peterson c48b055258 Merged revisions 78739 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78739 | benjamin.peterson | 2010-03-06 14:34:24 -0600 (Sat, 06 Mar 2010) | 10 lines

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

  ........
    r78718 | gregory.p.smith | 2010-03-06 01:35:19 -0600 (Sat, 06 Mar 2010) | 3 lines

    Call setreuid and setregid in a subprocess to avoid altering the test runner's
    process state.  Should fix issue8045.
  ........
................
2010-03-06 20:37:32 +00:00
Benjamin Peterson e4b56d2eee bump to 3.1.2rc1 2010-03-06 20:28:33 +00:00
Ezio Melotti dab886ab0f Merged revisions 78729 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r78729 | ezio.melotti | 2010-03-06 17:24:08 +0200 (Sat, 06 Mar 2010) | 1 line

  #6509: fix re.sub to work properly when the pattern, the string, and the replacement were all bytes. Patch by Antoine Pitrou.
........
2010-03-06 15:27:04 +00:00
Ezio Melotti c0ddee54b0 Merged revisions 78689,78696-78697,78708,78711 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r78689 | ezio.melotti | 2010-03-05 14:43:17 +0200 (Fri, 05 Mar 2010) | 1 line

  This fixes a missing .lower() on the encoding name, a wrong byte undecodable by UTF-8, a wrong variable name, hopefully some windows buildbot on 3.x and adds a proper skip. It might break other things though.
........
  r78696 | ezio.melotti | 2010-03-05 17:08:19 +0200 (Fri, 05 Mar 2010) | 1 line

  r78689 enabled the test on more platforms but the buildbot did not like it. Using the filesystem encoding might work better. Also see #5604.
........
  r78697 | ezio.melotti | 2010-03-05 17:17:26 +0200 (Fri, 05 Mar 2010) | 1 line

  sys.getdefaultencoding() can return None.
........
  r78708 | ezio.melotti | 2010-03-06 03:20:49 +0200 (Sat, 06 Mar 2010) | 1 line

  Cleanup and minor fixes.
........
  r78711 | ezio.melotti | 2010-03-06 03:50:25 +0200 (Sat, 06 Mar 2010) | 1 line

  The test was failing because the curdir was missing from sys.path. This should fix the problem.
........
2010-03-06 03:09:26 +00:00
Gerhard Häring 7857650833 Issue #7670: sqlite3: Fixed crashes when operating on closed connections. 2010-03-05 15:55:55 +00:00
Mark Dickinson 9482032761 Merged revisions 78692 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r78692 | mark.dickinson | 2010-03-05 14:44:08 +0000 (Fri, 05 Mar 2010) | 1 line

  Remove unused imports & clean up sys imports in test_struct.
........
2010-03-05 14:45:49 +00:00
Benjamin Peterson 3e56dbe0ed Merged revisions 78684 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78684 | benjamin.peterson | 2010-03-04 21:27:12 -0600 (Thu, 04 Mar 2010) | 20 lines

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

  ................
    r78683 | benjamin.peterson | 2010-03-04 21:24:17 -0600 (Thu, 04 Mar 2010) | 13 lines

    Merged revisions 78679,78681 via svnmerge from
    svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

    ........
      r78679 | benjamin.peterson | 2010-03-04 21:10:46 -0600 (Thu, 04 Mar 2010) | 1 line

      set svn:eol-style
    ........
      r78681 | benjamin.peterson | 2010-03-04 21:19:06 -0600 (Thu, 04 Mar 2010) | 1 line

      remove svn:executable property
    ........
  ................
................
2010-03-05 03:30:16 +00:00
Victor Stinner 26c966b91d Merged revisions 78664 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r78664 | victor.stinner | 2010-03-04 22:59:53 +0100 (jeu., 04 mars 2010) | 3 lines

  Issue #3299: replace PyObject_DEL() by Py_DECREF() in _sre module to fix a
  crash in pydebug mode.
........
2010-03-04 22:01:47 +00:00
R. David Murray 9fc20536a4 Merged revisions 78657 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78657 | r.david.murray | 2010-03-04 12:38:18 -0500 (Thu, 04 Mar 2010) | 10 lines

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

  ........
    r78656 | r.david.murray | 2010-03-04 12:34:05 -0500 (Thu, 04 Mar 2010) | 3 lines

    Fix documentation of email.Message.get_filename to match
    the fix applied in Issue 7082.
  ........
................
2010-03-04 17:43:40 +00:00
Victor Stinner 1dad6501ce Merged revisions 78649 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r78649 | victor.stinner | 2010-03-04 13:47:32 +0100 (jeu., 04 mars 2010) | 2 lines

  oops, fix the test of my previous commit about unicodedata and PR #29 (r78647)
........
2010-03-04 12:48:27 +00:00
Victor Stinner a9d157a8dd Merged revisions 78647 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78647 | victor.stinner | 2010-03-04 13:14:57 +0100 (jeu., 04 mars 2010) | 12 lines

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

  ........
    r78646 | victor.stinner | 2010-03-04 13:09:33 +0100 (jeu., 04 mars 2010) | 5 lines

    Issue #1054943: Fix unicodedata.normalize('NFC', text) for the Public Review
    Issue #29.

    PR #29 was released in february 2004!
  ........
................
2010-03-04 12:16:27 +00:00
Victor Stinner da13545ebe Merged revisions 78642 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78642 | victor.stinner | 2010-03-04 01:29:24 +0100 (jeu., 04 mars 2010) | 10 lines

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

  ........
    r78641 | victor.stinner | 2010-03-04 01:10:12 +0100 (jeu., 04 mars 2010) | 3 lines

    Issue #7494: fix a crash in _lsprof (cProfile) after clearing the profiler,
    reset also the pointer to the current pointer context.
  ........
................
2010-03-04 00:33:35 +00:00
Victor Stinner ef32bc8569 Merged revisions 78639 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78639 | victor.stinner | 2010-03-04 00:28:07 +0100 (jeu., 04 mars 2010) | 10 lines

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

  ........
    r78638 | victor.stinner | 2010-03-04 00:20:25 +0100 (jeu., 04 mars 2010) | 3 lines

    Issue #7544: Preallocate thread memory before creating the thread to avoid a
    fatal error in low memory condition.
  ........
................
2010-03-03 23:32:07 +00:00
Victor Stinner 925ca76ae7 Merged revisions 78636 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78636 | victor.stinner | 2010-03-03 22:56:53 +0100 (mer., 03 mars 2010) | 12 lines

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

  ........
    r78635 | victor.stinner | 2010-03-03 22:53:41 +0100 (mer., 03 mars 2010) | 5 lines

    Issue #3299: fix curses.panel.new_panel() error handler, replace PyObject_DEL()
    by Py_DECREF() to avoid a crash in pydebug mode.

    Use po->wo==NULL to detect than the panel is in the lop list or not.
  ........
................
2010-03-03 21:57:58 +00:00
Ezio Melotti 1ff0c6c9f8 Merged revisions 78632 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r78632 | ezio.melotti | 2010-03-03 22:10:45 +0200 (Wed, 03 Mar 2010) | 1 line

  Add the argparse module and Steven as its maintainer.
........
2010-03-03 20:12:28 +00:00
Lars Gustäbel 8d63db8fab Blocked revisions 78626 via svnmerge
................
  r78626 | lars.gustaebel | 2010-03-03 13:08:54 +0100 (Wed, 03 Mar 2010) | 10 lines

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

  ........
    r78623 | lars.gustaebel | 2010-03-03 12:55:48 +0100 (Wed, 03 Mar 2010) | 3 lines

    Issue #7232: Add support for the context manager protocol
    to the TarFile class.
  ........
................
2010-03-03 12:19:15 +00:00
Florent Xicluna d7494de5bf Merged revisions 78622 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78622 | florent.xicluna | 2010-03-03 12:54:54 +0100 (mer, 03 mar 2010) | 9 lines

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

  ........
    r78620 | florent.xicluna | 2010-03-03 12:49:53 +0100 (mer, 03 mar 2010) | 2 lines

    Revert a nonexistent docstring typo, r42805.
  ........
................
2010-03-03 11:55:53 +00:00
Victor Stinner 5774043795 Merged revisions 78611 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78611 | victor.stinner | 2010-03-03 01:50:12 +0100 (mer., 03 mars 2010) | 10 lines

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

  ........
    r78610 | victor.stinner | 2010-03-03 01:43:44 +0100 (mer., 03 mars 2010) | 3 lines

    Issue #3299: fix thread.allocate_lock() error handler, replace PyObject_Del()
    by Py_DECREF() to fix a crash in pydebug mode.
  ........
................
2010-03-03 00:51:28 +00:00
Victor Stinner 151205f24f Merged revisions 78608 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78608 | victor.stinner | 2010-03-03 01:18:49 +0100 (mer., 03 mars 2010) | 12 lines

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

  ........
    r78603 | victor.stinner | 2010-03-03 00:20:02 +0100 (mer., 03 mars 2010) | 5 lines

    Issue #7820: The parser tokenizer restores all bytes in the right if the BOM
    check fails.

    Fix an assertion in pydebug mode.
  ........
................
2010-03-03 00:22:21 +00:00
Victor Stinner 117ff17da3 Merged revisions 78598 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78598 | victor.stinner | 2010-03-02 23:48:17 +0100 (mar., 02 mars 2010) | 11 lines

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

  ........
    r78596 | victor.stinner | 2010-03-02 23:44:42 +0100 (mar., 02 mars 2010) | 4 lines

    Issue #2973: Fix gcc warning on the 2nd argument of ASN1_item_d2i() and
    method->d2i(): OpenSSL API changed in OpenSSL 0.9.6m. Patch written by Daniel
    Black.
  ........
................
2010-03-02 22:49:30 +00:00
Steven Bethard bf15dce0a3 Blocked revisions 78577 via svnmerge
................
  r78577 | steven.bethard | 2010-03-02 01:22:57 -0800 (Tue, 02 Mar 2010) | 11 lines

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

  ........
    r78576 | steven.bethard | 2010-03-02 00:38:09 -0800 (Tue, 02 Mar 2010) | 3 lines

    Initial commit of the argparse library, based on argparse 1.1.
    Docs still need some updating to make getopt and optparse match the wording promised in the PEP.
    There are also probably a number of :class:ArgumentParser etc. links that could be added to the argparse documentation.
  ........
................
2010-03-02 09:28:36 +00:00
Barry Warsaw 0712921ef9 Manually copy patch for bug 7250 from the release26-maint branch. I suck
because I did this in the wrong order and couldn't smack svnmerge into
submission.
2010-03-01 21:56:18 +00:00
R. David Murray 6fa06d42f3 Fix invalid svnmerge-integrated property edit from last commit. 2010-03-01 17:43:44 +00:00
Vinay Sajip 91d13dd19d Initialized merge tracking via "svnmerge" with revisions "1-73578" from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
2010-03-01 13:44:26 +00:00
Gregory P. Smith 18ac2b4a71 Merged revisions 78548 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78548 | gregory.p.smith | 2010-02-28 21:54:14 -0800 (Sun, 28 Feb 2010) | 10 lines

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

  ........
    r78546 | gregory.p.smith | 2010-02-28 21:43:43 -0800 (Sun, 28 Feb 2010) | 3 lines

    Fixes issue #7999: os.setreuid() and os.setregid() would refuse to accept
    a -1 parameter on some platforms such as OS X.
  ........
................
2010-03-01 05:56:53 +00:00
Ezio Melotti 807e98e0af Merged revisions 78541 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78541 | ezio.melotti | 2010-03-01 06:08:34 +0200 (Mon, 01 Mar 2010) | 17 lines

  Merged revisions 78515-78516,78522 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r78515 | georg.brandl | 2010-02-28 20:19:17 +0200 (Sun, 28 Feb 2010) | 1 line

    #8030: make builtin type docstrings more consistent: use "iterable" instead of "seq(uence)", use "new" to show that set() always returns a new object.
  ........
    r78516 | georg.brandl | 2010-02-28 20:26:37 +0200 (Sun, 28 Feb 2010) | 1 line

    The set types can also be called without arguments.
  ........
    r78522 | ezio.melotti | 2010-03-01 01:59:00 +0200 (Mon, 01 Mar 2010) | 1 line

    #8030: more docstring fix for builtin types.
  ........
................
2010-03-01 04:10:55 +00:00
Gregory P. Smith ff3186401c Merged revisions 78538 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78538 | gregory.p.smith | 2010-02-28 19:13:36 -0800 (Sun, 28 Feb 2010) | 9 lines

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

  ........
    r78536 | gregory.p.smith | 2010-02-28 19:09:19 -0800 (Sun, 28 Feb 2010) | 2 lines

    Cleanup the test added in r78517 based on Ezio Melotti's feedback.
  ........
................
2010-03-01 03:19:29 +00:00