Commit Graph

37980 Commits

Author SHA1 Message Date
Georg Brandl 277a150146 Remove 2.6 versionchanges, turn 2.7 ones into 3.1. 2009-01-04 00:28:14 +00:00
Antoine Pitrou ff96b2ae14 test_urllib would set environment variable NO_PROXY without removing it afterwards. 2009-01-03 22:55:38 +00:00
Georg Brandl 3de5a08420 Blocked revisions 68179,68208-68209,68238,68240 via svnmerge
........
  r68179 | raymond.hettinger | 2009-01-02 22:26:45 +0100 (Fri, 02 Jan 2009) | 1 line

  Issue #4615.  Document how to use itertools for de-duping.
........
  r68208 | raymond.hettinger | 2009-01-03 20:02:23 +0100 (Sat, 03 Jan 2009) | 1 line

  Issue 4796: Add from_float methods to the decimal module.
........
  r68209 | raymond.hettinger | 2009-01-03 20:08:10 +0100 (Sat, 03 Jan 2009) | 1 line

  Reapply r68191.
........
  r68238 | georg.brandl | 2009-01-03 23:03:11 +0100 (Sat, 03 Jan 2009) | 2 lines

  Manually merge r68095,68186,68187,68188,68190 from 2.6 branch.
........
  r68240 | georg.brandl | 2009-01-03 23:05:22 +0100 (Sat, 03 Jan 2009) | 2 lines

  Manually merge r67868 from 2.6 branch.
........
2009-01-03 22:48:18 +00:00
Georg Brandl 1f01debe6f Merged revisions 68162,68166,68171,68176,68195-68196,68210,68232 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68162 | ronald.oussoren | 2009-01-02 16:06:00 +0100 (Fri, 02 Jan 2009) | 3 lines

  Fix for issue 4472 is incompatible with Cygwin, this patch
  should fix that.
........
  r68166 | benjamin.peterson | 2009-01-02 19:26:23 +0100 (Fri, 02 Jan 2009) | 1 line

  document PyMemberDef
........
  r68171 | georg.brandl | 2009-01-02 21:25:14 +0100 (Fri, 02 Jan 2009) | 3 lines

  #4811: fix markup glitches (mostly remains of the conversion),
  found by Gabriel Genellina.
........
  r68176 | andrew.kuchling | 2009-01-02 22:00:35 +0100 (Fri, 02 Jan 2009) | 1 line

  Add various items
........
  r68195 | georg.brandl | 2009-01-03 14:45:15 +0100 (Sat, 03 Jan 2009) | 2 lines

  Remove useless string literal.
........
  r68196 | georg.brandl | 2009-01-03 15:29:53 +0100 (Sat, 03 Jan 2009) | 2 lines

  Fix indentation.
........
  r68210 | georg.brandl | 2009-01-03 20:10:12 +0100 (Sat, 03 Jan 2009) | 2 lines

  Set eol-style correctly for mp_distributing.py.
........
  r68232 | georg.brandl | 2009-01-03 22:52:16 +0100 (Sat, 03 Jan 2009) | 2 lines

  Grammar fix.
........
2009-01-03 22:47:39 +00:00
Georg Brandl 814a2ca9e4 Blocked revisions 68150,68156,68158-68161,68163 via svnmerge
........
  r68150 | ronald.oussoren | 2009-01-02 12:46:05 +0100 (Fri, 02 Jan 2009) | 1 line

  Fix for issue 3433
........
  r68156 | ronald.oussoren | 2009-01-02 15:10:20 +0100 (Fri, 02 Jan 2009) | 1 line

  Fix for issue1594
........
  r68158 | ronald.oussoren | 2009-01-02 15:46:19 +0100 (Fri, 02 Jan 2009) | 2 lines

  Fix for issue 900949
........
  r68159 | ronald.oussoren | 2009-01-02 15:48:17 +0100 (Fri, 02 Jan 2009) | 2 lines

  Fix for issue 1627952
........
  r68160 | ronald.oussoren | 2009-01-02 15:52:09 +0100 (Fri, 02 Jan 2009) | 2 lines

  Fix for issue r1737832
........
  r68161 | ronald.oussoren | 2009-01-02 16:00:05 +0100 (Fri, 02 Jan 2009) | 3 lines

  Fix for issue 1149804
........
  r68163 | ronald.oussoren | 2009-01-02 16:25:36 +0100 (Fri, 02 Jan 2009) | 2 lines

  Fix for issues #841800 and #900506
........
2009-01-03 22:37:17 +00:00
Georg Brandl b1441c7e47 Merged revisions 68112,68115,68120,68133,68141-68142,68145-68146,68148-68149 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68112 | benjamin.peterson | 2009-01-01 00:48:39 +0100 (Thu, 01 Jan 2009) | 1 line

  #4795 inspect.isgeneratorfunction() should return False instead of None
........
  r68115 | benjamin.peterson | 2009-01-01 05:04:41 +0100 (Thu, 01 Jan 2009) | 1 line

  simplfy code
........
  r68120 | georg.brandl | 2009-01-01 13:15:31 +0100 (Thu, 01 Jan 2009) | 4 lines

  #4228: Pack negative values the same way as 2.4
  in struct's L format.
........
  r68133 | antoine.pitrou | 2009-01-01 16:38:03 +0100 (Thu, 01 Jan 2009) | 1 line

  fill in actual issue number in tests
........
  r68141 | benjamin.peterson | 2009-01-01 17:43:12 +0100 (Thu, 01 Jan 2009) | 1 line

  fix highlighting
........
  r68142 | benjamin.peterson | 2009-01-01 18:29:49 +0100 (Thu, 01 Jan 2009) | 2 lines

  welcome to 2009, Python!
........
  r68145 | amaury.forgeotdarc | 2009-01-02 01:03:54 +0100 (Fri, 02 Jan 2009) | 5 lines

  #4801 _collections module fails to build on cygwin.

  _PyObject_GC_TRACK is the macro version of PyObject_GC_Track,
  and according to documentation it should not be used for extension modules.
........
  r68146 | ronald.oussoren | 2009-01-02 11:44:46 +0100 (Fri, 02 Jan 2009) | 2 lines

  Fix for issue4472: "configure --enable-shared doesn't work on OSX"
........
  r68148 | ronald.oussoren | 2009-01-02 11:48:31 +0100 (Fri, 02 Jan 2009) | 2 lines

  Forgot to add a NEWS item in my previous checkin
........
  r68149 | ronald.oussoren | 2009-01-02 11:50:48 +0100 (Fri, 02 Jan 2009) | 2 lines

  Fix for issue4780
........
2009-01-03 22:33:39 +00:00
Guilherme Polo 4baac0f913 Forgot to remove no longer needed code since r68237 2009-01-03 22:13:31 +00:00
Georg Brandl 3a9b062f5b Manually merge r68096,68189 from 3.0 branch. 2009-01-03 22:07:57 +00:00
Guilherme Polo 3f5f8228c0 Fix for issue #3638: Remove module level functions in _tkinter that
depend on TkappObject
2009-01-03 22:00:39 +00:00
Guilherme Polo 92ad63f748 Blocked revisions 68231 via svnmerge
........
  r68231 | guilherme.polo | 2009-01-03 19:51:09 -0200 (Sat, 03 Jan 2009) | 4 lines

  The _tkinter module functions "createfilehandler", "deletefilehandler",
  "createtimerhandler", "mainloop", "dooneevent" and "quit" have been
  deprecated for removal in 3.x (part of issue #3638).
........
2009-01-03 21:53:34 +00:00
Georg Brandl 06788c9fe4 Fix a few remaining problems found by rstlint. 2009-01-03 21:31:47 +00:00
Georg Brandl d509788f98 Merged revisions 68222 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68222 | georg.brandl | 2009-01-03 22:11:58 +0100 (Sat, 03 Jan 2009) | 2 lines

  Disable the line length checker by default.
........
2009-01-03 21:30:40 +00:00
Georg Brandl a1c6a1cea5 Merged revisions 68221 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68221 | georg.brandl | 2009-01-03 22:04:55 +0100 (Sat, 03 Jan 2009) | 2 lines

  Remove tabs from the documentation.
........
2009-01-03 21:26:05 +00:00
Georg Brandl 48310cd3f2 Remove trailing whitespace. 2009-01-03 21:18:54 +00:00
Georg Brandl 3d3558a465 Blocked revisions 68220 via svnmerge
........
  r68220 | georg.brandl | 2009-01-03 21:55:06 +0100 (Sat, 03 Jan 2009) | 2 lines

  Remove trailing whitespace.
........
2009-01-03 21:17:44 +00:00
Georg Brandl 36ab1ef8ee Merged revisions 68219 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68219 | georg.brandl | 2009-01-03 21:47:01 +0100 (Sat, 03 Jan 2009) | 2 lines

  Fix uses of the default role.
........
2009-01-03 21:17:04 +00:00
Georg Brandl 45f53370e7 Merged revisions 68214-68215,68217-68218 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68214 | georg.brandl | 2009-01-03 20:44:48 +0100 (Sat, 03 Jan 2009) | 2 lines

  Make indentation consistent.
........
  r68215 | georg.brandl | 2009-01-03 21:15:14 +0100 (Sat, 03 Jan 2009) | 2 lines

  Fix role name.
........
  r68217 | georg.brandl | 2009-01-03 21:30:15 +0100 (Sat, 03 Jan 2009) | 2 lines

  Add rstlint, a little tool to find subtle markup problems and inconsistencies in the Doc sources.
........
  r68218 | georg.brandl | 2009-01-03 21:38:59 +0100 (Sat, 03 Jan 2009) | 2 lines

  Recognize usage of the default role.
........
2009-01-03 21:15:20 +00:00
Antoine Pitrou a9ecbdade7 Fix BytesWarning with -bb in wsgiref.headers.Headers. 2009-01-03 20:28:05 +00:00
Antoine Pitrou 35b7e837ab Issue #4822: fix messy indentation in memoryobject.c/.h, before we may backport it to trunk.
Reviewed on IRC by Georg Brandl, with assistance by Benjamin Peterson.
2009-01-03 19:20:36 +00:00
Raymond Hettinger 771ed76102 Issue 4796: Add from_float methods to the decimal module. 2009-01-03 19:20:32 +00:00
Antoine Pitrou 5f81741106 Actually make test_wsgiref independent from the Python version. 2009-01-03 18:49:41 +00:00
Antoine Pitrou 38a66adccb Issue #4718: Adapt the wsgiref package so that it actually works with Python 3.x,
in accordance with http://www.wsgi.org/wsgi/Amendments_1.0
2009-01-03 18:41:49 +00:00
Martin v. Löwis ffe431d8bd Merged revisions 68203 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68203 | martin.v.loewis | 2009-01-03 18:19:26 +0100 (Sa, 03 Jan 2009) | 2 lines

  Issue #4817: Remove unused function PyOS_GetLastModificationTime.
........
2009-01-03 17:22:40 +00:00
Antoine Pitrou c3b39245a7 Issue #4580: slicing of memoryviews when itemsize != 1 is wrong.
Also fix len() to return number of items rather than length in bytes.

I'm sorry it was not possible for me to work on this without reindenting
a bit some stuff around. The indentation in memoryobject.c is a mess,
I'll open a separate bug for it.
2009-01-03 16:59:18 +00:00
Benjamin Peterson 8bcddcabd7 Merged revisions 68197 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

................
  r68197 | benjamin.peterson | 2009-01-03 10:34:02 -0600 (Sat, 03 Jan 2009) | 55 lines

  Merged revisions 67900-67901,67919,67928,67984,67991-67993,68106-68108,68110 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

  ........
    r67900 | benjamin.peterson | 2008-12-22 14:02:45 -0600 (Mon, 22 Dec 2008) | 4 lines

    fix_execfile: wrap the open(fn).read() call in compile(), so the filename is preserved

    also add unittests for the fixer
  ........
    r67901 | benjamin.peterson | 2008-12-22 14:09:55 -0600 (Mon, 22 Dec 2008) | 1 line

    remove unused import
  ........
    r67919 | benjamin.peterson | 2008-12-23 13:12:22 -0600 (Tue, 23 Dec 2008) | 1 line

    copy permission bits from the backup to the original
  ........
    r67928 | benjamin.peterson | 2008-12-26 20:49:30 -0600 (Fri, 26 Dec 2008) | 1 line

    don't be so idiot about multiple local imports in fix_import; still won't handle absolute and local imports on the same line
  ........
    r67984 | benjamin.peterson | 2008-12-28 09:55:16 -0600 (Sun, 28 Dec 2008) | 1 line

    don't need loop
  ........
    r67991 | benjamin.peterson | 2008-12-28 14:30:26 -0600 (Sun, 28 Dec 2008) | 1 line

    actually call finish_tree()
  ........
    r67992 | benjamin.peterson | 2008-12-28 14:34:47 -0600 (Sun, 28 Dec 2008) | 1 line

    remove useless test
  ........
    r67993 | benjamin.peterson | 2008-12-28 15:04:32 -0600 (Sun, 28 Dec 2008) | 1 line

    update pyk3's test grammar
  ........
    r68106 | benjamin.peterson | 2008-12-31 11:53:58 -0600 (Wed, 31 Dec 2008) | 1 line

    #2734 don't convert every instance of long (eg if it's an attribute)
  ........
    r68107 | benjamin.peterson | 2008-12-31 11:55:10 -0600 (Wed, 31 Dec 2008) | 1 line

    add another test
  ........
    r68108 | benjamin.peterson | 2008-12-31 12:00:12 -0600 (Wed, 31 Dec 2008) | 1 line

    don't change long even if it's the only argument name
  ........
    r68110 | benjamin.peterson | 2008-12-31 14:13:26 -0600 (Wed, 31 Dec 2008) | 1 line

    remove unused import
  ........
................
2009-01-03 16:53:14 +00:00
Mark Dickinson 627cf6a976 Merged revisions 68191 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68191 | mark.dickinson | 2009-01-03 12:07:20 +0000 (Sat, 03 Jan 2009) | 2 lines

  Issue #4812:  further renaming of internal Decimal constants, for clarity.
........
2009-01-03 12:11:47 +00:00
Mark Dickinson f923641b41 Merged revisions 68182 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68182 | mark.dickinson | 2009-01-02 23:07:08 +0000 (Fri, 02 Jan 2009) | 4 lines

  Issue #4812: add missing underscore prefix to some internal-use-only
  constants in the decimal module.  (Dec_0 becomes _Dec_0, etc.)
........
2009-01-02 23:23:21 +00:00
Raymond Hettinger ad9d96bc1a Issue #4615. Document how to use itertools for de-duping. 2009-01-02 21:39:07 +00:00
Benjamin Peterson 80a50acbe9 Merged revisions 68174 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68174 | benjamin.peterson | 2009-01-02 14:47:27 -0600 (Fri, 02 Jan 2009) | 1 line

  fix compilation on non-Windows platforms
........
2009-01-02 21:24:04 +00:00
Martin v. Löwis 5c88d81784 Merged revisions 68172-68173 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68172 | martin.v.loewis | 2009-01-02 21:32:55 +0100 (Fr, 02 Jan 2009) | 2 lines

  Issue #4075: Use OutputDebugStringW in Py_FatalError.
........
  r68173 | martin.v.loewis | 2009-01-02 21:40:14 +0100 (Fr, 02 Jan 2009) | 2 lines

  Issue #4051: Prevent conflict of UNICODE macros in cPickle.
........
2009-01-02 20:47:48 +00:00
Georg Brandl 770b0be53e #4808: move old API below new API doc. 2009-01-02 20:10:05 +00:00
Georg Brandl 574b1279d9 Remove traces of Py_InitModule*. 2009-01-02 19:20:26 +00:00
Vinay Sajip aa672ebe49 Minor documentation changes relating to NullHandler, the module used for handlers and references to ConfigParser. 2009-01-02 18:53:45 +00:00
Antoine Pitrou 31f30b17fe Issue #4738: finer-grained locking in the zlib module. 2009-01-02 17:34:35 +00:00
Ronald Oussoren e9f8bf023a Recorded merge of revisions 68153 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68153 | ronald.oussoren | 2009-01-02 13:59:32 +0100 (Fri, 02 Jan 2009) | 10 lines

  Fix for issue3559: No preferences menu in IDLE on OSX

  1) Add a comment to the help file to that points to the
     preferences menu.

  2) An earlier checkin tried to detect Tk >= 8.10.14,
     but did this in the wrong way. The end result of this
     was that the IDLE->Preferences... menu got surpressed
     when using the system version of Tcl/Tk
........
2009-01-02 13:10:34 +00:00
Ronald Oussoren af1186071a Fix for issue 3433 2009-01-02 11:48:29 +00:00
Amaury Forgeot d'Arc 374e220bcb #4747: on Windows, starting a module with a non-ascii filename would print a useless "SyntaxError: None"
when the script contains a "# coding:" declaration.

The Python API expects char* to be utf-8 encoded. wcstombs should be avoided here.

Reviewed by Benjamin. Will backport to 3.0
2009-01-01 23:05:36 +00:00
Hirokazu Yamamoto 8ed9a8069d News fix. On py3k, `str' is unicode. should use `bytes'. 2009-01-01 16:09:52 +00:00
Hirokazu Yamamoto 0f22d69cf6 Merged revisions 68134 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68134 | hirokazu.yamamoto | 2009-01-02 00:45:39 +0900 | 2 lines

  Issue #4797: IOError.filename was not set when _fileio.FileIO failed to open
  file with `str' filename on Windows.
........
2009-01-01 16:03:45 +00:00
Georg Brandl 646d9a20b9 Blocked revisions 67955 via svnmerge
........
  r67955 | georg.brandl | 2008-12-27 19:27:53 +0100 (Sat, 27 Dec 2008) | 3 lines

  Follow-up to r67746 in order to restore backwards-compatibility for
  those who (monkey-)patch TextWrapper.wordsep_re with a custom RE.
........
2009-01-01 15:55:56 +00:00
Georg Brandl db7b6b9582 Merged revisions 67953 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67953 | georg.brandl | 2008-12-27 19:20:04 +0100 (Sat, 27 Dec 2008) | 3 lines

  Patch #4739 by David Laban: add symbols to pydoc help topics,
  so that ``help('@')`` works as expected.
........
2009-01-01 15:53:14 +00:00
Georg Brandl bce3977be7 Blocked revisions 67967,67980 via svnmerge
........
  r67967 | benjamin.peterson | 2008-12-27 23:18:58 +0100 (Sat, 27 Dec 2008) | 1 line

  fix markup
........
  r67980 | antoine.pitrou | 2008-12-28 15:24:29 +0100 (Sun, 28 Dec 2008) | 1 line

  wrong version number in doc changes committed in r67979
........
2009-01-01 15:49:47 +00:00
Antoine Pitrou 7ddda7830c Merged revisions 68128 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68128 | antoine.pitrou | 2009-01-01 15:11:22 +0100 (jeu., 01 janv. 2009) | 3 lines

  Issue #3680: Reference cycles created through a dict, set or deque iterator did not get collected.
........
2009-01-01 15:35:33 +00:00
Benjamin Peterson 75edad0502 Merged revisions 68116-68119,68121,68123-68127 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68116 | georg.brandl | 2009-01-01 05:46:51 -0600 (Thu, 01 Jan 2009) | 2 lines

  #4100: note that element children are not necessarily present on "start" events.
........
  r68117 | georg.brandl | 2009-01-01 05:53:55 -0600 (Thu, 01 Jan 2009) | 2 lines

  #4156: make clear that "protocol" is to be replaced with the protocol name.
........
  r68118 | georg.brandl | 2009-01-01 06:00:19 -0600 (Thu, 01 Jan 2009) | 2 lines

  #4185: clarify escape behavior of replacement strings.
........
  r68119 | georg.brandl | 2009-01-01 06:09:40 -0600 (Thu, 01 Jan 2009) | 3 lines

  #4222: document dis.findlabels() and dis.findlinestarts() and
  put them into dis.__all__.
........
  r68121 | georg.brandl | 2009-01-01 06:43:33 -0600 (Thu, 01 Jan 2009) | 2 lines

  Point to types module in new module deprecation notice.
........
  r68123 | georg.brandl | 2009-01-01 06:52:29 -0600 (Thu, 01 Jan 2009) | 2 lines

  #4784: ... on three counts ...
........
  r68124 | georg.brandl | 2009-01-01 06:53:19 -0600 (Thu, 01 Jan 2009) | 2 lines

  #4782: Fix markup error that hid load() and loads().
........
  r68125 | georg.brandl | 2009-01-01 07:02:09 -0600 (Thu, 01 Jan 2009) | 2 lines

  #4776: add data_files and package_dir arguments.
........
  r68126 | georg.brandl | 2009-01-01 07:05:13 -0600 (Thu, 01 Jan 2009) | 2 lines

  Handlers are in the `logging.handlers` module.
........
  r68127 | georg.brandl | 2009-01-01 07:14:49 -0600 (Thu, 01 Jan 2009) | 2 lines

  #4767: Use correct submodules for all MIME classes.
........
2009-01-01 15:05:06 +00:00
Benjamin Peterson da10d3b7a5 Merged revisions 67952,67957-67958,67960-67961,67963,67973,67978,67995,68030,68057,68061 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67952 | georg.brandl | 2008-12-27 11:42:40 -0600 (Sat, 27 Dec 2008) | 2 lines

  #4752: actually use custom handler in example.
........
  r67957 | georg.brandl | 2008-12-27 12:49:19 -0600 (Sat, 27 Dec 2008) | 2 lines

  #4754: improve winsound documentation.
........
  r67958 | georg.brandl | 2008-12-27 13:02:59 -0600 (Sat, 27 Dec 2008) | 2 lines

  #4682: 'b' is actually unsigned char.
........
  r67960 | georg.brandl | 2008-12-27 13:04:44 -0600 (Sat, 27 Dec 2008) | 2 lines

  #4695: fix backslashery.
........
  r67961 | georg.brandl | 2008-12-27 13:06:04 -0600 (Sat, 27 Dec 2008) | 2 lines

  Use :samp: role.
........
  r67963 | georg.brandl | 2008-12-27 13:11:15 -0600 (Sat, 27 Dec 2008) | 2 lines

  #4671: document that pydoc imports modules.
........
  r67973 | alexandre.vassalotti | 2008-12-27 20:58:22 -0600 (Sat, 27 Dec 2008) | 2 lines

  Document Py_VaBuildValue.
........
  r67978 | georg.brandl | 2008-12-28 05:58:49 -0600 (Sun, 28 Dec 2008) | 2 lines

  #4731: clarify message about missing module prerequisites.
........
  r67995 | benjamin.peterson | 2008-12-28 15:16:07 -0600 (Sun, 28 Dec 2008) | 1 line

  #4763 PyErr_ExceptionMatches won't blow up with NULL arguments
........
  r68030 | benjamin.peterson | 2008-12-29 15:38:14 -0600 (Mon, 29 Dec 2008) | 1 line

  fix French
........
  r68057 | vinay.sajip | 2008-12-30 01:01:25 -0600 (Tue, 30 Dec 2008) | 1 line

  Minor documentation change relating to NullHandler.
........
  r68061 | georg.brandl | 2008-12-30 04:15:49 -0600 (Tue, 30 Dec 2008) | 2 lines

  #4778: attributes can't be called.
........
2009-01-01 00:23:30 +00:00
Benjamin Peterson de342c4a77 #4406 Directory has to inherit from commondialog.Dialog 2008-12-31 14:51:07 +00:00
Hirokazu Yamamoto 8ebab5df63 Merged revisions 68097,68099 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68097 | hirokazu.yamamoto | 2008-12-31 14:24:37 +0900 | 1 line

  Fixed compile error on windows.
........
  r68099 | hirokazu.yamamoto | 2008-12-31 14:47:19 +0900 | 1 line

  Just inserted blank line.
........
2008-12-31 06:05:46 +00:00
Benjamin Peterson 6152558fc3 Blocked revisions 68092 via svnmerge
........
  r68092 | benjamin.peterson | 2008-12-30 22:08:55 -0600 (Tue, 30 Dec 2008) | 1 line

  fix name collision issues
........
2008-12-31 04:13:40 +00:00
Benjamin Peterson c071d3a41c fix name usage 2008-12-31 04:10:35 +00:00
Benjamin Peterson 9c069fd76e #4788 qualify remove a bare except 2008-12-31 03:43:28 +00:00