diff options
| -rw-r--r-- | Include/methodobject.h | 4 | ||||
| -rw-r--r-- | Mac/Makefile.in | 6 | ||||
| -rw-r--r-- | Modules/ld_so_aix.in | 6 | ||||
| -rw-r--r-- | Parser/Python.asdl | 16 | ||||
| -rw-r--r-- | Tools/freeze/extensions_win32.ini | 8 | ||||
| -rw-r--r-- | Tools/scripts/dutree.doc | 6 |
6 files changed, 23 insertions, 23 deletions
diff --git a/Include/methodobject.h b/Include/methodobject.h index 0236228..e2ad804 100644 --- a/Include/methodobject.h +++ b/Include/methodobject.h @@ -47,7 +47,7 @@ struct PyMethodDef { typedef struct PyMethodDef PyMethodDef; #define PyCFunction_New(ML, SELF) PyCFunction_NewEx((ML), (SELF), NULL) -PyAPI_FUNC(PyObject *) PyCFunction_NewEx(PyMethodDef *, PyObject *, +PyAPI_FUNC(PyObject *) PyCFunction_NewEx(PyMethodDef *, PyObject *, PyObject *); /* Flag passed to newmethodobject */ @@ -66,7 +66,7 @@ PyAPI_FUNC(PyObject *) PyCFunction_NewEx(PyMethodDef *, PyObject *, /* METH_COEXIST allows a method to be entered even though a slot has already filled the entry. When defined, the flag allows a separate - method, "__contains__" for example, to coexist with a defined + method, "__contains__" for example, to coexist with a defined slot like sq_contains. */ #define METH_COEXIST 0x0040 diff --git a/Mac/Makefile.in b/Mac/Makefile.in index 03ec738..1255b13 100644 --- a/Mac/Makefile.in +++ b/Mac/Makefile.in @@ -1,5 +1,5 @@ -# This file can be invoked from the various frameworkinstall... targets in the -# main Makefile. The next couple of variables are overridden on the +# This file can be invoked from the various frameworkinstall... targets in the +# main Makefile. The next couple of variables are overridden on the # commandline in that case. VERSION=@VERSION@ @@ -53,7 +53,7 @@ compileall=$(srcdir)/../Lib/compileall.py installapps: install_Python install_PythonLauncher install_IDLE # -# Install unix tools in /usr/local/bin. These are just aliases for the +# Install unix tools in /usr/local/bin. These are just aliases for the # actual installation inside the framework. # installunixtools: diff --git a/Modules/ld_so_aix.in b/Modules/ld_so_aix.in index 86a9f7e..961532b 100644 --- a/Modules/ld_so_aix.in +++ b/Modules/ld_so_aix.in @@ -5,7 +5,7 @@ # TYPE: executable, uses makexp_aix # SYSTEM: AIX # -# DESCRIPTION: Creates a shareable .o from a set of pre-compiled +# DESCRIPTION: Creates a shareable .o from a set of pre-compiled # (unshared) .o files # # USAGE: ld_so_aix [CC] [arguments] @@ -46,7 +46,7 @@ # 4. Uncommenting the "echo" lines gives detailed output # about the commands executed in the script. # -# +# # HISTORY: Oct-1996 -- Support added for multiple .o files -- # -- and optional arguments processing. -- # Chris Myers (myers@tc.cornell.edu), Keith Kwok @@ -132,7 +132,7 @@ do done if test "$objfile" = "libpython@VERSION@@ABIFLAGS@.so"; then - ldsocoremode="true" + ldsocoremode="true" fi if test -z "$objs"; then diff --git a/Parser/Python.asdl b/Parser/Python.asdl index 792cab7..adb55aa 100644 --- a/Parser/Python.asdl +++ b/Parser/Python.asdl @@ -9,9 +9,9 @@ module Python -- not really an actual node but useful in Jython's typesystem. | Suite(stmt* body) - stmt = FunctionDef(identifier name, arguments args, + stmt = FunctionDef(identifier name, arguments args, stmt* body, expr* decorator_list, expr? returns) - | ClassDef(identifier name, + | ClassDef(identifier name, expr* bases, keyword* keywords, expr? starargs, @@ -77,7 +77,7 @@ module Python | Subscript(expr value, slice slice, expr_context ctx) | Starred(expr value, expr_context ctx) | Name(identifier id, expr_context ctx) - | List(expr* elts, expr_context ctx) + | List(expr* elts, expr_context ctx) | Tuple(expr* elts, expr_context ctx) -- col_offset is the byte offset in the utf8 string the parser uses @@ -85,13 +85,13 @@ module Python expr_context = Load | Store | Del | AugLoad | AugStore | Param - slice = Slice(expr? lower, expr? upper, expr? step) - | ExtSlice(slice* dims) - | Index(expr value) + slice = Slice(expr? lower, expr? upper, expr? step) + | ExtSlice(slice* dims) + | Index(expr value) - boolop = And | Or + boolop = And | Or - operator = Add | Sub | Mult | MatMult | Div | Mod | Pow | LShift + operator = Add | Sub | Mult | MatMult | Div | Mod | Pow | LShift | RShift | BitOr | BitXor | BitAnd | FloorDiv unaryop = Invert | Not | UAdd | USub diff --git a/Tools/freeze/extensions_win32.ini b/Tools/freeze/extensions_win32.ini index 1e36aba..d01fd6b 100644 --- a/Tools/freeze/extensions_win32.ini +++ b/Tools/freeze/extensions_win32.ini @@ -6,7 +6,7 @@ ; This is all setup for all the win32 extension modules ; released by Mark Hammond. -; You must ensure that the environment variable PYTHONEX is set +; You must ensure that the environment variable PYTHONEX is set ; to point to the root win32 extensions directory ; PYTHONPREFIX must point to the Python build root directory @@ -49,7 +49,7 @@ dsp=%PYTHONPREFIX%\PCBuild\select.dsp [zlib] dsp=%PYTHONPREFIX%\PCBuild\zlib.dsp -cl=/I %PYTHONPREFIX%\..\zlib-1.1.4 /D _WINDOWS /D WIN32 +cl=/I %PYTHONPREFIX%\..\zlib-1.1.4 /D _WINDOWS /D WIN32 libs=%PYTHONPREFIX%\..\zlib-1.1.4\zlib.lib /nodefaultlib:libc [winreg] @@ -95,7 +95,7 @@ dsp=%PYTHONEX%\win32\win32event.dsp cl=/I %PYTHONEX%\win32\src [win32file] -dsp=%PYTHONEX%\win32\win32file.dsp +dsp=%PYTHONEX%\win32\win32file.dsp cl=/I %PYTHONEX%\win32\src [win32net] @@ -108,7 +108,7 @@ dsp=%PYTHONEX%\win32\win32pdh.dsp cl=/I %PYTHONEX%\win32\src [win32pipe] -dsp=%PYTHONEX%\win32\win32pipe.dsp +dsp=%PYTHONEX%\win32\win32pipe.dsp cl=/I %PYTHONEX%\win32\src [win32security] diff --git a/Tools/scripts/dutree.doc b/Tools/scripts/dutree.doc index 2a09426..97bd2e2 100644 --- a/Tools/scripts/dutree.doc +++ b/Tools/scripts/dutree.doc @@ -34,13 +34,13 @@ sometimes it's not worth it. I actually wrote a C program the other day : | 1 sm.bak At first I thought I could just keep one local list around -at once, but this seems inherently recursive. Which means +at once, but this seems inherently recursive. Which means I need an real recursive data structure. Maybe you could do it with one of the %assoc arrays Larry uses in the begat programs, but I broke down and got dirty. I think the hardest -part was matching Felix's desired output exactly. It's not +part was matching Felix's desired output exactly. It's not blazingly fast: I should probably inline the &childof routine, -but it *was* faster to write than I could have written the +but it *was* faster to write than I could have written the equivalent C program. |