Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-30 21:21:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merged revisions 65780,65782,65785,65809,65812,65834,65846,65859,65861 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r65780 | antoine.pitrou | 2008-08-17 15:15:07 -0500 (Sun, 17 Aug 2008) | 3 lines

  #3580: fix a failure in test_os
........
  r65782 | benjamin.peterson | 2008-08-17 15:33:45 -0500 (Sun, 17 Aug 2008) | 1 line

  set svn:executable on a script
........
  r65785 | amaury.forgeotdarc | 2008-08-17 16:05:18 -0500 (Sun, 17 Aug 2008) | 3 lines

  Fix a refleak in bytearray.split and bytearray.rsplit, detected by
     regrtest.py -R:: test_bytes
........
  r65809 | nick.coghlan | 2008-08-18 07:42:46 -0500 (Mon, 18 Aug 2008) | 1 line

  Belated NEWS entry for r65642
........
  r65812 | nick.coghlan | 2008-08-18 08:32:19 -0500 (Mon, 18 Aug 2008) | 1 line

  Fix typo
........
  r65834 | amaury.forgeotdarc | 2008-08-18 14:23:47 -0500 (Mon, 18 Aug 2008) | 4 lines

  #2234 distutils failed with mingw binutils 2.18.50.20080109.
  Be less strict when parsing these version numbers,
  they don't necessarily follow the python numbering scheme.
........
  r65846 | georg.brandl | 2008-08-18 18:09:49 -0500 (Mon, 18 Aug 2008) | 2 lines

  Fix grammar.
........
  r65859 | thomas.heller | 2008-08-19 12:47:13 -0500 (Tue, 19 Aug 2008) | 2 lines

  Fix strange character in the docstring.
........
  r65861 | benjamin.peterson | 2008-08-19 12:59:23 -0500 (Tue, 19 Aug 2008) | 1 line

  get unparse to at least unparse its self
........
This commit is contained in:
Benjamin Peterson 2008-08-19 18:57:56 +00:00
parent ee58fa484e
commit c4fe6f3961
8 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Demo/parser/unparse.py
View file

@ -186,7 +186,7 @@ def _TryFinally(self, t):
self.dispatch(t.finalbody) self.dispatch(t.finalbody)
self.leave() self.leave()
def _excepthandler(self, t): def _ExceptHandler(self, t):
self.fill("except") self.fill("except")
if t.type: if t.type:
self.write(" ") self.write(" ")
@ -213,7 +213,7 @@ def _ClassDef(self, t):
def _FunctionDef(self, t): def _FunctionDef(self, t):
self.write("\n") self.write("\n")
for deco in t.decorators: for deco in t.decorator_list:
self.fill("@") self.fill("@")
self.dispatch(deco) self.dispatch(deco)
self.fill("def "+t.name + "(") self.fill("def "+t.name + "(")

2
Doc/c-api/object.rst
View file

@ -261,7 +261,7 @@ is considered sufficient for this determination.
Set a TypeError indicating that ``type(o)`` is not hashable and return ``-1``. Set a TypeError indicating that ``type(o)`` is not hashable and return ``-1``.
This function receives special treatment when stored in a ``tp_hash`` slot, This function receives special treatment when stored in a ``tp_hash`` slot,
allowing a type to explicit indicate to the interpreter that it is not allowing a type to explicitly indicate to the interpreter that it is not
hashable. hashable.
.. versionadded:: 2.6 .. versionadded:: 2.6

2
Doc/library/threading.rst
View file

@ -14,7 +14,7 @@ The :mod:`dummy_threading` module is provided for situations where
.. note:: .. note::
Some name ``camelCase`` names have been converted to their underscored Some ``camelCase`` names have been converted to their underscored
equivalents. Others have been replaced by properties. Using the old methods equivalents. Others have been replaced by properties. Using the old methods
in 2.6 will trigger a :exc:`DeprecationWarning` when Python is run with the in 2.6 will trigger a :exc:`DeprecationWarning` when Python is run with the
:option:`-3` flag and a full :exc:`DeprecationWarning` in 3.0. The old names :option:`-3` flag and a full :exc:`DeprecationWarning` in 3.0. The old names

8
Lib/distutils/cygwinccompiler.py
View file

@ -400,7 +400,7 @@ def get_versions():
""" Try to find out the versions of gcc, ld and dllwrap. """ Try to find out the versions of gcc, ld and dllwrap.
If not possible it returns None for it. If not possible it returns None for it.
""" """
from distutils.version import StrictVersion from distutils.version import LooseVersion
from distutils.spawn import find_executable from distutils.spawn import find_executable
import re import re
@ -411,7 +411,7 @@ def get_versions():
out.close() out.close()
result = re.search('(\d+\.\d+(\.\d+)*)', out_string, re.ASCII) result = re.search('(\d+\.\d+(\.\d+)*)', out_string, re.ASCII)
if result: if result:
gcc_version = StrictVersion(result.group(1)) gcc_version = LooseVersion(result.group(1))
else: else:
gcc_version = None gcc_version = None
else: else:
@ -423,7 +423,7 @@ def get_versions():
out.close() out.close()
result = re.search('(\d+\.\d+(\.\d+)*)', out_string, re.ASCII) result = re.search('(\d+\.\d+(\.\d+)*)', out_string, re.ASCII)
if result: if result:
ld_version = StrictVersion(result.group(1)) ld_version = LooseVersion(result.group(1))
else: else:
ld_version = None ld_version = None
else: else:
@ -435,7 +435,7 @@ def get_versions():
out.close() out.close()
result = re.search(' (\d+\.\d+(\.\d+)*)', out_string, re.ASCII) result = re.search(' (\d+\.\d+(\.\d+)*)', out_string, re.ASCII)
if result: if result:
dllwrap_version = StrictVersion(result.group(1)) dllwrap_version = LooseVersion(result.group(1))
else: else:
dllwrap_version = None dllwrap_version = None
else: else:

2
Lib/test/test_os.py
View file

@ -318,7 +318,7 @@ def test_1686475(self):
try: try:
os.stat(r"c:\pagefile.sys") os.stat(r"c:\pagefile.sys")
except WindowsError as e: except WindowsError as e:
if e == 2: # file does not exist; cannot run test if e.errno == 2: # file does not exist; cannot run test
return return
self.fail("Could not stat pagefile.sys") self.fail("Could not stat pagefile.sys")

2
Modules/mmapmodule.c
View file

@ -913,7 +913,7 @@ and returns a mmap object. If length is 0, the maximum length of the map\n\
will be the current size of the file when mmap is called.\n\ will be the current size of the file when mmap is called.\n\
flags specifies the nature of the mapping. MAP_PRIVATE creates a\n\ flags specifies the nature of the mapping. MAP_PRIVATE creates a\n\
private copy-on-write mapping, so changes to the contents of the mmap\n\ private copy-on-write mapping, so changes to the contents of the mmap\n\
object will be private to this process, and MAP_SHARED`creates a mapping\n\ object will be private to this process, and MAP_SHARED creates a mapping\n\
that's shared with all other processes mapping the same areas of the file.\n\ that's shared with all other processes mapping the same areas of the file.\n\
The default value is MAP_SHARED.\n\ The default value is MAP_SHARED.\n\
\n\ \n\

14
Objects/bytearrayobject.c
View file

@ -2215,8 +2215,11 @@ bytes_split(PyByteArrayObject *self, PyObject *args)
PyBuffer_Release(&vsub); PyBuffer_Release(&vsub);
return NULL; return NULL;
} }
if (n == 1) if (n == 1) {
return split_char(s, len, sub[0], maxsplit); list = split_char(s, len, sub[0], maxsplit);
PyBuffer_Release(&vsub);
return list;
}
list = PyList_New(PREALLOC_SIZE(maxsplit)); list = PyList_New(PREALLOC_SIZE(maxsplit));
if (list == NULL) { if (list == NULL) {
@ -2447,8 +2450,11 @@ bytes_rsplit(PyByteArrayObject *self, PyObject *args)
PyBuffer_Release(&vsub); PyBuffer_Release(&vsub);
return NULL; return NULL;
} }
else if (n == 1) else if (n == 1) {
return rsplit_char(s, len, sub[0], maxsplit); list = rsplit_char(s, len, sub[0], maxsplit);
PyBuffer_Release(&vsub);
return list;
}
list = PyList_New(PREALLOC_SIZE(maxsplit)); list = PyList_New(PREALLOC_SIZE(maxsplit));
if (list == NULL) { if (list == NULL) {

0
Tools/scripts/idle Normal file → Executable file
View file