cpython: 6b28bfff9204 (original) (raw)

Mercurial > cpython

changeset 85407:6b28bfff9204

#18803: merge with 3.3. [#18803]

line wrap: on

line diff

--- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -108,7 +108,7 @@ DEPSRC = os.path.expanduser('~/Universal

There are some issues with the SDK selection below here,

The resulting binary doesn't work on all platforms that

it should. Always default to the 10.4u SDK until that

-### isue is resolved. +### issue is resolved. ### ##if int(os.uname()[2].split('.')[0]) == 8:

# Explicitly use the 10.4u (universal) SDK when

@@ -1055,7 +1055,7 @@ def buildPython(): os.chdir(curdir) if PYTHON_3:

•    # Remove the 'Current' link, that way we don't accidently mess[](#l1.16)

•    # Remove the 'Current' link, that way we don't accidentally mess[](#l1.17)
     # with an already installed version of python 2[](#l1.18)
     os.unlink(os.path.join(rootDir, 'Library', 'Frameworks',[](#l1.19)
                         'Python.framework', 'Versions', 'Current'))[](#l1.20)

--- a/Modules/unicodedata.c +++ b/Modules/unicodedata.c @@ -507,7 +507,7 @@ nfd_nfkd(PyObject *self, PyObject *input stackptr = 0; isize = PyUnicode_GET_LENGTH(input);

• /* Overallocate atmost 10 characters. */

• /* Overallocate at most 10 characters. */ space = (isize > 10 ? 10 : isize) + isize; osize = space; output = PyMem_Malloc(space * sizeof(Py_UCS4));

--- a/PCbuild/vs9to10.py +++ b/PCbuild/vs9to10.py @@ -1,4 +1,4 @@ -#Run this file after automatic convertsion of the VisualStudio 2008 solution by VisualStudio 2010. +#Run this file after automatic conversion of the VisualStudio 2008 solution by VisualStudio 2010. #This can be done whenever the 2008 solution changes. #It will make the necessary cleanup and updates to the vcxproj files #the .props files need to be maintained by hand if the .vsprops files change

--- a/Parser/asdl_c.py +++ b/Parser/asdl_c.py @@ -1056,7 +1056,7 @@ def has_sequence(types, doing_specializa class StaticVisitor(PickleVisitor):

• CODE = '''Very simple, always emit this static code. Overide CODE'''

• CODE = '''Very simple, always emit this static code. Override CODE'''

def visit(self, object): self.emit(self.CODE, 0, reflow=False)

--- a/Tools/freeze/checkextensions_win32.py +++ b/Tools/freeze/checkextensions_win32.py @@ -3,7 +3,7 @@ Under Windows it is unlikely the .obj files are of use, as special compiler options are needed (primarily to toggle the behavior of "public" symbols. -I dont consider it worth parsing the MSVC makefiles for compiler options. Even if +I don't consider it worth parsing the MSVC makefiles for compiler options. Even if we get it just right, a specific freeze application may have specific compiler options anyway (eg, to enable or disable specific functionality) @@ -14,7 +14,7 @@ So my basic strategy is: your own).

• This description can include:
  • The MSVC .dsp file for the extension. The .c source file names

• are extraced from there.

• are extracted from there.

• Specific compiler/linker options
• Flag to indicate if Unicode compilation is expected.

--- a/Tools/freeze/makefreeze.py +++ b/Tools/freeze/makefreeze.py @@ -61,7 +61,7 @@ def makefreeze(base, dict, debug=0, entr outfp.write('\t{"%s", M_%s, %d},\n' % (mod, mangled, size)) outfp.write('\n') # The following modules have a NULL code pointer, indicating

• that the prozen program should not search for them on the host

• that the frozen program should not search for them on the host

  system. Importing them will always raise an ImportError.

  The zero value size is never used.

  for mod in fail_import:

--- a/Tools/gdb/libpython.py +++ b/Tools/gdb/libpython.py @@ -632,7 +632,7 @@ class PyDictObjectPtr(PyObjectPtr): def iteritems(self): ''' Yields a sequence of (PyObjectPtr key, PyObjectPtr value) pairs,

•    analagous to dict.iteritems()[](#l7.7)

•    analogous to dict.iteritems()[](#l7.8)
     '''[](#l7.9)
     keys = self.field('ma_keys')[](#l7.10)
     values = self.field('ma_values')[](#l7.11)

--- a/Tools/i18n/msgfmt.py +++ b/Tools/i18n/msgfmt.py @@ -154,7 +154,7 @@ def make(filename, outfile): # This is a message with plural forms elif l.startswith('msgid_plural'): if section != ID:

•            print('msgid_plural not preceeded by msgid on %s:%d' % (infile, lno),[](#l8.7)

•            print('msgid_plural not preceded by msgid on %s:%d' % (infile, lno),[](#l8.8)
                   file=sys.stderr)[](#l8.9)
             sys.exit(1)[](#l8.10)
         l = l[12:][](#l8.11)

--- a/Tools/msi/msilib.py +++ b/Tools/msi/msilib.py @@ -305,7 +305,7 @@ def init_database(name, schema, t.create(db) # Fill the validation table add_data(db, "_Validation", schema._Validation_records)

• Initialize the summary information, allowing atmost 20 properties

• Initialize the summary information, allowing at most 20 properties

  si = db.GetSummaryInformation(20) si.SetProperty(PID_TITLE, "Installation Database") si.SetProperty(PID_SUBJECT, ProductName)

--- a/Tools/pybench/CommandLine.py +++ b/Tools/pybench/CommandLine.py @@ -462,7 +462,7 @@ class Application: handler = getattr(self, handlername) except AttributeError: if value == '':

•                # count the number of occurances[](#l10.7)

•                # count the number of occurrences[](#l10.8)
                 if optionname in values:[](#l10.9)
                     values[optionname] = values[optionname] + 1[](#l10.10)
                 else:[](#l10.11)

--- a/Tools/pybench/systimes.py +++ b/Tools/pybench/systimes.py @@ -5,7 +5,7 @@ This module implements various different strategies for measuring performance timings. It tries to choose the best available method

• based on the platforma and available tools.

• based on the platform and available tools.

On Windows, it is recommended to have the Mark Hammond win32 package installed. Alternatively, the Thomas Heller ctypes

--- a/Tools/pynche/DetailsViewer.py +++ b/Tools/pynche/DetailsViewer.py @@ -26,7 +26,7 @@ option menu: other side. Thus if red were at 238 and 25 were added to it, red would have the value 7.

• Preseve Distance

• Preserve Distance When the increment or decrement would send any of the tied variations out of bounds, all tied variations are wrapped as one, so as to preserve the distance between them. Thus if green and blue were tied,

--- a/Tools/scripts/fixnotice.py +++ b/Tools/scripts/fixnotice.py @@ -2,7 +2,7 @@ """(Ostensibly) fix copyright notices in files. -Actually, this sript will simply replace a block of text in a file from one +Actually, this script will simply replace a block of text in a file from one string to another. It will only do this once though, i.e. not globally throughout the file. It writes a backup file and then does an os.rename() dance for atomicity.

--- a/Tools/scripts/ifdef.py +++ b/Tools/scripts/ifdef.py @@ -9,11 +9,11 @@

options. On standard output it writes a copy of the input file(s)

minus those code sections that are suppressed by the selected

combination of defined/undefined symbols. The #if(n)def/#else/#else

-# lines themselfs (if the #if(n)def tests for one of the mentioned +# lines themselves (if the #if(n)def tests for one of the mentioned

names) are removed as well.

Features: Arbitrary nesting of recognized and unrecognized

-# preprocesor statements works correctly. Unrecognized #if* commands +# preprocessor statements works correctly. Unrecognized #if* commands

are left in place, so it will never remove too much, only too

little. It does accept whitespace around the '#' character.

--- a/Tools/scripts/pathfix.py +++ b/Tools/scripts/pathfix.py @@ -151,7 +151,7 @@ def fix(filename): except OSError as msg: err('%s: reset of timestamp failed (%r)\n' % (filename, msg)) return 1

• Return succes

• Return success

  return 0 def fixline(line):

--- a/Tools/stringbench/stringbench.py +++ b/Tools/stringbench/stringbench.py @@ -1294,7 +1294,7 @@ def _get_big_s(STR): raise AssertionError

The older replace implementation counted all matches in

-# the string even when it only neeed to make one replacement. +# the string even when it only needed to make one replacement. @bench('("A" + ("Z"1281024)).replace("A", "BB", 1)', 'quick replace single character match', 10) def quick_replace_single_match(STR):

--- a/Tools/unicode/makeunicodedata.py +++ b/Tools/unicode/makeunicodedata.py @@ -966,7 +966,7 @@ class UnicodeData: assert pua_index - NAME_ALIASES_START == len(self.aliases) self.named_sequences = []

•        # store named seqences in the PUA 1, in range U+F0100..,[](#l17.7)

•        # store named sequences in the PUA 1, in range U+F0100..,[](#l17.8)
         # in order to take advantage of the compression and lookup[](#l17.9)
         # algorithms used for the other characters.[](#l17.10)