Restoring authorship annotation for <nikitozzz@yandex-team.ru>. Commit 1 of 2.

97 files changed, 13881 insertions, 13881 deletions

diff --git a/contrib/tools/python/pyconfig.inc b/contrib/tools/python/pyconfig.inc
index 01da7d4566..f6d12a7b1b 100644
--- a/contrib/tools/python/pyconfig.inc
+++ b/contrib/tools/python/pyconfig.inc
@@ -1,36 +1,36 @@
 NO_COMPILER_WARNINGS()
 
-ENABLE(USE_ARCADIA_PYTHON)
-
-SET(PYTHON_DIR "contrib/tools/python")
+ENABLE(USE_ARCADIA_PYTHON) 
+ 
+SET(PYTHON_DIR "contrib/tools/python") 
 SET(PYTHON_SRC_DIR "${PYTHON_DIR}/src")
-
-SET(PYTHON_ROOT "${ARCADIA_ROOT}/${PYTHON_DIR}")
-SET(PYTHON_SRC_ROOT "${ARCADIA_ROOT}/${PYTHON_SRC_DIR}")
-
-SET(PYTHON_FLAGS "-DPy_BUILD_CORE")
-
+ 
+SET(PYTHON_ROOT "${ARCADIA_ROOT}/${PYTHON_DIR}") 
+SET(PYTHON_SRC_ROOT "${ARCADIA_ROOT}/${PYTHON_SRC_DIR}") 
+ 
+SET(PYTHON_FLAGS "-DPy_BUILD_CORE") 
+ 
 ADDINCL(${PYTHON_SRC_DIR}/Include)
 
-CFLAGS(
+CFLAGS( 
     -DUNQUOTED_VERSION=2.7
-)
-
+) 
+ 
 IF (NOT WIN32)
     EXTRALIBS(-lutil)
-
+ 
     IF (LINUX)
         EXTRALIBS(-ldl)
-
-        CFLAGS(
+ 
+        CFLAGS( 
             -DUNQUOTED_PYTHONPATH=:plat-linux2
             -DUNQUOTED_PLATFORM=linux2
-        )
+        ) 
     ELSEIF (FREEBSD)
-        CFLAGS(
+        CFLAGS( 
             -DUNQUOTED_PYTHONPATH=:plat-freebsd${FREEBSD_VER}
             -DUNQUOTED_PLATFORM=freebsd${FREEBSD_VER}
-        )
+        ) 
     ELSEIF (DARWIN)
         CFLAGS(
             -DUNQUOTED_PYTHONPATH=:plat-darwin
diff --git a/contrib/tools/python/src/Include/Python-ast.h b/contrib/tools/python/src/Include/Python-ast.h
index 3f35bbb634..91dccf4f8a 100644
--- a/contrib/tools/python/src/Include/Python-ast.h
+++ b/contrib/tools/python/src/Include/Python-ast.h
@@ -1,535 +1,535 @@
-/* File automatically generated by Parser/asdl_c.py. */
-
-#include "asdl.h"
-
-typedef struct _mod *mod_ty;
-
-typedef struct _stmt *stmt_ty;
-
-typedef struct _expr *expr_ty;
-
-typedef enum _expr_context { Load=1, Store=2, Del=3, AugLoad=4, AugStore=5,
-                             Param=6 } expr_context_ty;
-
-typedef struct _slice *slice_ty;
-
-typedef enum _boolop { And=1, Or=2 } boolop_ty;
-
-typedef enum _operator { Add=1, Sub=2, Mult=3, Div=4, Mod=5, Pow=6, LShift=7,
-                         RShift=8, BitOr=9, BitXor=10, BitAnd=11, FloorDiv=12 }
-                         operator_ty;
-
-typedef enum _unaryop { Invert=1, Not=2, UAdd=3, USub=4 } unaryop_ty;
-
-typedef enum _cmpop { Eq=1, NotEq=2, Lt=3, LtE=4, Gt=5, GtE=6, Is=7, IsNot=8,
-                      In=9, NotIn=10 } cmpop_ty;
-
-typedef struct _comprehension *comprehension_ty;
-
-typedef struct _excepthandler *excepthandler_ty;
-
-typedef struct _arguments *arguments_ty;
-
-typedef struct _keyword *keyword_ty;
-
-typedef struct _alias *alias_ty;
-
-
-enum _mod_kind {Module_kind=1, Interactive_kind=2, Expression_kind=3,
-                 Suite_kind=4};
-struct _mod {
-        enum _mod_kind kind;
-        union {
-                struct {
-                        asdl_seq *body;
-                } Module;
-                
-                struct {
-                        asdl_seq *body;
-                } Interactive;
-                
-                struct {
-                        expr_ty body;
-                } Expression;
-                
-                struct {
-                        asdl_seq *body;
-                } Suite;
-                
-        } v;
-};
-
-enum _stmt_kind {FunctionDef_kind=1, ClassDef_kind=2, Return_kind=3,
-                  Delete_kind=4, Assign_kind=5, AugAssign_kind=6, Print_kind=7,
-                  For_kind=8, While_kind=9, If_kind=10, With_kind=11,
-                  Raise_kind=12, TryExcept_kind=13, TryFinally_kind=14,
-                  Assert_kind=15, Import_kind=16, ImportFrom_kind=17,
-                  Exec_kind=18, Global_kind=19, Expr_kind=20, Pass_kind=21,
-                  Break_kind=22, Continue_kind=23};
-struct _stmt {
-        enum _stmt_kind kind;
-        union {
-                struct {
-                        identifier name;
-                        arguments_ty args;
-                        asdl_seq *body;
-                        asdl_seq *decorator_list;
-                } FunctionDef;
-                
-                struct {
-                        identifier name;
-                        asdl_seq *bases;
-                        asdl_seq *body;
-                        asdl_seq *decorator_list;
-                } ClassDef;
-                
-                struct {
-                        expr_ty value;
-                } Return;
-                
-                struct {
-                        asdl_seq *targets;
-                } Delete;
-                
-                struct {
-                        asdl_seq *targets;
-                        expr_ty value;
-                } Assign;
-                
-                struct {
-                        expr_ty target;
-                        operator_ty op;
-                        expr_ty value;
-                } AugAssign;
-                
-                struct {
-                        expr_ty dest;
-                        asdl_seq *values;
-                        bool nl;
-                } Print;
-                
-                struct {
-                        expr_ty target;
-                        expr_ty iter;
-                        asdl_seq *body;
-                        asdl_seq *orelse;
-                } For;
-                
-                struct {
-                        expr_ty test;
-                        asdl_seq *body;
-                        asdl_seq *orelse;
-                } While;
-                
-                struct {
-                        expr_ty test;
-                        asdl_seq *body;
-                        asdl_seq *orelse;
-                } If;
-                
-                struct {
-                        expr_ty context_expr;
-                        expr_ty optional_vars;
-                        asdl_seq *body;
-                } With;
-                
-                struct {
-                        expr_ty type;
-                        expr_ty inst;
-                        expr_ty tback;
-                } Raise;
-                
-                struct {
-                        asdl_seq *body;
-                        asdl_seq *handlers;
-                        asdl_seq *orelse;
-                } TryExcept;
-                
-                struct {
-                        asdl_seq *body;
-                        asdl_seq *finalbody;
-                } TryFinally;
-                
-                struct {
-                        expr_ty test;
-                        expr_ty msg;
-                } Assert;
-                
-                struct {
-                        asdl_seq *names;
-                } Import;
-                
-                struct {
-                        identifier module;
-                        asdl_seq *names;
-                        int level;
-                } ImportFrom;
-                
-                struct {
-                        expr_ty body;
-                        expr_ty globals;
-                        expr_ty locals;
-                } Exec;
-                
-                struct {
-                        asdl_seq *names;
-                } Global;
-                
-                struct {
-                        expr_ty value;
-                } Expr;
-                
-        } v;
-        int lineno;
-        int col_offset;
-};
-
-enum _expr_kind {BoolOp_kind=1, BinOp_kind=2, UnaryOp_kind=3, Lambda_kind=4,
-                  IfExp_kind=5, Dict_kind=6, Set_kind=7, ListComp_kind=8,
-                  SetComp_kind=9, DictComp_kind=10, GeneratorExp_kind=11,
-                  Yield_kind=12, Compare_kind=13, Call_kind=14, Repr_kind=15,
-                  Num_kind=16, Str_kind=17, Attribute_kind=18,
-                  Subscript_kind=19, Name_kind=20, List_kind=21, Tuple_kind=22};
-struct _expr {
-        enum _expr_kind kind;
-        union {
-                struct {
-                        boolop_ty op;
-                        asdl_seq *values;
-                } BoolOp;
-                
-                struct {
-                        expr_ty left;
-                        operator_ty op;
-                        expr_ty right;
-                } BinOp;
-                
-                struct {
-                        unaryop_ty op;
-                        expr_ty operand;
-                } UnaryOp;
-                
-                struct {
-                        arguments_ty args;
-                        expr_ty body;
-                } Lambda;
-                
-                struct {
-                        expr_ty test;
-                        expr_ty body;
-                        expr_ty orelse;
-                } IfExp;
-                
-                struct {
-                        asdl_seq *keys;
-                        asdl_seq *values;
-                } Dict;
-                
-                struct {
-                        asdl_seq *elts;
-                } Set;
-                
-                struct {
-                        expr_ty elt;
-                        asdl_seq *generators;
-                } ListComp;
-                
-                struct {
-                        expr_ty elt;
-                        asdl_seq *generators;
-                } SetComp;
-                
-                struct {
-                        expr_ty key;
-                        expr_ty value;
-                        asdl_seq *generators;
-                } DictComp;
-                
-                struct {
-                        expr_ty elt;
-                        asdl_seq *generators;
-                } GeneratorExp;
-                
-                struct {
-                        expr_ty value;
-                } Yield;
-                
-                struct {
-                        expr_ty left;
-                        asdl_int_seq *ops;
-                        asdl_seq *comparators;
-                } Compare;
-                
-                struct {
-                        expr_ty func;
-                        asdl_seq *args;
-                        asdl_seq *keywords;
-                        expr_ty starargs;
-                        expr_ty kwargs;
-                } Call;
-                
-                struct {
-                        expr_ty value;
-                } Repr;
-                
-                struct {
-                        object n;
-                } Num;
-                
-                struct {
-                        string s;
-                } Str;
-                
-                struct {
-                        expr_ty value;
-                        identifier attr;
-                        expr_context_ty ctx;
-                } Attribute;
-                
-                struct {
-                        expr_ty value;
-                        slice_ty slice;
-                        expr_context_ty ctx;
-                } Subscript;
-                
-                struct {
-                        identifier id;
-                        expr_context_ty ctx;
-                } Name;
-                
-                struct {
-                        asdl_seq *elts;
-                        expr_context_ty ctx;
-                } List;
-                
-                struct {
-                        asdl_seq *elts;
-                        expr_context_ty ctx;
-                } Tuple;
-                
-        } v;
-        int lineno;
-        int col_offset;
-};
-
-enum _slice_kind {Ellipsis_kind=1, Slice_kind=2, ExtSlice_kind=3, Index_kind=4};
-struct _slice {
-        enum _slice_kind kind;
-        union {
-                struct {
-                        expr_ty lower;
-                        expr_ty upper;
-                        expr_ty step;
-                } Slice;
-                
-                struct {
-                        asdl_seq *dims;
-                } ExtSlice;
-                
-                struct {
-                        expr_ty value;
-                } Index;
-                
-        } v;
-};
-
-struct _comprehension {
-        expr_ty target;
-        expr_ty iter;
-        asdl_seq *ifs;
-};
-
-enum _excepthandler_kind {ExceptHandler_kind=1};
-struct _excepthandler {
-        enum _excepthandler_kind kind;
-        union {
-                struct {
-                        expr_ty type;
-                        expr_ty name;
-                        asdl_seq *body;
-                } ExceptHandler;
-                
-        } v;
-        int lineno;
-        int col_offset;
-};
-
-struct _arguments {
-        asdl_seq *args;
-        identifier vararg;
-        identifier kwarg;
-        asdl_seq *defaults;
-};
-
-struct _keyword {
-        identifier arg;
-        expr_ty value;
-};
-
-struct _alias {
-        identifier name;
-        identifier asname;
-};
-
-
-#define Module(a0, a1) _Py_Module(a0, a1)
-mod_ty _Py_Module(asdl_seq * body, PyArena *arena);
-#define Interactive(a0, a1) _Py_Interactive(a0, a1)
-mod_ty _Py_Interactive(asdl_seq * body, PyArena *arena);
-#define Expression(a0, a1) _Py_Expression(a0, a1)
-mod_ty _Py_Expression(expr_ty body, PyArena *arena);
-#define Suite(a0, a1) _Py_Suite(a0, a1)
-mod_ty _Py_Suite(asdl_seq * body, PyArena *arena);
-#define FunctionDef(a0, a1, a2, a3, a4, a5, a6) _Py_FunctionDef(a0, a1, a2, a3, a4, a5, a6)
-stmt_ty _Py_FunctionDef(identifier name, arguments_ty args, asdl_seq * body,
-                        asdl_seq * decorator_list, int lineno, int col_offset,
-                        PyArena *arena);
-#define ClassDef(a0, a1, a2, a3, a4, a5, a6) _Py_ClassDef(a0, a1, a2, a3, a4, a5, a6)
-stmt_ty _Py_ClassDef(identifier name, asdl_seq * bases, asdl_seq * body,
-                     asdl_seq * decorator_list, int lineno, int col_offset,
-                     PyArena *arena);
-#define Return(a0, a1, a2, a3) _Py_Return(a0, a1, a2, a3)
-stmt_ty _Py_Return(expr_ty value, int lineno, int col_offset, PyArena *arena);
-#define Delete(a0, a1, a2, a3) _Py_Delete(a0, a1, a2, a3)
-stmt_ty _Py_Delete(asdl_seq * targets, int lineno, int col_offset, PyArena
-                   *arena);
-#define Assign(a0, a1, a2, a3, a4) _Py_Assign(a0, a1, a2, a3, a4)
-stmt_ty _Py_Assign(asdl_seq * targets, expr_ty value, int lineno, int
-                   col_offset, PyArena *arena);
-#define AugAssign(a0, a1, a2, a3, a4, a5) _Py_AugAssign(a0, a1, a2, a3, a4, a5)
-stmt_ty _Py_AugAssign(expr_ty target, operator_ty op, expr_ty value, int
-                      lineno, int col_offset, PyArena *arena);
-#define Print(a0, a1, a2, a3, a4, a5) _Py_Print(a0, a1, a2, a3, a4, a5)
-stmt_ty _Py_Print(expr_ty dest, asdl_seq * values, bool nl, int lineno, int
-                  col_offset, PyArena *arena);
-#define For(a0, a1, a2, a3, a4, a5, a6) _Py_For(a0, a1, a2, a3, a4, a5, a6)
-stmt_ty _Py_For(expr_ty target, expr_ty iter, asdl_seq * body, asdl_seq *
-                orelse, int lineno, int col_offset, PyArena *arena);
-#define While(a0, a1, a2, a3, a4, a5) _Py_While(a0, a1, a2, a3, a4, a5)
-stmt_ty _Py_While(expr_ty test, asdl_seq * body, asdl_seq * orelse, int lineno,
-                  int col_offset, PyArena *arena);
-#define If(a0, a1, a2, a3, a4, a5) _Py_If(a0, a1, a2, a3, a4, a5)
-stmt_ty _Py_If(expr_ty test, asdl_seq * body, asdl_seq * orelse, int lineno,
-               int col_offset, PyArena *arena);
-#define With(a0, a1, a2, a3, a4, a5) _Py_With(a0, a1, a2, a3, a4, a5)
-stmt_ty _Py_With(expr_ty context_expr, expr_ty optional_vars, asdl_seq * body,
-                 int lineno, int col_offset, PyArena *arena);
-#define Raise(a0, a1, a2, a3, a4, a5) _Py_Raise(a0, a1, a2, a3, a4, a5)
-stmt_ty _Py_Raise(expr_ty type, expr_ty inst, expr_ty tback, int lineno, int
-                  col_offset, PyArena *arena);
-#define TryExcept(a0, a1, a2, a3, a4, a5) _Py_TryExcept(a0, a1, a2, a3, a4, a5)
-stmt_ty _Py_TryExcept(asdl_seq * body, asdl_seq * handlers, asdl_seq * orelse,
-                      int lineno, int col_offset, PyArena *arena);
-#define TryFinally(a0, a1, a2, a3, a4) _Py_TryFinally(a0, a1, a2, a3, a4)
-stmt_ty _Py_TryFinally(asdl_seq * body, asdl_seq * finalbody, int lineno, int
-                       col_offset, PyArena *arena);
-#define Assert(a0, a1, a2, a3, a4) _Py_Assert(a0, a1, a2, a3, a4)
-stmt_ty _Py_Assert(expr_ty test, expr_ty msg, int lineno, int col_offset,
-                   PyArena *arena);
-#define Import(a0, a1, a2, a3) _Py_Import(a0, a1, a2, a3)
-stmt_ty _Py_Import(asdl_seq * names, int lineno, int col_offset, PyArena
-                   *arena);
-#define ImportFrom(a0, a1, a2, a3, a4, a5) _Py_ImportFrom(a0, a1, a2, a3, a4, a5)
-stmt_ty _Py_ImportFrom(identifier module, asdl_seq * names, int level, int
-                       lineno, int col_offset, PyArena *arena);
-#define Exec(a0, a1, a2, a3, a4, a5) _Py_Exec(a0, a1, a2, a3, a4, a5)
-stmt_ty _Py_Exec(expr_ty body, expr_ty globals, expr_ty locals, int lineno, int
-                 col_offset, PyArena *arena);
-#define Global(a0, a1, a2, a3) _Py_Global(a0, a1, a2, a3)
-stmt_ty _Py_Global(asdl_seq * names, int lineno, int col_offset, PyArena
-                   *arena);
-#define Expr(a0, a1, a2, a3) _Py_Expr(a0, a1, a2, a3)
-stmt_ty _Py_Expr(expr_ty value, int lineno, int col_offset, PyArena *arena);
-#define Pass(a0, a1, a2) _Py_Pass(a0, a1, a2)
-stmt_ty _Py_Pass(int lineno, int col_offset, PyArena *arena);
-#define Break(a0, a1, a2) _Py_Break(a0, a1, a2)
-stmt_ty _Py_Break(int lineno, int col_offset, PyArena *arena);
-#define Continue(a0, a1, a2) _Py_Continue(a0, a1, a2)
-stmt_ty _Py_Continue(int lineno, int col_offset, PyArena *arena);
-#define BoolOp(a0, a1, a2, a3, a4) _Py_BoolOp(a0, a1, a2, a3, a4)
-expr_ty _Py_BoolOp(boolop_ty op, asdl_seq * values, int lineno, int col_offset,
-                   PyArena *arena);
-#define BinOp(a0, a1, a2, a3, a4, a5) _Py_BinOp(a0, a1, a2, a3, a4, a5)
-expr_ty _Py_BinOp(expr_ty left, operator_ty op, expr_ty right, int lineno, int
-                  col_offset, PyArena *arena);
-#define UnaryOp(a0, a1, a2, a3, a4) _Py_UnaryOp(a0, a1, a2, a3, a4)
-expr_ty _Py_UnaryOp(unaryop_ty op, expr_ty operand, int lineno, int col_offset,
-                    PyArena *arena);
-#define Lambda(a0, a1, a2, a3, a4) _Py_Lambda(a0, a1, a2, a3, a4)
-expr_ty _Py_Lambda(arguments_ty args, expr_ty body, int lineno, int col_offset,
-                   PyArena *arena);
-#define IfExp(a0, a1, a2, a3, a4, a5) _Py_IfExp(a0, a1, a2, a3, a4, a5)
-expr_ty _Py_IfExp(expr_ty test, expr_ty body, expr_ty orelse, int lineno, int
-                  col_offset, PyArena *arena);
-#define Dict(a0, a1, a2, a3, a4) _Py_Dict(a0, a1, a2, a3, a4)
-expr_ty _Py_Dict(asdl_seq * keys, asdl_seq * values, int lineno, int
-                 col_offset, PyArena *arena);
-#define Set(a0, a1, a2, a3) _Py_Set(a0, a1, a2, a3)
-expr_ty _Py_Set(asdl_seq * elts, int lineno, int col_offset, PyArena *arena);
-#define ListComp(a0, a1, a2, a3, a4) _Py_ListComp(a0, a1, a2, a3, a4)
-expr_ty _Py_ListComp(expr_ty elt, asdl_seq * generators, int lineno, int
-                     col_offset, PyArena *arena);
-#define SetComp(a0, a1, a2, a3, a4) _Py_SetComp(a0, a1, a2, a3, a4)
-expr_ty _Py_SetComp(expr_ty elt, asdl_seq * generators, int lineno, int
-                    col_offset, PyArena *arena);
-#define DictComp(a0, a1, a2, a3, a4, a5) _Py_DictComp(a0, a1, a2, a3, a4, a5)
-expr_ty _Py_DictComp(expr_ty key, expr_ty value, asdl_seq * generators, int
-                     lineno, int col_offset, PyArena *arena);
-#define GeneratorExp(a0, a1, a2, a3, a4) _Py_GeneratorExp(a0, a1, a2, a3, a4)
-expr_ty _Py_GeneratorExp(expr_ty elt, asdl_seq * generators, int lineno, int
-                         col_offset, PyArena *arena);
-#define Yield(a0, a1, a2, a3) _Py_Yield(a0, a1, a2, a3)
-expr_ty _Py_Yield(expr_ty value, int lineno, int col_offset, PyArena *arena);
-#define Compare(a0, a1, a2, a3, a4, a5) _Py_Compare(a0, a1, a2, a3, a4, a5)
-expr_ty _Py_Compare(expr_ty left, asdl_int_seq * ops, asdl_seq * comparators,
-                    int lineno, int col_offset, PyArena *arena);
-#define Call(a0, a1, a2, a3, a4, a5, a6, a7) _Py_Call(a0, a1, a2, a3, a4, a5, a6, a7)
-expr_ty _Py_Call(expr_ty func, asdl_seq * args, asdl_seq * keywords, expr_ty
-                 starargs, expr_ty kwargs, int lineno, int col_offset, PyArena
-                 *arena);
-#define Repr(a0, a1, a2, a3) _Py_Repr(a0, a1, a2, a3)
-expr_ty _Py_Repr(expr_ty value, int lineno, int col_offset, PyArena *arena);
-#define Num(a0, a1, a2, a3) _Py_Num(a0, a1, a2, a3)
-expr_ty _Py_Num(object n, int lineno, int col_offset, PyArena *arena);
-#define Str(a0, a1, a2, a3) _Py_Str(a0, a1, a2, a3)
-expr_ty _Py_Str(string s, int lineno, int col_offset, PyArena *arena);
-#define Attribute(a0, a1, a2, a3, a4, a5) _Py_Attribute(a0, a1, a2, a3, a4, a5)
-expr_ty _Py_Attribute(expr_ty value, identifier attr, expr_context_ty ctx, int
-                      lineno, int col_offset, PyArena *arena);
-#define Subscript(a0, a1, a2, a3, a4, a5) _Py_Subscript(a0, a1, a2, a3, a4, a5)
-expr_ty _Py_Subscript(expr_ty value, slice_ty slice, expr_context_ty ctx, int
-                      lineno, int col_offset, PyArena *arena);
-#define Name(a0, a1, a2, a3, a4) _Py_Name(a0, a1, a2, a3, a4)
-expr_ty _Py_Name(identifier id, expr_context_ty ctx, int lineno, int
-                 col_offset, PyArena *arena);
-#define List(a0, a1, a2, a3, a4) _Py_List(a0, a1, a2, a3, a4)
-expr_ty _Py_List(asdl_seq * elts, expr_context_ty ctx, int lineno, int
-                 col_offset, PyArena *arena);
-#define Tuple(a0, a1, a2, a3, a4) _Py_Tuple(a0, a1, a2, a3, a4)
-expr_ty _Py_Tuple(asdl_seq * elts, expr_context_ty ctx, int lineno, int
-                  col_offset, PyArena *arena);
-#define Ellipsis(a0) _Py_Ellipsis(a0)
-slice_ty _Py_Ellipsis(PyArena *arena);
-#define Slice(a0, a1, a2, a3) _Py_Slice(a0, a1, a2, a3)
-slice_ty _Py_Slice(expr_ty lower, expr_ty upper, expr_ty step, PyArena *arena);
-#define ExtSlice(a0, a1) _Py_ExtSlice(a0, a1)
-slice_ty _Py_ExtSlice(asdl_seq * dims, PyArena *arena);
-#define Index(a0, a1) _Py_Index(a0, a1)
-slice_ty _Py_Index(expr_ty value, PyArena *arena);
-#define comprehension(a0, a1, a2, a3) _Py_comprehension(a0, a1, a2, a3)
-comprehension_ty _Py_comprehension(expr_ty target, expr_ty iter, asdl_seq *
-                                   ifs, PyArena *arena);
-#define ExceptHandler(a0, a1, a2, a3, a4, a5) _Py_ExceptHandler(a0, a1, a2, a3, a4, a5)
-excepthandler_ty _Py_ExceptHandler(expr_ty type, expr_ty name, asdl_seq * body,
-                                   int lineno, int col_offset, PyArena *arena);
-#define arguments(a0, a1, a2, a3, a4) _Py_arguments(a0, a1, a2, a3, a4)
-arguments_ty _Py_arguments(asdl_seq * args, identifier vararg, identifier
-                           kwarg, asdl_seq * defaults, PyArena *arena);
-#define keyword(a0, a1, a2) _Py_keyword(a0, a1, a2)
-keyword_ty _Py_keyword(identifier arg, expr_ty value, PyArena *arena);
-#define alias(a0, a1, a2) _Py_alias(a0, a1, a2)
-alias_ty _Py_alias(identifier name, identifier asname, PyArena *arena);
-
-PyObject* PyAST_mod2obj(mod_ty t);
-mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode);
-int PyAST_Check(PyObject* obj);
+/* File automatically generated by Parser/asdl_c.py. */ 
+ 
+#include "asdl.h" 
+ 
+typedef struct _mod *mod_ty; 
+ 
+typedef struct _stmt *stmt_ty; 
+ 
+typedef struct _expr *expr_ty; 
+ 
+typedef enum _expr_context { Load=1, Store=2, Del=3, AugLoad=4, AugStore=5, 
+                             Param=6 } expr_context_ty; 
+ 
+typedef struct _slice *slice_ty; 
+ 
+typedef enum _boolop { And=1, Or=2 } boolop_ty; 
+ 
+typedef enum _operator { Add=1, Sub=2, Mult=3, Div=4, Mod=5, Pow=6, LShift=7, 
+                         RShift=8, BitOr=9, BitXor=10, BitAnd=11, FloorDiv=12 } 
+                         operator_ty; 
+ 
+typedef enum _unaryop { Invert=1, Not=2, UAdd=3, USub=4 } unaryop_ty; 
+ 
+typedef enum _cmpop { Eq=1, NotEq=2, Lt=3, LtE=4, Gt=5, GtE=6, Is=7, IsNot=8, 
+                      In=9, NotIn=10 } cmpop_ty; 
+ 
+typedef struct _comprehension *comprehension_ty; 
+ 
+typedef struct _excepthandler *excepthandler_ty; 
+ 
+typedef struct _arguments *arguments_ty; 
+ 
+typedef struct _keyword *keyword_ty; 
+ 
+typedef struct _alias *alias_ty; 
+ 
+ 
+enum _mod_kind {Module_kind=1, Interactive_kind=2, Expression_kind=3, 
+                 Suite_kind=4}; 
+struct _mod { 
+        enum _mod_kind kind; 
+        union { 
+                struct { 
+                        asdl_seq *body; 
+                } Module; 
+                 
+                struct { 
+                        asdl_seq *body; 
+                } Interactive; 
+                 
+                struct { 
+                        expr_ty body; 
+                } Expression; 
+                 
+                struct { 
+                        asdl_seq *body; 
+                } Suite; 
+                 
+        } v; 
+}; 
+ 
+enum _stmt_kind {FunctionDef_kind=1, ClassDef_kind=2, Return_kind=3, 
+                  Delete_kind=4, Assign_kind=5, AugAssign_kind=6, Print_kind=7, 
+                  For_kind=8, While_kind=9, If_kind=10, With_kind=11, 
+                  Raise_kind=12, TryExcept_kind=13, TryFinally_kind=14, 
+                  Assert_kind=15, Import_kind=16, ImportFrom_kind=17, 
+                  Exec_kind=18, Global_kind=19, Expr_kind=20, Pass_kind=21, 
+                  Break_kind=22, Continue_kind=23}; 
+struct _stmt { 
+        enum _stmt_kind kind; 
+        union { 
+                struct { 
+                        identifier name; 
+                        arguments_ty args; 
+                        asdl_seq *body; 
+                        asdl_seq *decorator_list; 
+                } FunctionDef; 
+                 
+                struct { 
+                        identifier name; 
+                        asdl_seq *bases; 
+                        asdl_seq *body; 
+                        asdl_seq *decorator_list; 
+                } ClassDef; 
+                 
+                struct { 
+                        expr_ty value; 
+                } Return; 
+                 
+                struct { 
+                        asdl_seq *targets; 
+                } Delete; 
+                 
+                struct { 
+                        asdl_seq *targets; 
+                        expr_ty value; 
+                } Assign; 
+                 
+                struct { 
+                        expr_ty target; 
+                        operator_ty op; 
+                        expr_ty value; 
+                } AugAssign; 
+                 
+                struct { 
+                        expr_ty dest; 
+                        asdl_seq *values; 
+                        bool nl; 
+                } Print; 
+                 
+                struct { 
+                        expr_ty target; 
+                        expr_ty iter; 
+                        asdl_seq *body; 
+                        asdl_seq *orelse; 
+                } For; 
+                 
+                struct { 
+                        expr_ty test; 
+                        asdl_seq *body; 
+                        asdl_seq *orelse; 
+                } While; 
+                 
+                struct { 
+                        expr_ty test; 
+                        asdl_seq *body; 
+                        asdl_seq *orelse; 
+                } If; 
+                 
+                struct { 
+                        expr_ty context_expr; 
+                        expr_ty optional_vars; 
+                        asdl_seq *body; 
+                } With; 
+                 
+                struct { 
+                        expr_ty type; 
+                        expr_ty inst; 
+                        expr_ty tback; 
+                } Raise; 
+                 
+                struct { 
+                        asdl_seq *body; 
+                        asdl_seq *handlers; 
+                        asdl_seq *orelse; 
+                } TryExcept; 
+                 
+                struct { 
+                        asdl_seq *body; 
+                        asdl_seq *finalbody; 
+                } TryFinally; 
+                 
+                struct { 
+                        expr_ty test; 
+                        expr_ty msg; 
+                } Assert; 
+                 
+                struct { 
+                        asdl_seq *names; 
+                } Import; 
+                 
+                struct { 
+                        identifier module; 
+                        asdl_seq *names; 
+                        int level; 
+                } ImportFrom; 
+                 
+                struct { 
+                        expr_ty body; 
+                        expr_ty globals; 
+                        expr_ty locals; 
+                } Exec; 
+                 
+                struct { 
+                        asdl_seq *names; 
+                } Global; 
+                 
+                struct { 
+                        expr_ty value; 
+                } Expr; 
+                 
+        } v; 
+        int lineno; 
+        int col_offset; 
+}; 
+ 
+enum _expr_kind {BoolOp_kind=1, BinOp_kind=2, UnaryOp_kind=3, Lambda_kind=4, 
+                  IfExp_kind=5, Dict_kind=6, Set_kind=7, ListComp_kind=8, 
+                  SetComp_kind=9, DictComp_kind=10, GeneratorExp_kind=11, 
+                  Yield_kind=12, Compare_kind=13, Call_kind=14, Repr_kind=15, 
+                  Num_kind=16, Str_kind=17, Attribute_kind=18, 
+                  Subscript_kind=19, Name_kind=20, List_kind=21, Tuple_kind=22}; 
+struct _expr { 
+        enum _expr_kind kind; 
+        union { 
+                struct { 
+                        boolop_ty op; 
+                        asdl_seq *values; 
+                } BoolOp; 
+                 
+                struct { 
+                        expr_ty left; 
+                        operator_ty op; 
+                        expr_ty right; 
+                } BinOp; 
+                 
+                struct { 
+                        unaryop_ty op; 
+                        expr_ty operand; 
+                } UnaryOp; 
+                 
+                struct { 
+                        arguments_ty args; 
+                        expr_ty body; 
+                } Lambda; 
+                 
+                struct { 
+                        expr_ty test; 
+                        expr_ty body; 
+                        expr_ty orelse; 
+                } IfExp; 
+                 
+                struct { 
+                        asdl_seq *keys; 
+                        asdl_seq *values; 
+                } Dict; 
+                 
+                struct { 
+                        asdl_seq *elts; 
+                } Set; 
+                 
+                struct { 
+                        expr_ty elt; 
+                        asdl_seq *generators; 
+                } ListComp; 
+                 
+                struct { 
+                        expr_ty elt; 
+                        asdl_seq *generators; 
+                } SetComp; 
+                 
+                struct { 
+                        expr_ty key; 
+                        expr_ty value; 
+                        asdl_seq *generators; 
+                } DictComp; 
+                 
+                struct { 
+                        expr_ty elt; 
+                        asdl_seq *generators; 
+                } GeneratorExp; 
+                 
+                struct { 
+                        expr_ty value; 
+                } Yield; 
+                 
+                struct { 
+                        expr_ty left; 
+                        asdl_int_seq *ops; 
+                        asdl_seq *comparators; 
+                } Compare; 
+                 
+                struct { 
+                        expr_ty func; 
+                        asdl_seq *args; 
+                        asdl_seq *keywords; 
+                        expr_ty starargs; 
+                        expr_ty kwargs; 
+                } Call; 
+                 
+                struct { 
+                        expr_ty value; 
+                } Repr; 
+                 
+                struct { 
+                        object n; 
+                } Num; 
+                 
+                struct { 
+                        string s; 
+                } Str; 
+                 
+                struct { 
+                        expr_ty value; 
+                        identifier attr; 
+                        expr_context_ty ctx; 
+                } Attribute; 
+                 
+                struct { 
+                        expr_ty value; 
+                        slice_ty slice; 
+                        expr_context_ty ctx; 
+                } Subscript; 
+                 
+                struct { 
+                        identifier id; 
+                        expr_context_ty ctx; 
+                } Name; 
+                 
+                struct { 
+                        asdl_seq *elts; 
+                        expr_context_ty ctx; 
+                } List; 
+                 
+                struct { 
+                        asdl_seq *elts; 
+                        expr_context_ty ctx; 
+                } Tuple; 
+                 
+        } v; 
+        int lineno; 
+        int col_offset; 
+}; 
+ 
+enum _slice_kind {Ellipsis_kind=1, Slice_kind=2, ExtSlice_kind=3, Index_kind=4}; 
+struct _slice { 
+        enum _slice_kind kind; 
+        union { 
+                struct { 
+                        expr_ty lower; 
+                        expr_ty upper; 
+                        expr_ty step; 
+                } Slice; 
+                 
+                struct { 
+                        asdl_seq *dims; 
+                } ExtSlice; 
+                 
+                struct { 
+                        expr_ty value; 
+                } Index; 
+                 
+        } v; 
+}; 
+ 
+struct _comprehension { 
+        expr_ty target; 
+        expr_ty iter; 
+        asdl_seq *ifs; 
+}; 
+ 
+enum _excepthandler_kind {ExceptHandler_kind=1}; 
+struct _excepthandler { 
+        enum _excepthandler_kind kind; 
+        union { 
+                struct { 
+                        expr_ty type; 
+                        expr_ty name; 
+                        asdl_seq *body; 
+                } ExceptHandler; 
+                 
+        } v; 
+        int lineno; 
+        int col_offset; 
+}; 
+ 
+struct _arguments { 
+        asdl_seq *args; 
+        identifier vararg; 
+        identifier kwarg; 
+        asdl_seq *defaults; 
+}; 
+ 
+struct _keyword { 
+        identifier arg; 
+        expr_ty value; 
+}; 
+ 
+struct _alias { 
+        identifier name; 
+        identifier asname; 
+}; 
+ 
+ 
+#define Module(a0, a1) _Py_Module(a0, a1) 
+mod_ty _Py_Module(asdl_seq * body, PyArena *arena); 
+#define Interactive(a0, a1) _Py_Interactive(a0, a1) 
+mod_ty _Py_Interactive(asdl_seq * body, PyArena *arena); 
+#define Expression(a0, a1) _Py_Expression(a0, a1) 
+mod_ty _Py_Expression(expr_ty body, PyArena *arena); 
+#define Suite(a0, a1) _Py_Suite(a0, a1) 
+mod_ty _Py_Suite(asdl_seq * body, PyArena *arena); 
+#define FunctionDef(a0, a1, a2, a3, a4, a5, a6) _Py_FunctionDef(a0, a1, a2, a3, a4, a5, a6) 
+stmt_ty _Py_FunctionDef(identifier name, arguments_ty args, asdl_seq * body, 
+                        asdl_seq * decorator_list, int lineno, int col_offset, 
+                        PyArena *arena); 
+#define ClassDef(a0, a1, a2, a3, a4, a5, a6) _Py_ClassDef(a0, a1, a2, a3, a4, a5, a6) 
+stmt_ty _Py_ClassDef(identifier name, asdl_seq * bases, asdl_seq * body, 
+                     asdl_seq * decorator_list, int lineno, int col_offset, 
+                     PyArena *arena); 
+#define Return(a0, a1, a2, a3) _Py_Return(a0, a1, a2, a3) 
+stmt_ty _Py_Return(expr_ty value, int lineno, int col_offset, PyArena *arena); 
+#define Delete(a0, a1, a2, a3) _Py_Delete(a0, a1, a2, a3) 
+stmt_ty _Py_Delete(asdl_seq * targets, int lineno, int col_offset, PyArena 
+                   *arena); 
+#define Assign(a0, a1, a2, a3, a4) _Py_Assign(a0, a1, a2, a3, a4) 
+stmt_ty _Py_Assign(asdl_seq * targets, expr_ty value, int lineno, int 
+                   col_offset, PyArena *arena); 
+#define AugAssign(a0, a1, a2, a3, a4, a5) _Py_AugAssign(a0, a1, a2, a3, a4, a5) 
+stmt_ty _Py_AugAssign(expr_ty target, operator_ty op, expr_ty value, int 
+                      lineno, int col_offset, PyArena *arena); 
+#define Print(a0, a1, a2, a3, a4, a5) _Py_Print(a0, a1, a2, a3, a4, a5) 
+stmt_ty _Py_Print(expr_ty dest, asdl_seq * values, bool nl, int lineno, int 
+                  col_offset, PyArena *arena); 
+#define For(a0, a1, a2, a3, a4, a5, a6) _Py_For(a0, a1, a2, a3, a4, a5, a6) 
+stmt_ty _Py_For(expr_ty target, expr_ty iter, asdl_seq * body, asdl_seq * 
+                orelse, int lineno, int col_offset, PyArena *arena); 
+#define While(a0, a1, a2, a3, a4, a5) _Py_While(a0, a1, a2, a3, a4, a5) 
+stmt_ty _Py_While(expr_ty test, asdl_seq * body, asdl_seq * orelse, int lineno, 
+                  int col_offset, PyArena *arena); 
+#define If(a0, a1, a2, a3, a4, a5) _Py_If(a0, a1, a2, a3, a4, a5) 
+stmt_ty _Py_If(expr_ty test, asdl_seq * body, asdl_seq * orelse, int lineno, 
+               int col_offset, PyArena *arena); 
+#define With(a0, a1, a2, a3, a4, a5) _Py_With(a0, a1, a2, a3, a4, a5) 
+stmt_ty _Py_With(expr_ty context_expr, expr_ty optional_vars, asdl_seq * body, 
+                 int lineno, int col_offset, PyArena *arena); 
+#define Raise(a0, a1, a2, a3, a4, a5) _Py_Raise(a0, a1, a2, a3, a4, a5) 
+stmt_ty _Py_Raise(expr_ty type, expr_ty inst, expr_ty tback, int lineno, int 
+                  col_offset, PyArena *arena); 
+#define TryExcept(a0, a1, a2, a3, a4, a5) _Py_TryExcept(a0, a1, a2, a3, a4, a5) 
+stmt_ty _Py_TryExcept(asdl_seq * body, asdl_seq * handlers, asdl_seq * orelse, 
+                      int lineno, int col_offset, PyArena *arena); 
+#define TryFinally(a0, a1, a2, a3, a4) _Py_TryFinally(a0, a1, a2, a3, a4) 
+stmt_ty _Py_TryFinally(asdl_seq * body, asdl_seq * finalbody, int lineno, int 
+                       col_offset, PyArena *arena); 
+#define Assert(a0, a1, a2, a3, a4) _Py_Assert(a0, a1, a2, a3, a4) 
+stmt_ty _Py_Assert(expr_ty test, expr_ty msg, int lineno, int col_offset, 
+                   PyArena *arena); 
+#define Import(a0, a1, a2, a3) _Py_Import(a0, a1, a2, a3) 
+stmt_ty _Py_Import(asdl_seq * names, int lineno, int col_offset, PyArena 
+                   *arena); 
+#define ImportFrom(a0, a1, a2, a3, a4, a5) _Py_ImportFrom(a0, a1, a2, a3, a4, a5) 
+stmt_ty _Py_ImportFrom(identifier module, asdl_seq * names, int level, int 
+                       lineno, int col_offset, PyArena *arena); 
+#define Exec(a0, a1, a2, a3, a4, a5) _Py_Exec(a0, a1, a2, a3, a4, a5) 
+stmt_ty _Py_Exec(expr_ty body, expr_ty globals, expr_ty locals, int lineno, int 
+                 col_offset, PyArena *arena); 
+#define Global(a0, a1, a2, a3) _Py_Global(a0, a1, a2, a3) 
+stmt_ty _Py_Global(asdl_seq * names, int lineno, int col_offset, PyArena 
+                   *arena); 
+#define Expr(a0, a1, a2, a3) _Py_Expr(a0, a1, a2, a3) 
+stmt_ty _Py_Expr(expr_ty value, int lineno, int col_offset, PyArena *arena); 
+#define Pass(a0, a1, a2) _Py_Pass(a0, a1, a2) 
+stmt_ty _Py_Pass(int lineno, int col_offset, PyArena *arena); 
+#define Break(a0, a1, a2) _Py_Break(a0, a1, a2) 
+stmt_ty _Py_Break(int lineno, int col_offset, PyArena *arena); 
+#define Continue(a0, a1, a2) _Py_Continue(a0, a1, a2) 
+stmt_ty _Py_Continue(int lineno, int col_offset, PyArena *arena); 
+#define BoolOp(a0, a1, a2, a3, a4) _Py_BoolOp(a0, a1, a2, a3, a4) 
+expr_ty _Py_BoolOp(boolop_ty op, asdl_seq * values, int lineno, int col_offset, 
+                   PyArena *arena); 
+#define BinOp(a0, a1, a2, a3, a4, a5) _Py_BinOp(a0, a1, a2, a3, a4, a5) 
+expr_ty _Py_BinOp(expr_ty left, operator_ty op, expr_ty right, int lineno, int 
+                  col_offset, PyArena *arena); 
+#define UnaryOp(a0, a1, a2, a3, a4) _Py_UnaryOp(a0, a1, a2, a3, a4) 
+expr_ty _Py_UnaryOp(unaryop_ty op, expr_ty operand, int lineno, int col_offset, 
+                    PyArena *arena); 
+#define Lambda(a0, a1, a2, a3, a4) _Py_Lambda(a0, a1, a2, a3, a4) 
+expr_ty _Py_Lambda(arguments_ty args, expr_ty body, int lineno, int col_offset, 
+                   PyArena *arena); 
+#define IfExp(a0, a1, a2, a3, a4, a5) _Py_IfExp(a0, a1, a2, a3, a4, a5) 
+expr_ty _Py_IfExp(expr_ty test, expr_ty body, expr_ty orelse, int lineno, int 
+                  col_offset, PyArena *arena); 
+#define Dict(a0, a1, a2, a3, a4) _Py_Dict(a0, a1, a2, a3, a4) 
+expr_ty _Py_Dict(asdl_seq * keys, asdl_seq * values, int lineno, int 
+                 col_offset, PyArena *arena); 
+#define Set(a0, a1, a2, a3) _Py_Set(a0, a1, a2, a3) 
+expr_ty _Py_Set(asdl_seq * elts, int lineno, int col_offset, PyArena *arena); 
+#define ListComp(a0, a1, a2, a3, a4) _Py_ListComp(a0, a1, a2, a3, a4) 
+expr_ty _Py_ListComp(expr_ty elt, asdl_seq * generators, int lineno, int 
+                     col_offset, PyArena *arena); 
+#define SetComp(a0, a1, a2, a3, a4) _Py_SetComp(a0, a1, a2, a3, a4) 
+expr_ty _Py_SetComp(expr_ty elt, asdl_seq * generators, int lineno, int 
+                    col_offset, PyArena *arena); 
+#define DictComp(a0, a1, a2, a3, a4, a5) _Py_DictComp(a0, a1, a2, a3, a4, a5) 
+expr_ty _Py_DictComp(expr_ty key, expr_ty value, asdl_seq * generators, int 
+                     lineno, int col_offset, PyArena *arena); 
+#define GeneratorExp(a0, a1, a2, a3, a4) _Py_GeneratorExp(a0, a1, a2, a3, a4) 
+expr_ty _Py_GeneratorExp(expr_ty elt, asdl_seq * generators, int lineno, int 
+                         col_offset, PyArena *arena); 
+#define Yield(a0, a1, a2, a3) _Py_Yield(a0, a1, a2, a3) 
+expr_ty _Py_Yield(expr_ty value, int lineno, int col_offset, PyArena *arena); 
+#define Compare(a0, a1, a2, a3, a4, a5) _Py_Compare(a0, a1, a2, a3, a4, a5) 
+expr_ty _Py_Compare(expr_ty left, asdl_int_seq * ops, asdl_seq * comparators, 
+                    int lineno, int col_offset, PyArena *arena); 
+#define Call(a0, a1, a2, a3, a4, a5, a6, a7) _Py_Call(a0, a1, a2, a3, a4, a5, a6, a7) 
+expr_ty _Py_Call(expr_ty func, asdl_seq * args, asdl_seq * keywords, expr_ty 
+                 starargs, expr_ty kwargs, int lineno, int col_offset, PyArena 
+                 *arena); 
+#define Repr(a0, a1, a2, a3) _Py_Repr(a0, a1, a2, a3) 
+expr_ty _Py_Repr(expr_ty value, int lineno, int col_offset, PyArena *arena); 
+#define Num(a0, a1, a2, a3) _Py_Num(a0, a1, a2, a3) 
+expr_ty _Py_Num(object n, int lineno, int col_offset, PyArena *arena); 
+#define Str(a0, a1, a2, a3) _Py_Str(a0, a1, a2, a3) 
+expr_ty _Py_Str(string s, int lineno, int col_offset, PyArena *arena); 
+#define Attribute(a0, a1, a2, a3, a4, a5) _Py_Attribute(a0, a1, a2, a3, a4, a5) 
+expr_ty _Py_Attribute(expr_ty value, identifier attr, expr_context_ty ctx, int 
+                      lineno, int col_offset, PyArena *arena); 
+#define Subscript(a0, a1, a2, a3, a4, a5) _Py_Subscript(a0, a1, a2, a3, a4, a5) 
+expr_ty _Py_Subscript(expr_ty value, slice_ty slice, expr_context_ty ctx, int 
+                      lineno, int col_offset, PyArena *arena); 
+#define Name(a0, a1, a2, a3, a4) _Py_Name(a0, a1, a2, a3, a4) 
+expr_ty _Py_Name(identifier id, expr_context_ty ctx, int lineno, int 
+                 col_offset, PyArena *arena); 
+#define List(a0, a1, a2, a3, a4) _Py_List(a0, a1, a2, a3, a4) 
+expr_ty _Py_List(asdl_seq * elts, expr_context_ty ctx, int lineno, int 
+                 col_offset, PyArena *arena); 
+#define Tuple(a0, a1, a2, a3, a4) _Py_Tuple(a0, a1, a2, a3, a4) 
+expr_ty _Py_Tuple(asdl_seq * elts, expr_context_ty ctx, int lineno, int 
+                  col_offset, PyArena *arena); 
+#define Ellipsis(a0) _Py_Ellipsis(a0) 
+slice_ty _Py_Ellipsis(PyArena *arena); 
+#define Slice(a0, a1, a2, a3) _Py_Slice(a0, a1, a2, a3) 
+slice_ty _Py_Slice(expr_ty lower, expr_ty upper, expr_ty step, PyArena *arena); 
+#define ExtSlice(a0, a1) _Py_ExtSlice(a0, a1) 
+slice_ty _Py_ExtSlice(asdl_seq * dims, PyArena *arena); 
+#define Index(a0, a1) _Py_Index(a0, a1) 
+slice_ty _Py_Index(expr_ty value, PyArena *arena); 
+#define comprehension(a0, a1, a2, a3) _Py_comprehension(a0, a1, a2, a3) 
+comprehension_ty _Py_comprehension(expr_ty target, expr_ty iter, asdl_seq * 
+                                   ifs, PyArena *arena); 
+#define ExceptHandler(a0, a1, a2, a3, a4, a5) _Py_ExceptHandler(a0, a1, a2, a3, a4, a5) 
+excepthandler_ty _Py_ExceptHandler(expr_ty type, expr_ty name, asdl_seq * body, 
+                                   int lineno, int col_offset, PyArena *arena); 
+#define arguments(a0, a1, a2, a3, a4) _Py_arguments(a0, a1, a2, a3, a4) 
+arguments_ty _Py_arguments(asdl_seq * args, identifier vararg, identifier 
+                           kwarg, asdl_seq * defaults, PyArena *arena); 
+#define keyword(a0, a1, a2) _Py_keyword(a0, a1, a2) 
+keyword_ty _Py_keyword(identifier arg, expr_ty value, PyArena *arena); 
+#define alias(a0, a1, a2) _Py_alias(a0, a1, a2) 
+alias_ty _Py_alias(identifier name, identifier asname, PyArena *arena); 
+ 
+PyObject* PyAST_mod2obj(mod_ty t); 
+mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode); 
+int PyAST_Check(PyObject* obj); 
diff --git a/contrib/tools/python/src/Include/Python.h b/contrib/tools/python/src/Include/Python.h
index 7199224e2d..0ee6e77b25 100644
--- a/contrib/tools/python/src/Include/Python.h
+++ b/contrib/tools/python/src/Include/Python.h
@@ -1,185 +1,185 @@
-#ifndef Py_PYTHON_H
-#define Py_PYTHON_H
+#ifndef Py_PYTHON_H 
+#define Py_PYTHON_H 
 
 #ifdef __GNUC__
 #pragma GCC system_header
 #endif
-/* Since this is a "meta-include" file, no #ifdef __cplusplus / extern "C" { */
-
-/* Include nearly all Python header files */
-
-#include "patchlevel.h"
-#include "pyconfig.h"
-#include "pymacconfig.h"
-
-/* Cyclic gc is always enabled, starting with release 2.3a1.  Supply the
- * old symbol for the benefit of extension modules written before then
- * that may be conditionalizing on it.  The core doesn't use it anymore.
- */
-#ifndef WITH_CYCLE_GC
-#define WITH_CYCLE_GC 1
-#endif
-
-#include <limits.h>
-
-#ifndef UCHAR_MAX
-#error "Something's broken.  UCHAR_MAX should be defined in limits.h."
-#endif
-
-#if UCHAR_MAX != 255
-#error "Python's source code assumes C's unsigned char is an 8-bit type."
-#endif
-
-#if defined(__sgi) && defined(WITH_THREAD) && !defined(_SGI_MP_SOURCE)
-#define _SGI_MP_SOURCE
-#endif
-
-#include <stdio.h>
-#ifndef NULL
-#   error "Python.h requires that stdio.h define NULL."
-#endif
-
-#include <string.h>
-#ifdef HAVE_ERRNO_H
-#include <errno.h>
-#endif
-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
+/* Since this is a "meta-include" file, no #ifdef __cplusplus / extern "C" { */ 
+ 
+/* Include nearly all Python header files */ 
+ 
+#include "patchlevel.h" 
+#include "pyconfig.h" 
+#include "pymacconfig.h" 
+ 
+/* Cyclic gc is always enabled, starting with release 2.3a1.  Supply the 
+ * old symbol for the benefit of extension modules written before then 
+ * that may be conditionalizing on it.  The core doesn't use it anymore. 
+ */ 
+#ifndef WITH_CYCLE_GC 
+#define WITH_CYCLE_GC 1 
+#endif 
+ 
+#include <limits.h> 
+ 
+#ifndef UCHAR_MAX 
+#error "Something's broken.  UCHAR_MAX should be defined in limits.h." 
+#endif 
+ 
+#if UCHAR_MAX != 255 
+#error "Python's source code assumes C's unsigned char is an 8-bit type." 
+#endif 
+ 
+#if defined(__sgi) && defined(WITH_THREAD) && !defined(_SGI_MP_SOURCE) 
+#define _SGI_MP_SOURCE 
+#endif 
+ 
+#include <stdio.h> 
+#ifndef NULL 
+#   error "Python.h requires that stdio.h define NULL." 
+#endif 
+ 
+#include <string.h> 
+#ifdef HAVE_ERRNO_H 
+#include <errno.h> 
+#endif 
+#include <stdlib.h> 
+#ifdef HAVE_UNISTD_H 
+#include <unistd.h> 
+#endif 
 #ifdef HAVE_CRYPT_H
 #include <crypt.h>
 #endif
-
-/* For size_t? */
-#ifdef HAVE_STDDEF_H
-#include <stddef.h>
-#endif
-
-/* CAUTION:  Build setups should ensure that NDEBUG is defined on the
- * compiler command line when building Python in release mode; else
- * assert() calls won't be removed.
- */
-#include <assert.h>
-
-#include "pyport.h"
-
-/* pyconfig.h or pyport.h may or may not define DL_IMPORT */
-#ifndef DL_IMPORT	/* declarations for DLL import/export */
-#define DL_IMPORT(RTYPE) RTYPE
-#endif
-#ifndef DL_EXPORT	/* declarations for DLL import/export */
-#define DL_EXPORT(RTYPE) RTYPE
-#endif
-
-/* Debug-mode build with pymalloc implies PYMALLOC_DEBUG.
- *  PYMALLOC_DEBUG is in error if pymalloc is not in use.
- */
-#if defined(Py_DEBUG) && defined(WITH_PYMALLOC) && !defined(PYMALLOC_DEBUG)
-#define PYMALLOC_DEBUG
-#endif
-#if defined(PYMALLOC_DEBUG) && !defined(WITH_PYMALLOC)
-#error "PYMALLOC_DEBUG requires WITH_PYMALLOC"
-#endif
-#include "pymath.h"
-#include "pymem.h"
-
-#include "object.h"
-#include "objimpl.h"
-
-#include "pydebug.h"
-
-#include "unicodeobject.h"
-#include "intobject.h"
-#include "boolobject.h"
-#include "longobject.h"
-#include "floatobject.h"
-#ifndef WITHOUT_COMPLEX
-#include "complexobject.h"
-#endif
-#include "rangeobject.h"
-#include "stringobject.h"
-#include "memoryobject.h"
-#include "bufferobject.h"
-#include "bytesobject.h"
-#include "bytearrayobject.h"
-#include "tupleobject.h"
-#include "listobject.h"
-#include "dictobject.h"
-#include "enumobject.h"
-#include "setobject.h"
-#include "methodobject.h"
-#include "moduleobject.h"
-#include "funcobject.h"
-#include "classobject.h"
-#include "fileobject.h"
-#include "cobject.h"
-#include "pycapsule.h"
-#include "traceback.h"
-#include "sliceobject.h"
-#include "cellobject.h"
-#include "iterobject.h"
-#include "genobject.h"
-#include "descrobject.h"
-#include "warnings.h"
-#include "weakrefobject.h"
-
-#include "codecs.h"
-#include "pyerrors.h"
-
-#include "pystate.h"
-
-#include "pyarena.h"
-#include "modsupport.h"
-#include "pythonrun.h"
-#include "ceval.h"
-#include "sysmodule.h"
-#include "intrcheck.h"
-#include "import.h"
-
-#include "abstract.h"
-
-#include "compile.h"
-#include "eval.h"
-
-#include "pyctype.h"
-#include "pystrtod.h"
-#include "pystrcmp.h"
-#include "dtoa.h"
-
-/* _Py_Mangle is defined in compile.c */
-PyAPI_FUNC(PyObject*) _Py_Mangle(PyObject *p, PyObject *name);
-
-/* PyArg_GetInt is deprecated and should not be used, use PyArg_Parse(). */
-#define PyArg_GetInt(v, a)	PyArg_Parse((v), "i", (a))
-
-/* PyArg_NoArgs should not be necessary.
-   Set ml_flags in the PyMethodDef to METH_NOARGS. */
-#define PyArg_NoArgs(v)		PyArg_Parse(v, "")
-
-/* Argument must be a char or an int in [-128, 127] or [0, 255]. */
-#define Py_CHARMASK(c)		((unsigned char)((c) & 0xff))
-
-#include "pyfpe.h"
-
-/* These definitions must match corresponding definitions in graminit.h.
-   There's code in compile.c that checks that they are the same. */
-#define Py_single_input 256
-#define Py_file_input 257
-#define Py_eval_input 258
-
-#ifdef HAVE_PTH
-/* GNU pth user-space thread support */
-#include <pth.h>
-#endif
-
-/* Define macros for inline documentation. */
-#define PyDoc_VAR(name) static char name[]
-#define PyDoc_STRVAR(name,str) PyDoc_VAR(name) = PyDoc_STR(str)
-#ifdef WITH_DOC_STRINGS
-#define PyDoc_STR(str) str
-#else
-#define PyDoc_STR(str) ""
-#endif
-
-#endif /* !Py_PYTHON_H */
+ 
+/* For size_t? */ 
+#ifdef HAVE_STDDEF_H 
+#include <stddef.h> 
+#endif 
+ 
+/* CAUTION:  Build setups should ensure that NDEBUG is defined on the 
+ * compiler command line when building Python in release mode; else 
+ * assert() calls won't be removed. 
+ */ 
+#include <assert.h> 
+ 
+#include "pyport.h" 
+ 
+/* pyconfig.h or pyport.h may or may not define DL_IMPORT */ 
+#ifndef DL_IMPORT	/* declarations for DLL import/export */ 
+#define DL_IMPORT(RTYPE) RTYPE 
+#endif 
+#ifndef DL_EXPORT	/* declarations for DLL import/export */ 
+#define DL_EXPORT(RTYPE) RTYPE 
+#endif 
+ 
+/* Debug-mode build with pymalloc implies PYMALLOC_DEBUG. 
+ *  PYMALLOC_DEBUG is in error if pymalloc is not in use. 
+ */ 
+#if defined(Py_DEBUG) && defined(WITH_PYMALLOC) && !defined(PYMALLOC_DEBUG) 
+#define PYMALLOC_DEBUG 
+#endif 
+#if defined(PYMALLOC_DEBUG) && !defined(WITH_PYMALLOC) 
+#error "PYMALLOC_DEBUG requires WITH_PYMALLOC" 
+#endif 
+#include "pymath.h" 
+#include "pymem.h" 
+ 
+#include "object.h" 
+#include "objimpl.h" 
+ 
+#include "pydebug.h" 
+ 
+#include "unicodeobject.h" 
+#include "intobject.h" 
+#include "boolobject.h" 
+#include "longobject.h" 
+#include "floatobject.h" 
+#ifndef WITHOUT_COMPLEX 
+#include "complexobject.h" 
+#endif 
+#include "rangeobject.h" 
+#include "stringobject.h" 
+#include "memoryobject.h" 
+#include "bufferobject.h" 
+#include "bytesobject.h" 
+#include "bytearrayobject.h" 
+#include "tupleobject.h" 
+#include "listobject.h" 
+#include "dictobject.h" 
+#include "enumobject.h" 
+#include "setobject.h" 
+#include "methodobject.h" 
+#include "moduleobject.h" 
+#include "funcobject.h" 
+#include "classobject.h" 
+#include "fileobject.h" 
+#include "cobject.h" 
+#include "pycapsule.h" 
+#include "traceback.h" 
+#include "sliceobject.h" 
+#include "cellobject.h" 
+#include "iterobject.h" 
+#include "genobject.h" 
+#include "descrobject.h" 
+#include "warnings.h" 
+#include "weakrefobject.h" 
+ 
+#include "codecs.h" 
+#include "pyerrors.h" 
+ 
+#include "pystate.h" 
+ 
+#include "pyarena.h" 
+#include "modsupport.h" 
+#include "pythonrun.h" 
+#include "ceval.h" 
+#include "sysmodule.h" 
+#include "intrcheck.h" 
+#include "import.h" 
+ 
+#include "abstract.h" 
+ 
+#include "compile.h" 
+#include "eval.h" 
+ 
+#include "pyctype.h" 
+#include "pystrtod.h" 
+#include "pystrcmp.h" 
+#include "dtoa.h" 
+ 
+/* _Py_Mangle is defined in compile.c */ 
+PyAPI_FUNC(PyObject*) _Py_Mangle(PyObject *p, PyObject *name); 
+ 
+/* PyArg_GetInt is deprecated and should not be used, use PyArg_Parse(). */ 
+#define PyArg_GetInt(v, a)	PyArg_Parse((v), "i", (a)) 
+ 
+/* PyArg_NoArgs should not be necessary. 
+   Set ml_flags in the PyMethodDef to METH_NOARGS. */ 
+#define PyArg_NoArgs(v)		PyArg_Parse(v, "") 
+ 
+/* Argument must be a char or an int in [-128, 127] or [0, 255]. */ 
+#define Py_CHARMASK(c)		((unsigned char)((c) & 0xff)) 
+ 
+#include "pyfpe.h" 
+ 
+/* These definitions must match corresponding definitions in graminit.h. 
+   There's code in compile.c that checks that they are the same. */ 
+#define Py_single_input 256 
+#define Py_file_input 257 
+#define Py_eval_input 258 
+ 
+#ifdef HAVE_PTH 
+/* GNU pth user-space thread support */ 
+#include <pth.h> 
+#endif 
+ 
+/* Define macros for inline documentation. */ 
+#define PyDoc_VAR(name) static char name[] 
+#define PyDoc_STRVAR(name,str) PyDoc_VAR(name) = PyDoc_STR(str) 
+#ifdef WITH_DOC_STRINGS 
+#define PyDoc_STR(str) str 
+#else 
+#define PyDoc_STR(str) "" 
+#endif 
+ 
+#endif /* !Py_PYTHON_H */ 
diff --git a/contrib/tools/python/src/Include/abstract.h b/contrib/tools/python/src/Include/abstract.h
index 7818e45304..63540b4217 100644
--- a/contrib/tools/python/src/Include/abstract.h
+++ b/contrib/tools/python/src/Include/abstract.h
@@ -1,1396 +1,1396 @@
-#ifndef Py_ABSTRACTOBJECT_H
-#define Py_ABSTRACTOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef PY_SSIZE_T_CLEAN
-#define PyObject_CallFunction _PyObject_CallFunction_SizeT
-#define PyObject_CallMethod _PyObject_CallMethod_SizeT
-#endif
-
-/* Abstract Object Interface (many thanks to Jim Fulton) */
-
-/*
-   PROPOSAL: A Generic Python Object Interface for Python C Modules
-
-Problem
-
-  Python modules written in C that must access Python objects must do
-  so through routines whose interfaces are described by a set of
-  include files.  Unfortunately, these routines vary according to the
-  object accessed.  To use these routines, the C programmer must check
-  the type of the object being used and must call a routine based on
-  the object type.  For example, to access an element of a sequence,
-  the programmer must determine whether the sequence is a list or a
-  tuple:
-
-    if(is_tupleobject(o))
-      e=gettupleitem(o,i)
-    else if(is_listitem(o))
-      e=getlistitem(o,i)
-
-  If the programmer wants to get an item from another type of object
-  that provides sequence behavior, there is no clear way to do it
-  correctly.
-
-  The persistent programmer may peruse object.h and find that the
-  _typeobject structure provides a means of invoking up to (currently
-  about) 41 special operators.  So, for example, a routine can get an
-  item from any object that provides sequence behavior. However, to
-  use this mechanism, the programmer must make their code dependent on
-  the current Python implementation.
-
-  Also, certain semantics, especially memory management semantics, may
-  differ by the type of object being used.  Unfortunately, these
-  semantics are not clearly described in the current include files.
-  An abstract interface providing more consistent semantics is needed.
-
-Proposal
-
-  I propose the creation of a standard interface (with an associated
-  library of routines and/or macros) for generically obtaining the
-  services of Python objects.  This proposal can be viewed as one
-  components of a Python C interface consisting of several components.
-
-  From the viewpoint of C access to Python services, we have (as
-  suggested by Guido in off-line discussions):
-
-  - "Very high level layer": two or three functions that let you exec or
-    eval arbitrary Python code given as a string in a module whose name is
-    given, passing C values in and getting C values out using
-    mkvalue/getargs style format strings.  This does not require the user
-    to declare any variables of type "PyObject *".  This should be enough
-    to write a simple application that gets Python code from the user,
-    execs it, and returns the output or errors.  (Error handling must also
-    be part of this API.)
-
-  - "Abstract objects layer": which is the subject of this proposal.
-    It has many functions operating on objects, and lest you do many
-    things from C that you can also write in Python, without going
-    through the Python parser.
-
-  - "Concrete objects layer": This is the public type-dependent
-    interface provided by the standard built-in types, such as floats,
-    strings, and lists.  This interface exists and is currently
-    documented by the collection of include files provided with the
-    Python distributions.
-
-  From the point of view of Python accessing services provided by C
-  modules:
-
-  - "Python module interface": this interface consist of the basic
-    routines used to define modules and their members.  Most of the
-    current extensions-writing guide deals with this interface.
-
-  - "Built-in object interface": this is the interface that a new
-    built-in type must provide and the mechanisms and rules that a
-    developer of a new built-in type must use and follow.
-
-  This proposal is a "first-cut" that is intended to spur
-  discussion. See especially the lists of notes.
-
-  The Python C object interface will provide four protocols: object,
-  numeric, sequence, and mapping.  Each protocol consists of a
-  collection of related operations.  If an operation that is not
-  provided by a particular type is invoked, then a standard exception,
+#ifndef Py_ABSTRACTOBJECT_H 
+#define Py_ABSTRACTOBJECT_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+#ifdef PY_SSIZE_T_CLEAN 
+#define PyObject_CallFunction _PyObject_CallFunction_SizeT 
+#define PyObject_CallMethod _PyObject_CallMethod_SizeT 
+#endif 
+ 
+/* Abstract Object Interface (many thanks to Jim Fulton) */ 
+ 
+/* 
+   PROPOSAL: A Generic Python Object Interface for Python C Modules 
+ 
+Problem 
+ 
+  Python modules written in C that must access Python objects must do 
+  so through routines whose interfaces are described by a set of 
+  include files.  Unfortunately, these routines vary according to the 
+  object accessed.  To use these routines, the C programmer must check 
+  the type of the object being used and must call a routine based on 
+  the object type.  For example, to access an element of a sequence, 
+  the programmer must determine whether the sequence is a list or a 
+  tuple: 
+ 
+    if(is_tupleobject(o)) 
+      e=gettupleitem(o,i) 
+    else if(is_listitem(o)) 
+      e=getlistitem(o,i) 
+ 
+  If the programmer wants to get an item from another type of object 
+  that provides sequence behavior, there is no clear way to do it 
+  correctly. 
+ 
+  The persistent programmer may peruse object.h and find that the 
+  _typeobject structure provides a means of invoking up to (currently 
+  about) 41 special operators.  So, for example, a routine can get an 
+  item from any object that provides sequence behavior. However, to 
+  use this mechanism, the programmer must make their code dependent on 
+  the current Python implementation. 
+ 
+  Also, certain semantics, especially memory management semantics, may 
+  differ by the type of object being used.  Unfortunately, these 
+  semantics are not clearly described in the current include files. 
+  An abstract interface providing more consistent semantics is needed. 
+ 
+Proposal 
+ 
+  I propose the creation of a standard interface (with an associated 
+  library of routines and/or macros) for generically obtaining the 
+  services of Python objects.  This proposal can be viewed as one 
+  components of a Python C interface consisting of several components. 
+ 
+  From the viewpoint of C access to Python services, we have (as 
+  suggested by Guido in off-line discussions): 
+ 
+  - "Very high level layer": two or three functions that let you exec or 
+    eval arbitrary Python code given as a string in a module whose name is 
+    given, passing C values in and getting C values out using 
+    mkvalue/getargs style format strings.  This does not require the user 
+    to declare any variables of type "PyObject *".  This should be enough 
+    to write a simple application that gets Python code from the user, 
+    execs it, and returns the output or errors.  (Error handling must also 
+    be part of this API.) 
+ 
+  - "Abstract objects layer": which is the subject of this proposal. 
+    It has many functions operating on objects, and lest you do many 
+    things from C that you can also write in Python, without going 
+    through the Python parser. 
+ 
+  - "Concrete objects layer": This is the public type-dependent 
+    interface provided by the standard built-in types, such as floats, 
+    strings, and lists.  This interface exists and is currently 
+    documented by the collection of include files provided with the 
+    Python distributions. 
+ 
+  From the point of view of Python accessing services provided by C 
+  modules: 
+ 
+  - "Python module interface": this interface consist of the basic 
+    routines used to define modules and their members.  Most of the 
+    current extensions-writing guide deals with this interface. 
+ 
+  - "Built-in object interface": this is the interface that a new 
+    built-in type must provide and the mechanisms and rules that a 
+    developer of a new built-in type must use and follow. 
+ 
+  This proposal is a "first-cut" that is intended to spur 
+  discussion. See especially the lists of notes. 
+ 
+  The Python C object interface will provide four protocols: object, 
+  numeric, sequence, and mapping.  Each protocol consists of a 
+  collection of related operations.  If an operation that is not 
+  provided by a particular type is invoked, then a standard exception, 
   NotImplementedError is raised with an operation name as an argument.
-  In addition, for convenience this interface defines a set of
-  constructors for building objects of built-in types.  This is needed
-  so new objects can be returned from C functions that otherwise treat
-  objects generically.
-
-Memory Management
-
-  For all of the functions described in this proposal, if a function
-  retains a reference to a Python object passed as an argument, then the
-  function will increase the reference count of the object.  It is
-  unnecessary for the caller to increase the reference count of an
-  argument in anticipation of the object's retention.
-
-  All Python objects returned from functions should be treated as new
-  objects.  Functions that return objects assume that the caller will
-  retain a reference and the reference count of the object has already
-  been incremented to account for this fact.  A caller that does not
-  retain a reference to an object that is returned from a function
-  must decrement the reference count of the object (using
-  DECREF(object)) to prevent memory leaks.
-
-  Note that the behavior mentioned here is different from the current
-  behavior for some objects (e.g. lists and tuples) when certain
-  type-specific routines are called directly (e.g. setlistitem).  The
-  proposed abstraction layer will provide a consistent memory
-  management interface, correcting for inconsistent behavior for some
-  built-in types.
-
-Protocols
-
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/
-
-/*  Object Protocol: */
-
-     /* Implemented elsewhere:
-
-     int PyObject_Print(PyObject *o, FILE *fp, int flags);
-
-     Print an object, o, on file, fp.  Returns -1 on
-     error.  The flags argument is used to enable certain printing
-     options. The only option currently supported is Py_Print_RAW.
-
-     (What should be said about Py_Print_RAW?)
-
-       */
-
-     /* Implemented elsewhere:
-
-     int PyObject_HasAttrString(PyObject *o, char *attr_name);
-
-     Returns 1 if o has the attribute attr_name, and 0 otherwise.
-     This is equivalent to the Python expression:
-     hasattr(o,attr_name).
-
-     This function always succeeds.
-
-       */
-
-     /* Implemented elsewhere:
-
-     PyObject* PyObject_GetAttrString(PyObject *o, char *attr_name);
-
-     Retrieve an attributed named attr_name form object o.
-     Returns the attribute value on success, or NULL on failure.
-     This is the equivalent of the Python expression: o.attr_name.
-
-       */
-
-     /* Implemented elsewhere:
-
-     int PyObject_HasAttr(PyObject *o, PyObject *attr_name);
-
-     Returns 1 if o has the attribute attr_name, and 0 otherwise.
-     This is equivalent to the Python expression:
-     hasattr(o,attr_name).
-
-     This function always succeeds.
-
-       */
-
-     /* Implemented elsewhere:
-
-     PyObject* PyObject_GetAttr(PyObject *o, PyObject *attr_name);
-
-     Retrieve an attributed named attr_name form object o.
-     Returns the attribute value on success, or NULL on failure.
-     This is the equivalent of the Python expression: o.attr_name.
-
-       */
-
-
-     /* Implemented elsewhere:
-
-     int PyObject_SetAttrString(PyObject *o, char *attr_name, PyObject *v);
-
-     Set the value of the attribute named attr_name, for object o,
+  In addition, for convenience this interface defines a set of 
+  constructors for building objects of built-in types.  This is needed 
+  so new objects can be returned from C functions that otherwise treat 
+  objects generically. 
+ 
+Memory Management 
+ 
+  For all of the functions described in this proposal, if a function 
+  retains a reference to a Python object passed as an argument, then the 
+  function will increase the reference count of the object.  It is 
+  unnecessary for the caller to increase the reference count of an 
+  argument in anticipation of the object's retention. 
+ 
+  All Python objects returned from functions should be treated as new 
+  objects.  Functions that return objects assume that the caller will 
+  retain a reference and the reference count of the object has already 
+  been incremented to account for this fact.  A caller that does not 
+  retain a reference to an object that is returned from a function 
+  must decrement the reference count of the object (using 
+  DECREF(object)) to prevent memory leaks. 
+ 
+  Note that the behavior mentioned here is different from the current 
+  behavior for some objects (e.g. lists and tuples) when certain 
+  type-specific routines are called directly (e.g. setlistitem).  The 
+  proposed abstraction layer will provide a consistent memory 
+  management interface, correcting for inconsistent behavior for some 
+  built-in types. 
+ 
+Protocols 
+ 
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/ 
+ 
+/*  Object Protocol: */ 
+ 
+     /* Implemented elsewhere: 
+ 
+     int PyObject_Print(PyObject *o, FILE *fp, int flags); 
+ 
+     Print an object, o, on file, fp.  Returns -1 on 
+     error.  The flags argument is used to enable certain printing 
+     options. The only option currently supported is Py_Print_RAW. 
+ 
+     (What should be said about Py_Print_RAW?) 
+ 
+       */ 
+ 
+     /* Implemented elsewhere: 
+ 
+     int PyObject_HasAttrString(PyObject *o, char *attr_name); 
+ 
+     Returns 1 if o has the attribute attr_name, and 0 otherwise. 
+     This is equivalent to the Python expression: 
+     hasattr(o,attr_name). 
+ 
+     This function always succeeds. 
+ 
+       */ 
+ 
+     /* Implemented elsewhere: 
+ 
+     PyObject* PyObject_GetAttrString(PyObject *o, char *attr_name); 
+ 
+     Retrieve an attributed named attr_name form object o. 
+     Returns the attribute value on success, or NULL on failure. 
+     This is the equivalent of the Python expression: o.attr_name. 
+ 
+       */ 
+ 
+     /* Implemented elsewhere: 
+ 
+     int PyObject_HasAttr(PyObject *o, PyObject *attr_name); 
+ 
+     Returns 1 if o has the attribute attr_name, and 0 otherwise. 
+     This is equivalent to the Python expression: 
+     hasattr(o,attr_name). 
+ 
+     This function always succeeds. 
+ 
+       */ 
+ 
+     /* Implemented elsewhere: 
+ 
+     PyObject* PyObject_GetAttr(PyObject *o, PyObject *attr_name); 
+ 
+     Retrieve an attributed named attr_name form object o. 
+     Returns the attribute value on success, or NULL on failure. 
+     This is the equivalent of the Python expression: o.attr_name. 
+ 
+       */ 
+ 
+ 
+     /* Implemented elsewhere: 
+ 
+     int PyObject_SetAttrString(PyObject *o, char *attr_name, PyObject *v); 
+ 
+     Set the value of the attribute named attr_name, for object o, 
      to the value v. Raise an exception and return -1 on failure; return 0 on
      success.  This is the equivalent of the Python statement o.attr_name=v.
-
-       */
-
-     /* Implemented elsewhere:
-
-     int PyObject_SetAttr(PyObject *o, PyObject *attr_name, PyObject *v);
-
-     Set the value of the attribute named attr_name, for object o,
+ 
+       */ 
+ 
+     /* Implemented elsewhere: 
+ 
+     int PyObject_SetAttr(PyObject *o, PyObject *attr_name, PyObject *v); 
+ 
+     Set the value of the attribute named attr_name, for object o, 
      to the value v. Raise an exception and return -1 on failure; return 0 on
      success.  This is the equivalent of the Python statement o.attr_name=v.
-
-       */
-
-     /* implemented as a macro:
-
-     int PyObject_DelAttrString(PyObject *o, char *attr_name);
-
-     Delete attribute named attr_name, for object o. Returns
-     -1 on failure.  This is the equivalent of the Python
-     statement: del o.attr_name.
-
-       */
-#define  PyObject_DelAttrString(O,A) PyObject_SetAttrString((O),(A),NULL)
-
-     /* implemented as a macro:
-
-     int PyObject_DelAttr(PyObject *o, PyObject *attr_name);
-
-     Delete attribute named attr_name, for object o. Returns -1
-     on failure.  This is the equivalent of the Python
-     statement: del o.attr_name.
-
-       */
-#define  PyObject_DelAttr(O,A) PyObject_SetAttr((O),(A),NULL)
-
-     PyAPI_FUNC(int) PyObject_Cmp(PyObject *o1, PyObject *o2, int *result);
-
-       /*
-     Compare the values of o1 and o2 using a routine provided by
-     o1, if one exists, otherwise with a routine provided by o2.
-     The result of the comparison is returned in result.  Returns
-     -1 on failure.  This is the equivalent of the Python
-     statement: result=cmp(o1,o2).
-
-       */
-
-     /* Implemented elsewhere:
-
-     int PyObject_Compare(PyObject *o1, PyObject *o2);
-
-     Compare the values of o1 and o2 using a routine provided by
-     o1, if one exists, otherwise with a routine provided by o2.
-     Returns the result of the comparison on success.  On error,
-     the value returned is undefined. This is equivalent to the
-     Python expression: cmp(o1,o2).
-
-       */
-
-     /* Implemented elsewhere:
-
-     PyObject *PyObject_Repr(PyObject *o);
-
-     Compute the string representation of object, o.  Returns the
-     string representation on success, NULL on failure.  This is
-     the equivalent of the Python expression: repr(o).
-
-     Called by the repr() built-in function and by reverse quotes.
-
-       */
-
-     /* Implemented elsewhere:
-
-     PyObject *PyObject_Str(PyObject *o);
-
-     Compute the string representation of object, o.  Returns the
-     string representation on success, NULL on failure.  This is
-     the equivalent of the Python expression: str(o).)
-
-     Called by the str() built-in function and by the print
-     statement.
-
-       */
-
-     /* Implemented elsewhere:
-
-     PyObject *PyObject_Unicode(PyObject *o);
-
-     Compute the unicode representation of object, o.  Returns the
-     unicode representation on success, NULL on failure.  This is
-     the equivalent of the Python expression: unistr(o).)
-
-     Called by the unistr() built-in function.
-
-       */
-
-       /* Declared elsewhere
-
-     PyAPI_FUNC(int) PyCallable_Check(PyObject *o);
-
-     Determine if the object, o, is callable.  Return 1 if the
-     object is callable and 0 otherwise.
-
-     This function always succeeds.
-
-       */
-
-
-
-     PyAPI_FUNC(PyObject *) PyObject_Call(PyObject *callable_object,
-                                         PyObject *args, PyObject *kw);
-
-       /*
-     Call a callable Python object, callable_object, with
-     arguments and keywords arguments.  The 'args' argument can not be
-     NULL, but the 'kw' argument can be NULL.
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyObject_CallObject(PyObject *callable_object,
-                                               PyObject *args);
-
-       /*
-     Call a callable Python object, callable_object, with
-     arguments given by the tuple, args.  If no arguments are
-     needed, then args may be NULL.  Returns the result of the
-     call on success, or NULL on failure.  This is the equivalent
-     of the Python expression: apply(o,args).
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyObject_CallFunction(PyObject *callable_object,
+ 
+       */ 
+ 
+     /* implemented as a macro: 
+ 
+     int PyObject_DelAttrString(PyObject *o, char *attr_name); 
+ 
+     Delete attribute named attr_name, for object o. Returns 
+     -1 on failure.  This is the equivalent of the Python 
+     statement: del o.attr_name. 
+ 
+       */ 
+#define  PyObject_DelAttrString(O,A) PyObject_SetAttrString((O),(A),NULL) 
+ 
+     /* implemented as a macro: 
+ 
+     int PyObject_DelAttr(PyObject *o, PyObject *attr_name); 
+ 
+     Delete attribute named attr_name, for object o. Returns -1 
+     on failure.  This is the equivalent of the Python 
+     statement: del o.attr_name. 
+ 
+       */ 
+#define  PyObject_DelAttr(O,A) PyObject_SetAttr((O),(A),NULL) 
+ 
+     PyAPI_FUNC(int) PyObject_Cmp(PyObject *o1, PyObject *o2, int *result); 
+ 
+       /* 
+     Compare the values of o1 and o2 using a routine provided by 
+     o1, if one exists, otherwise with a routine provided by o2. 
+     The result of the comparison is returned in result.  Returns 
+     -1 on failure.  This is the equivalent of the Python 
+     statement: result=cmp(o1,o2). 
+ 
+       */ 
+ 
+     /* Implemented elsewhere: 
+ 
+     int PyObject_Compare(PyObject *o1, PyObject *o2); 
+ 
+     Compare the values of o1 and o2 using a routine provided by 
+     o1, if one exists, otherwise with a routine provided by o2. 
+     Returns the result of the comparison on success.  On error, 
+     the value returned is undefined. This is equivalent to the 
+     Python expression: cmp(o1,o2). 
+ 
+       */ 
+ 
+     /* Implemented elsewhere: 
+ 
+     PyObject *PyObject_Repr(PyObject *o); 
+ 
+     Compute the string representation of object, o.  Returns the 
+     string representation on success, NULL on failure.  This is 
+     the equivalent of the Python expression: repr(o). 
+ 
+     Called by the repr() built-in function and by reverse quotes. 
+ 
+       */ 
+ 
+     /* Implemented elsewhere: 
+ 
+     PyObject *PyObject_Str(PyObject *o); 
+ 
+     Compute the string representation of object, o.  Returns the 
+     string representation on success, NULL on failure.  This is 
+     the equivalent of the Python expression: str(o).) 
+ 
+     Called by the str() built-in function and by the print 
+     statement. 
+ 
+       */ 
+ 
+     /* Implemented elsewhere: 
+ 
+     PyObject *PyObject_Unicode(PyObject *o); 
+ 
+     Compute the unicode representation of object, o.  Returns the 
+     unicode representation on success, NULL on failure.  This is 
+     the equivalent of the Python expression: unistr(o).) 
+ 
+     Called by the unistr() built-in function. 
+ 
+       */ 
+ 
+       /* Declared elsewhere 
+ 
+     PyAPI_FUNC(int) PyCallable_Check(PyObject *o); 
+ 
+     Determine if the object, o, is callable.  Return 1 if the 
+     object is callable and 0 otherwise. 
+ 
+     This function always succeeds. 
+ 
+       */ 
+ 
+ 
+ 
+     PyAPI_FUNC(PyObject *) PyObject_Call(PyObject *callable_object, 
+                                         PyObject *args, PyObject *kw); 
+ 
+       /* 
+     Call a callable Python object, callable_object, with 
+     arguments and keywords arguments.  The 'args' argument can not be 
+     NULL, but the 'kw' argument can be NULL. 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyObject_CallObject(PyObject *callable_object, 
+                                               PyObject *args); 
+ 
+       /* 
+     Call a callable Python object, callable_object, with 
+     arguments given by the tuple, args.  If no arguments are 
+     needed, then args may be NULL.  Returns the result of the 
+     call on success, or NULL on failure.  This is the equivalent 
+     of the Python expression: apply(o,args). 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyObject_CallFunction(PyObject *callable_object, 
                                                  const char *format, ...);
-
-       /*
-     Call a callable Python object, callable_object, with a
-     variable number of C arguments. The C arguments are described
-     using a mkvalue-style format string. The format may be NULL,
-     indicating that no arguments are provided.  Returns the
-     result of the call on success, or NULL on failure.  This is
-     the equivalent of the Python expression: apply(o,args).
-
-       */
-
-
+ 
+       /* 
+     Call a callable Python object, callable_object, with a 
+     variable number of C arguments. The C arguments are described 
+     using a mkvalue-style format string. The format may be NULL, 
+     indicating that no arguments are provided.  Returns the 
+     result of the call on success, or NULL on failure.  This is 
+     the equivalent of the Python expression: apply(o,args). 
+ 
+       */ 
+ 
+ 
      PyAPI_FUNC(PyObject *) PyObject_CallMethod(PyObject *o, const char *m,
                                                const char *format, ...);
-
-       /*
-     Call the method named m of object o with a variable number of
-     C arguments.  The C arguments are described by a mkvalue
-     format string.  The format may be NULL, indicating that no
-     arguments are provided. Returns the result of the call on
-     success, or NULL on failure.  This is the equivalent of the
-     Python expression: o.method(args).
-       */
-
-     PyAPI_FUNC(PyObject *) _PyObject_CallFunction_SizeT(PyObject *callable,
+ 
+       /* 
+     Call the method named m of object o with a variable number of 
+     C arguments.  The C arguments are described by a mkvalue 
+     format string.  The format may be NULL, indicating that no 
+     arguments are provided. Returns the result of the call on 
+     success, or NULL on failure.  This is the equivalent of the 
+     Python expression: o.method(args). 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) _PyObject_CallFunction_SizeT(PyObject *callable, 
                                                          const char *format, ...);
-     PyAPI_FUNC(PyObject *) _PyObject_CallMethod_SizeT(PyObject *o,
+     PyAPI_FUNC(PyObject *) _PyObject_CallMethod_SizeT(PyObject *o, 
                                                        const char *name,
                                                        const char *format, ...);
-
-     PyAPI_FUNC(PyObject *) PyObject_CallFunctionObjArgs(PyObject *callable,
-                                                        ...);
-
-       /*
-     Call a callable Python object, callable_object, with a
-     variable number of C arguments.  The C arguments are provided
-     as PyObject * values, terminated by a NULL.  Returns the
-     result of the call on success, or NULL on failure.  This is
-     the equivalent of the Python expression: apply(o,args).
-       */
-
-
-     PyAPI_FUNC(PyObject *) PyObject_CallMethodObjArgs(PyObject *o,
-                                                      PyObject *m, ...);
-
-       /*
-     Call the method named m of object o with a variable number of
-     C arguments.  The C arguments are provided as PyObject *
-     values, terminated by NULL.  Returns the result of the call
-     on success, or NULL on failure.  This is the equivalent of
-     the Python expression: o.method(args).
-       */
-
-
-     /* Implemented elsewhere:
-
-     long PyObject_Hash(PyObject *o);
-
-     Compute and return the hash, hash_value, of an object, o.  On
-     failure, return -1.  This is the equivalent of the Python
-     expression: hash(o).
-
-       */
-
-
-     /* Implemented elsewhere:
-
-     int PyObject_IsTrue(PyObject *o);
-
-     Returns 1 if the object, o, is considered to be true, 0 if o is
-     considered to be false and -1 on failure. This is equivalent to the
-     Python expression: not not o
-
-       */
-
-     /* Implemented elsewhere:
-
-     int PyObject_Not(PyObject *o);
-
-     Returns 0 if the object, o, is considered to be true, 1 if o is
-     considered to be false and -1 on failure. This is equivalent to the
-     Python expression: not o
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyObject_Type(PyObject *o);
-
-       /*
-     On success, returns a type object corresponding to the object
-     type of object o. On failure, returns NULL.  This is
-     equivalent to the Python expression: type(o).
-       */
-
-     PyAPI_FUNC(Py_ssize_t) PyObject_Size(PyObject *o);
-
-       /*
-     Return the size of object o.  If the object, o, provides
-     both sequence and mapping protocols, the sequence size is
-     returned. On error, -1 is returned.  This is the equivalent
-     to the Python expression: len(o).
-
-       */
-
-       /* For DLL compatibility */
-#undef PyObject_Length
-     PyAPI_FUNC(Py_ssize_t) PyObject_Length(PyObject *o);
-#define PyObject_Length PyObject_Size
-
-     PyAPI_FUNC(Py_ssize_t) _PyObject_LengthHint(PyObject *o, Py_ssize_t);
-
-       /*
-     Guess the size of object o using len(o) or o.__length_hint__().
-     If neither of those return a non-negative value, then return the
-     default value.  If one of the calls fails, this function returns -1.
-       */
-
-     PyAPI_FUNC(PyObject *) PyObject_GetItem(PyObject *o, PyObject *key);
-
-       /*
-     Return element of o corresponding to the object, key, or NULL
-     on failure. This is the equivalent of the Python expression:
-     o[key].
-
-       */
-
-     PyAPI_FUNC(int) PyObject_SetItem(PyObject *o, PyObject *key, PyObject *v);
-
-       /*
+ 
+     PyAPI_FUNC(PyObject *) PyObject_CallFunctionObjArgs(PyObject *callable, 
+                                                        ...); 
+ 
+       /* 
+     Call a callable Python object, callable_object, with a 
+     variable number of C arguments.  The C arguments are provided 
+     as PyObject * values, terminated by a NULL.  Returns the 
+     result of the call on success, or NULL on failure.  This is 
+     the equivalent of the Python expression: apply(o,args). 
+       */ 
+ 
+ 
+     PyAPI_FUNC(PyObject *) PyObject_CallMethodObjArgs(PyObject *o, 
+                                                      PyObject *m, ...); 
+ 
+       /* 
+     Call the method named m of object o with a variable number of 
+     C arguments.  The C arguments are provided as PyObject * 
+     values, terminated by NULL.  Returns the result of the call 
+     on success, or NULL on failure.  This is the equivalent of 
+     the Python expression: o.method(args). 
+       */ 
+ 
+ 
+     /* Implemented elsewhere: 
+ 
+     long PyObject_Hash(PyObject *o); 
+ 
+     Compute and return the hash, hash_value, of an object, o.  On 
+     failure, return -1.  This is the equivalent of the Python 
+     expression: hash(o). 
+ 
+       */ 
+ 
+ 
+     /* Implemented elsewhere: 
+ 
+     int PyObject_IsTrue(PyObject *o); 
+ 
+     Returns 1 if the object, o, is considered to be true, 0 if o is 
+     considered to be false and -1 on failure. This is equivalent to the 
+     Python expression: not not o 
+ 
+       */ 
+ 
+     /* Implemented elsewhere: 
+ 
+     int PyObject_Not(PyObject *o); 
+ 
+     Returns 0 if the object, o, is considered to be true, 1 if o is 
+     considered to be false and -1 on failure. This is equivalent to the 
+     Python expression: not o 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyObject_Type(PyObject *o); 
+ 
+       /* 
+     On success, returns a type object corresponding to the object 
+     type of object o. On failure, returns NULL.  This is 
+     equivalent to the Python expression: type(o). 
+       */ 
+ 
+     PyAPI_FUNC(Py_ssize_t) PyObject_Size(PyObject *o); 
+ 
+       /* 
+     Return the size of object o.  If the object, o, provides 
+     both sequence and mapping protocols, the sequence size is 
+     returned. On error, -1 is returned.  This is the equivalent 
+     to the Python expression: len(o). 
+ 
+       */ 
+ 
+       /* For DLL compatibility */ 
+#undef PyObject_Length 
+     PyAPI_FUNC(Py_ssize_t) PyObject_Length(PyObject *o); 
+#define PyObject_Length PyObject_Size 
+ 
+     PyAPI_FUNC(Py_ssize_t) _PyObject_LengthHint(PyObject *o, Py_ssize_t); 
+ 
+       /* 
+     Guess the size of object o using len(o) or o.__length_hint__(). 
+     If neither of those return a non-negative value, then return the 
+     default value.  If one of the calls fails, this function returns -1. 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyObject_GetItem(PyObject *o, PyObject *key); 
+ 
+       /* 
+     Return element of o corresponding to the object, key, or NULL 
+     on failure. This is the equivalent of the Python expression: 
+     o[key]. 
+ 
+       */ 
+ 
+     PyAPI_FUNC(int) PyObject_SetItem(PyObject *o, PyObject *key, PyObject *v); 
+ 
+       /* 
      Map the object key to the value v.  Raise an exception and return -1
      on failure; return 0 on success.  This is the equivalent of the Python
      statement o[key]=v.
-       */
-
-     PyAPI_FUNC(int) PyObject_DelItemString(PyObject *o, char *key);
-
-       /*
-     Remove the mapping for object, key, from the object *o.
-     Returns -1 on failure.  This is equivalent to
-     the Python statement: del o[key].
-       */
-
-     PyAPI_FUNC(int) PyObject_DelItem(PyObject *o, PyObject *key);
-
-       /*
-     Delete the mapping for key from *o.  Returns -1 on failure.
-     This is the equivalent of the Python statement: del o[key].
-       */
-
-     PyAPI_FUNC(int) PyObject_AsCharBuffer(PyObject *obj,
-                                          const char **buffer,
-                                          Py_ssize_t *buffer_len);
-
-       /*
-      Takes an arbitrary object which must support the (character,
-      single segment) buffer interface and returns a pointer to a
-      read-only memory location useable as character based input
-      for subsequent processing.
-
-      0 is returned on success.  buffer and buffer_len are only
-      set in case no error occurs. Otherwise, -1 is returned and
-      an exception set.
-
-       */
-
-     PyAPI_FUNC(int) PyObject_CheckReadBuffer(PyObject *obj);
-
-      /*
-      Checks whether an arbitrary object supports the (character,
-      single segment) buffer interface.  Returns 1 on success, 0
-      on failure.
-
-      */
-
-     PyAPI_FUNC(int) PyObject_AsReadBuffer(PyObject *obj,
-                                          const void **buffer,
-                                          Py_ssize_t *buffer_len);
-
-       /*
-      Same as PyObject_AsCharBuffer() except that this API expects
-      (readable, single segment) buffer interface and returns a
-      pointer to a read-only memory location which can contain
-      arbitrary data.
-
-      0 is returned on success.  buffer and buffer_len are only
-      set in case no error occurs.  Otherwise, -1 is returned and
-      an exception set.
-
-       */
-
-     PyAPI_FUNC(int) PyObject_AsWriteBuffer(PyObject *obj,
-                                           void **buffer,
-                                           Py_ssize_t *buffer_len);
-
-       /*
-      Takes an arbitrary object which must support the (writeable,
-      single segment) buffer interface and returns a pointer to a
-      writeable memory location in buffer of size buffer_len.
-
-      0 is returned on success.  buffer and buffer_len are only
-      set in case no error occurs. Otherwise, -1 is returned and
-      an exception set.
-
-       */
-
-    /* new buffer API */
-
-#define PyObject_CheckBuffer(obj) \
-    (((obj)->ob_type->tp_as_buffer != NULL) &&                          \
-     (PyType_HasFeature((obj)->ob_type, Py_TPFLAGS_HAVE_NEWBUFFER)) && \
-     ((obj)->ob_type->tp_as_buffer->bf_getbuffer != NULL))
-
-    /* Return 1 if the getbuffer function is available, otherwise
-       return 0 */
-
-     PyAPI_FUNC(int) PyObject_GetBuffer(PyObject *obj, Py_buffer *view,
-                                        int flags);
-
-    /* This is a C-API version of the getbuffer function call.  It checks
-       to make sure object has the required function pointer and issues the
-       call.  Returns -1 and raises an error on failure and returns 0 on
-       success
-    */
-
-
-     PyAPI_FUNC(void *) PyBuffer_GetPointer(Py_buffer *view, Py_ssize_t *indices);
-
-    /* Get the memory area pointed to by the indices for the buffer given.
-       Note that view->ndim is the assumed size of indices
-    */
-
-     PyAPI_FUNC(int) PyBuffer_SizeFromFormat(const char *);
-
-    /* Return the implied itemsize of the data-format area from a
-       struct-style description */
-
-
-
-     PyAPI_FUNC(int) PyBuffer_ToContiguous(void *buf, Py_buffer *view,
-                                           Py_ssize_t len, char fort);
-
-     PyAPI_FUNC(int) PyBuffer_FromContiguous(Py_buffer *view, void *buf,
-                                             Py_ssize_t len, char fort);
-
-
-    /* Copy len bytes of data from the contiguous chunk of memory
-       pointed to by buf into the buffer exported by obj.  Return
-       0 on success and return -1 and raise a PyBuffer_Error on
-       error (i.e. the object does not have a buffer interface or
-       it is not working).
-
-       If fort is 'F' and the object is multi-dimensional,
-       then the data will be copied into the array in
-       Fortran-style (first dimension varies the fastest).  If
-       fort is 'C', then the data will be copied into the array
-       in C-style (last dimension varies the fastest).  If fort
-       is 'A', then it does not matter and the copy will be made
-       in whatever way is more efficient.
-
-    */
-
-     PyAPI_FUNC(int) PyObject_CopyData(PyObject *dest, PyObject *src);
-
-    /* Copy the data from the src buffer to the buffer of destination
-     */
-
-     PyAPI_FUNC(int) PyBuffer_IsContiguous(Py_buffer *view, char fort);
-
-
-     PyAPI_FUNC(void) PyBuffer_FillContiguousStrides(int ndims,
-                                                    Py_ssize_t *shape,
-                                                    Py_ssize_t *strides,
-                                                    int itemsize,
-                                                    char fort);
-
-    /*  Fill the strides array with byte-strides of a contiguous
-        (Fortran-style if fort is 'F' or C-style otherwise)
-        array of the given shape with the given number of bytes
-        per element.
-    */
-
-     PyAPI_FUNC(int) PyBuffer_FillInfo(Py_buffer *view, PyObject *o, void *buf,
-                                       Py_ssize_t len, int readonly,
-                                       int flags);
-
-    /* Fills in a buffer-info structure correctly for an exporter
-       that can only share a contiguous chunk of memory of
-       "unsigned bytes" of the given length. Returns 0 on success
-       and -1 (with raising an error) on error.
-     */
-
-     PyAPI_FUNC(void) PyBuffer_Release(Py_buffer *view);
-
-       /* Releases a Py_buffer obtained from getbuffer ParseTuple's s*.
-    */
-
-     PyAPI_FUNC(PyObject *) PyObject_Format(PyObject* obj,
-                                            PyObject *format_spec);
-       /*
-     Takes an arbitrary object and returns the result of
-     calling obj.__format__(format_spec).
-       */
-
-/* Iterators */
-
-     PyAPI_FUNC(PyObject *) PyObject_GetIter(PyObject *);
-     /* Takes an object and returns an iterator for it.
-    This is typically a new iterator but if the argument
-    is an iterator, this returns itself. */
-
-#define PyIter_Check(obj) \
-    (PyType_HasFeature((obj)->ob_type, Py_TPFLAGS_HAVE_ITER) && \
-     (obj)->ob_type->tp_iternext != NULL && \
-     (obj)->ob_type->tp_iternext != &_PyObject_NextNotImplemented)
-
-     PyAPI_FUNC(PyObject *) PyIter_Next(PyObject *);
-     /* Takes an iterator object and calls its tp_iternext slot,
-    returning the next value.  If the iterator is exhausted,
-    this returns NULL without setting an exception.
-    NULL with an exception means an error occurred. */
-
-/*  Number Protocol:*/
-
-     PyAPI_FUNC(int) PyNumber_Check(PyObject *o);
-
-       /*
-     Returns 1 if the object, o, provides numeric protocols, and
-     false otherwise.
-
-     This function always succeeds.
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Add(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of adding o1 and o2, or null on failure.
-     This is the equivalent of the Python expression: o1+o2.
-
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Subtract(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of subtracting o2 from o1, or null on
-     failure.  This is the equivalent of the Python expression:
-     o1-o2.
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Multiply(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of multiplying o1 and o2, or null on
-     failure.  This is the equivalent of the Python expression:
-     o1*o2.
-
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Divide(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of dividing o1 by o2, or null on failure.
-     This is the equivalent of the Python expression: o1/o2.
-
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_FloorDivide(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of dividing o1 by o2 giving an integral result,
-     or null on failure.
-     This is the equivalent of the Python expression: o1//o2.
-
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_TrueDivide(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of dividing o1 by o2 giving a float result,
-     or null on failure.
-     This is the equivalent of the Python expression: o1/o2.
-
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Remainder(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the remainder of dividing o1 by o2, or null on
-     failure.  This is the equivalent of the Python expression:
-     o1%o2.
-
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Divmod(PyObject *o1, PyObject *o2);
-
-       /*
-     See the built-in function divmod.  Returns NULL on failure.
-     This is the equivalent of the Python expression:
-     divmod(o1,o2).
-
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Power(PyObject *o1, PyObject *o2,
-                                          PyObject *o3);
-
-       /*
-     See the built-in function pow.  Returns NULL on failure.
-     This is the equivalent of the Python expression:
-     pow(o1,o2,o3), where o3 is optional.
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Negative(PyObject *o);
-
-       /*
-     Returns the negation of o on success, or null on failure.
-     This is the equivalent of the Python expression: -o.
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Positive(PyObject *o);
-
-       /*
-     Returns the (what?) of o on success, or NULL on failure.
-     This is the equivalent of the Python expression: +o.
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Absolute(PyObject *o);
-
-       /*
-     Returns the absolute value of o, or null on failure.  This is
-     the equivalent of the Python expression: abs(o).
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Invert(PyObject *o);
-
-       /*
-     Returns the bitwise negation of o on success, or NULL on
-     failure.  This is the equivalent of the Python expression:
-     ~o.
-
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Lshift(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of left shifting o1 by o2 on success, or
-     NULL on failure.  This is the equivalent of the Python
-     expression: o1 << o2.
-
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Rshift(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of right shifting o1 by o2 on success, or
-     NULL on failure.  This is the equivalent of the Python
-     expression: o1 >> o2.
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_And(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of bitwise and of o1 and o2 on success, or
-     NULL on failure. This is the equivalent of the Python
-     expression: o1&o2.
-
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Xor(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the bitwise exclusive or of o1 by o2 on success, or
-     NULL on failure.  This is the equivalent of the Python
-     expression: o1^o2.
-
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Or(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of bitwise or on o1 and o2 on success, or
-     NULL on failure.  This is the equivalent of the Python
-     expression: o1|o2.
-
-       */
-
-     /* Implemented elsewhere:
-
-     int PyNumber_Coerce(PyObject **p1, PyObject **p2);
-
-     This function takes the addresses of two variables of type
-     PyObject*.
-
-     If the objects pointed to by *p1 and *p2 have the same type,
-     increment their reference count and return 0 (success).
-     If the objects can be converted to a common numeric type,
-     replace *p1 and *p2 by their converted value (with 'new'
-     reference counts), and return 0.
-     If no conversion is possible, or if some other error occurs,
-     return -1 (failure) and don't increment the reference counts.
-     The call PyNumber_Coerce(&o1, &o2) is equivalent to the Python
-     statement o1, o2 = coerce(o1, o2).
-
-       */
-
-#define PyIndex_Check(obj) \
-   ((obj)->ob_type->tp_as_number != NULL && \
-    PyType_HasFeature((obj)->ob_type, Py_TPFLAGS_HAVE_INDEX) && \
-    (obj)->ob_type->tp_as_number->nb_index != NULL)
-
-     PyAPI_FUNC(PyObject *) PyNumber_Index(PyObject *o);
-
-       /*
-     Returns the object converted to a Python long or int
-     or NULL with an error raised on failure.
-       */
-
-     PyAPI_FUNC(Py_ssize_t) PyNumber_AsSsize_t(PyObject *o, PyObject *exc);
-
-       /*
-     Returns the Integral instance converted to an int. The
-     instance is expected to be int or long or have an __int__
-     method. Steals integral's reference. error_format will be
-     used to create the TypeError if integral isn't actually an
-     Integral instance. error_format should be a format string
-     that can accept a char* naming integral's type.
-       */
-
-     PyAPI_FUNC(PyObject *) _PyNumber_ConvertIntegralToInt(
-         PyObject *integral,
-         const char* error_format);
-
-       /*
-    Returns the object converted to Py_ssize_t by going through
-    PyNumber_Index first.  If an overflow error occurs while
-    converting the int-or-long to Py_ssize_t, then the second argument
-    is the error-type to return.  If it is NULL, then the overflow error
-    is cleared and the value is clipped.
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Int(PyObject *o);
-
-       /*
-     Returns the o converted to an integer object on success, or
-     NULL on failure.  This is the equivalent of the Python
-     expression: int(o).
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Long(PyObject *o);
-
-       /*
-     Returns the o converted to a long integer object on success,
-     or NULL on failure.  This is the equivalent of the Python
-     expression: long(o).
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_Float(PyObject *o);
-
-       /*
-     Returns the o converted to a float object on success, or NULL
-     on failure.  This is the equivalent of the Python expression:
-     float(o).
-       */
-
-/*  In-place variants of (some of) the above number protocol functions */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceAdd(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of adding o2 to o1, possibly in-place, or null
-     on failure.  This is the equivalent of the Python expression:
-     o1 += o2.
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceSubtract(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of subtracting o2 from o1, possibly in-place or
-     null on failure.  This is the equivalent of the Python expression:
-     o1 -= o2.
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceMultiply(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of multiplying o1 by o2, possibly in-place, or
-     null on failure.  This is the equivalent of the Python expression:
-     o1 *= o2.
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceDivide(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of dividing o1 by o2, possibly in-place, or null
-     on failure.  This is the equivalent of the Python expression:
-     o1 /= o2.
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceFloorDivide(PyObject *o1,
-                                                       PyObject *o2);
-
-       /*
-     Returns the result of dividing o1 by o2 giving an integral result,
-     possibly in-place, or null on failure.
-     This is the equivalent of the Python expression:
-     o1 /= o2.
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceTrueDivide(PyObject *o1,
-                                                      PyObject *o2);
-
-       /*
-     Returns the result of dividing o1 by o2 giving a float result,
-     possibly in-place, or null on failure.
-     This is the equivalent of the Python expression:
-     o1 /= o2.
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceRemainder(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the remainder of dividing o1 by o2, possibly in-place, or
-     null on failure.  This is the equivalent of the Python expression:
-     o1 %= o2.
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlacePower(PyObject *o1, PyObject *o2,
-                                                 PyObject *o3);
-
-       /*
-     Returns the result of raising o1 to the power of o2, possibly
-     in-place, or null on failure.  This is the equivalent of the Python
-     expression: o1 **= o2, or pow(o1, o2, o3) if o3 is present.
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceLshift(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of left shifting o1 by o2, possibly in-place, or
-     null on failure.  This is the equivalent of the Python expression:
-     o1 <<= o2.
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceRshift(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of right shifting o1 by o2, possibly in-place or
-     null on failure.  This is the equivalent of the Python expression:
-     o1 >>= o2.
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceAnd(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of bitwise and of o1 and o2, possibly in-place,
-     or null on failure. This is the equivalent of the Python
-     expression: o1 &= o2.
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceXor(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the bitwise exclusive or of o1 by o2, possibly in-place, or
-     null on failure.  This is the equivalent of the Python expression:
-     o1 ^= o2.
-
-       */
-
-     PyAPI_FUNC(PyObject *) PyNumber_InPlaceOr(PyObject *o1, PyObject *o2);
-
-       /*
-     Returns the result of bitwise or of o1 and o2, possibly in-place,
-     or null on failure.  This is the equivalent of the Python
-     expression: o1 |= o2.
-
-       */
-
-
-     PyAPI_FUNC(PyObject *) PyNumber_ToBase(PyObject *n, int base);
-
-       /*
-     Returns the integer n converted to a string with a base, with a base
-     marker of 0b, 0o or 0x prefixed if applicable.
-     If n is not an int object, it is converted with PyNumber_Index first.
-       */
-
-
-/*  Sequence protocol:*/
-
-     PyAPI_FUNC(int) PySequence_Check(PyObject *o);
-
-       /*
-     Return 1 if the object provides sequence protocol, and zero
-     otherwise.
-
-     This function always succeeds.
-
-       */
-
-     PyAPI_FUNC(Py_ssize_t) PySequence_Size(PyObject *o);
-
-       /*
-     Return the size of sequence object o, or -1 on failure.
-
-       */
-
-       /* For DLL compatibility */
-#undef PySequence_Length
-     PyAPI_FUNC(Py_ssize_t) PySequence_Length(PyObject *o);
-#define PySequence_Length PySequence_Size
-
-
-     PyAPI_FUNC(PyObject *) PySequence_Concat(PyObject *o1, PyObject *o2);
-
-       /*
-     Return the concatenation of o1 and o2 on success, and NULL on
-     failure.   This is the equivalent of the Python
-     expression: o1+o2.
-
-       */
-
-     PyAPI_FUNC(PyObject *) PySequence_Repeat(PyObject *o, Py_ssize_t count);
-
-       /*
-     Return the result of repeating sequence object o count times,
-     or NULL on failure.  This is the equivalent of the Python
-     expression: o1*count.
-
-       */
-
-     PyAPI_FUNC(PyObject *) PySequence_GetItem(PyObject *o, Py_ssize_t i);
-
-       /*
-     Return the ith element of o, or NULL on failure. This is the
-     equivalent of the Python expression: o[i].
-       */
-
-     PyAPI_FUNC(PyObject *) PySequence_GetSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2);
-
-       /*
-     Return the slice of sequence object o between i1 and i2, or
-     NULL on failure. This is the equivalent of the Python
-     expression: o[i1:i2].
-
-       */
-
-     PyAPI_FUNC(int) PySequence_SetItem(PyObject *o, Py_ssize_t i, PyObject *v);
-
-       /*
+       */ 
+ 
+     PyAPI_FUNC(int) PyObject_DelItemString(PyObject *o, char *key); 
+ 
+       /* 
+     Remove the mapping for object, key, from the object *o. 
+     Returns -1 on failure.  This is equivalent to 
+     the Python statement: del o[key]. 
+       */ 
+ 
+     PyAPI_FUNC(int) PyObject_DelItem(PyObject *o, PyObject *key); 
+ 
+       /* 
+     Delete the mapping for key from *o.  Returns -1 on failure. 
+     This is the equivalent of the Python statement: del o[key]. 
+       */ 
+ 
+     PyAPI_FUNC(int) PyObject_AsCharBuffer(PyObject *obj, 
+                                          const char **buffer, 
+                                          Py_ssize_t *buffer_len); 
+ 
+       /* 
+      Takes an arbitrary object which must support the (character, 
+      single segment) buffer interface and returns a pointer to a 
+      read-only memory location useable as character based input 
+      for subsequent processing. 
+ 
+      0 is returned on success.  buffer and buffer_len are only 
+      set in case no error occurs. Otherwise, -1 is returned and 
+      an exception set. 
+ 
+       */ 
+ 
+     PyAPI_FUNC(int) PyObject_CheckReadBuffer(PyObject *obj); 
+ 
+      /* 
+      Checks whether an arbitrary object supports the (character, 
+      single segment) buffer interface.  Returns 1 on success, 0 
+      on failure. 
+ 
+      */ 
+ 
+     PyAPI_FUNC(int) PyObject_AsReadBuffer(PyObject *obj, 
+                                          const void **buffer, 
+                                          Py_ssize_t *buffer_len); 
+ 
+       /* 
+      Same as PyObject_AsCharBuffer() except that this API expects 
+      (readable, single segment) buffer interface and returns a 
+      pointer to a read-only memory location which can contain 
+      arbitrary data. 
+ 
+      0 is returned on success.  buffer and buffer_len are only 
+      set in case no error occurs.  Otherwise, -1 is returned and 
+      an exception set. 
+ 
+       */ 
+ 
+     PyAPI_FUNC(int) PyObject_AsWriteBuffer(PyObject *obj, 
+                                           void **buffer, 
+                                           Py_ssize_t *buffer_len); 
+ 
+       /* 
+      Takes an arbitrary object which must support the (writeable, 
+      single segment) buffer interface and returns a pointer to a 
+      writeable memory location in buffer of size buffer_len. 
+ 
+      0 is returned on success.  buffer and buffer_len are only 
+      set in case no error occurs. Otherwise, -1 is returned and 
+      an exception set. 
+ 
+       */ 
+ 
+    /* new buffer API */ 
+ 
+#define PyObject_CheckBuffer(obj) \ 
+    (((obj)->ob_type->tp_as_buffer != NULL) &&                          \ 
+     (PyType_HasFeature((obj)->ob_type, Py_TPFLAGS_HAVE_NEWBUFFER)) && \ 
+     ((obj)->ob_type->tp_as_buffer->bf_getbuffer != NULL)) 
+ 
+    /* Return 1 if the getbuffer function is available, otherwise 
+       return 0 */ 
+ 
+     PyAPI_FUNC(int) PyObject_GetBuffer(PyObject *obj, Py_buffer *view, 
+                                        int flags); 
+ 
+    /* This is a C-API version of the getbuffer function call.  It checks 
+       to make sure object has the required function pointer and issues the 
+       call.  Returns -1 and raises an error on failure and returns 0 on 
+       success 
+    */ 
+ 
+ 
+     PyAPI_FUNC(void *) PyBuffer_GetPointer(Py_buffer *view, Py_ssize_t *indices); 
+ 
+    /* Get the memory area pointed to by the indices for the buffer given. 
+       Note that view->ndim is the assumed size of indices 
+    */ 
+ 
+     PyAPI_FUNC(int) PyBuffer_SizeFromFormat(const char *); 
+ 
+    /* Return the implied itemsize of the data-format area from a 
+       struct-style description */ 
+ 
+ 
+ 
+     PyAPI_FUNC(int) PyBuffer_ToContiguous(void *buf, Py_buffer *view, 
+                                           Py_ssize_t len, char fort); 
+ 
+     PyAPI_FUNC(int) PyBuffer_FromContiguous(Py_buffer *view, void *buf, 
+                                             Py_ssize_t len, char fort); 
+ 
+ 
+    /* Copy len bytes of data from the contiguous chunk of memory 
+       pointed to by buf into the buffer exported by obj.  Return 
+       0 on success and return -1 and raise a PyBuffer_Error on 
+       error (i.e. the object does not have a buffer interface or 
+       it is not working). 
+ 
+       If fort is 'F' and the object is multi-dimensional, 
+       then the data will be copied into the array in 
+       Fortran-style (first dimension varies the fastest).  If 
+       fort is 'C', then the data will be copied into the array 
+       in C-style (last dimension varies the fastest).  If fort 
+       is 'A', then it does not matter and the copy will be made 
+       in whatever way is more efficient. 
+ 
+    */ 
+ 
+     PyAPI_FUNC(int) PyObject_CopyData(PyObject *dest, PyObject *src); 
+ 
+    /* Copy the data from the src buffer to the buffer of destination 
+     */ 
+ 
+     PyAPI_FUNC(int) PyBuffer_IsContiguous(Py_buffer *view, char fort); 
+ 
+ 
+     PyAPI_FUNC(void) PyBuffer_FillContiguousStrides(int ndims, 
+                                                    Py_ssize_t *shape, 
+                                                    Py_ssize_t *strides, 
+                                                    int itemsize, 
+                                                    char fort); 
+ 
+    /*  Fill the strides array with byte-strides of a contiguous 
+        (Fortran-style if fort is 'F' or C-style otherwise) 
+        array of the given shape with the given number of bytes 
+        per element. 
+    */ 
+ 
+     PyAPI_FUNC(int) PyBuffer_FillInfo(Py_buffer *view, PyObject *o, void *buf, 
+                                       Py_ssize_t len, int readonly, 
+                                       int flags); 
+ 
+    /* Fills in a buffer-info structure correctly for an exporter 
+       that can only share a contiguous chunk of memory of 
+       "unsigned bytes" of the given length. Returns 0 on success 
+       and -1 (with raising an error) on error. 
+     */ 
+ 
+     PyAPI_FUNC(void) PyBuffer_Release(Py_buffer *view); 
+ 
+       /* Releases a Py_buffer obtained from getbuffer ParseTuple's s*. 
+    */ 
+ 
+     PyAPI_FUNC(PyObject *) PyObject_Format(PyObject* obj, 
+                                            PyObject *format_spec); 
+       /* 
+     Takes an arbitrary object and returns the result of 
+     calling obj.__format__(format_spec). 
+       */ 
+ 
+/* Iterators */ 
+ 
+     PyAPI_FUNC(PyObject *) PyObject_GetIter(PyObject *); 
+     /* Takes an object and returns an iterator for it. 
+    This is typically a new iterator but if the argument 
+    is an iterator, this returns itself. */ 
+ 
+#define PyIter_Check(obj) \ 
+    (PyType_HasFeature((obj)->ob_type, Py_TPFLAGS_HAVE_ITER) && \ 
+     (obj)->ob_type->tp_iternext != NULL && \ 
+     (obj)->ob_type->tp_iternext != &_PyObject_NextNotImplemented) 
+ 
+     PyAPI_FUNC(PyObject *) PyIter_Next(PyObject *); 
+     /* Takes an iterator object and calls its tp_iternext slot, 
+    returning the next value.  If the iterator is exhausted, 
+    this returns NULL without setting an exception. 
+    NULL with an exception means an error occurred. */ 
+ 
+/*  Number Protocol:*/ 
+ 
+     PyAPI_FUNC(int) PyNumber_Check(PyObject *o); 
+ 
+       /* 
+     Returns 1 if the object, o, provides numeric protocols, and 
+     false otherwise. 
+ 
+     This function always succeeds. 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_Add(PyObject *o1, PyObject *o2); 
+ 
+       /* 
+     Returns the result of adding o1 and o2, or null on failure. 
+     This is the equivalent of the Python expression: o1+o2. 
+ 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_Subtract(PyObject *o1, PyObject *o2); 
+ 
+       /* 
+     Returns the result of subtracting o2 from o1, or null on 
+     failure.  This is the equivalent of the Python expression: 
+     o1-o2. 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_Multiply(PyObject *o1, PyObject *o2); 
+ 
+       /* 
+     Returns the result of multiplying o1 and o2, or null on 
+     failure.  This is the equivalent of the Python expression: 
+     o1*o2. 
+ 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_Divide(PyObject *o1, PyObject *o2); 
+ 
+       /* 
+     Returns the result of dividing o1 by o2, or null on failure. 
+     This is the equivalent of the Python expression: o1/o2. 
+ 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_FloorDivide(PyObject *o1, PyObject *o2); 
+ 
+       /* 
+     Returns the result of dividing o1 by o2 giving an integral result, 
+     or null on failure. 
+     This is the equivalent of the Python expression: o1//o2. 
+ 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_TrueDivide(PyObject *o1, PyObject *o2); 
+ 
+       /* 
+     Returns the result of dividing o1 by o2 giving a float result, 
+     or null on failure. 
+     This is the equivalent of the Python expression: o1/o2. 
+ 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_Remainder(PyObject *o1, PyObject *o2); 
+ 
+       /* 
+     Returns the remainder of dividing o1 by o2, or null on 
+     failure.  This is the equivalent of the Python expression: 
+     o1%o2. 
+ 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_Divmod(PyObject *o1, PyObject *o2); 
+ 
+       /* 
+     See the built-in function divmod.  Returns NULL on failure. 
+     This is the equivalent of the Python expression: 
+     divmod(o1,o2). 
+ 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_Power(PyObject *o1, PyObject *o2, 
+                                          PyObject *o3); 
+ 
+       /* 
+     See the built-in function pow.  Returns NULL on failure. 
+     This is the equivalent of the Python expression: 
+     pow(o1,o2,o3), where o3 is optional. 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_Negative(PyObject *o); 
+ 
+       /* 
+     Returns the negation of o on success, or null on failure. 
+     This is the equivalent of the Python expression: -o. 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_Positive(PyObject *o); 
+ 
+       /* 
+     Returns the (what?) of o on success, or NULL on failure. 
+     This is the equivalent of the Python expression: +o. 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_Absolute(PyObject *o); 
+ 
+       /* 
+     Returns the absolute value of o, or null on failure.  This is 
+     the equivalent of the Python expression: abs(o). 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_Invert(PyObject *o); 
+ 
+       /* 
+     Returns the bitwise negation of o on success, or NULL on 
+     failure.  This is the equivalent of the Python expression: 
+     ~o. 
+ 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_Lshift(PyObject *o1, PyObject *o2); 
+ 
+       /* 
+     Returns the result of left shifting o1 by o2 on success, or 
+     NULL on failure.  This is the equivalent of the Python 
+     expression: o1 << o2. 
+ 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_Rshift(PyObject *o1, PyObject *o2); 
+ 
+       /* 
+     Returns the result of right shifting o1 by o2 on success, or 
+     NULL on failure.  This is the equivalent of the Python 
+     expression: o1 >> o2. 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_And(PyObject *o1, PyObject *o2); 
+ 
+       /* 
+     Returns the result of bitwise and of o1 and o2 on success, or 
+     NULL on failure. This is the equivalent of the Python 
+     expression: o1&o2. 
+ 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_Xor(PyObject *o1, PyObject *o2); 
+ 
+       /* 
+     Returns the bitwise exclusive or of o1 by o2 on success, or 
+     NULL on failure.  This is the equivalent of the Python 
+     expression: o1^o2. 
+ 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_Or(PyObject *o1, PyObject *o2); 
+ 
+       /* 
+     Returns the result of bitwise or on o1 and o2 on success, or 
+     NULL on failure.  This is the equivalent of the Python 
+     expression: o1|o2. 
+ 
+       */ 
+ 
+     /* Implemented elsewhere: 
+ 
+     int PyNumber_Coerce(PyObject **p1, PyObject **p2); 
+ 
+     This function takes the addresses of two variables of type 
+     PyObject*. 
+ 
+     If the objects pointed to by *p1 and *p2 have the same type, 
+     increment their reference count and return 0 (success). 
+     If the objects can be converted to a common numeric type, 
+     replace *p1 and *p2 by their converted value (with 'new' 
+     reference counts), and return 0. 
+     If no conversion is possible, or if some other error occurs, 
+     return -1 (failure) and don't increment the reference counts. 
+     The call PyNumber_Coerce(&o1, &o2) is equivalent to the Python 
+     statement o1, o2 = coerce(o1, o2). 
+ 
+       */ 
+ 
+#define PyIndex_Check(obj) \ 
+   ((obj)->ob_type->tp_as_number != NULL && \ 
+    PyType_HasFeature((obj)->ob_type, Py_TPFLAGS_HAVE_INDEX) && \ 
+    (obj)->ob_type->tp_as_number->nb_index != NULL) 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_Index(PyObject *o); 
+ 
+       /* 
+     Returns the object converted to a Python long or int 
+     or NULL with an error raised on failure. 
+       */ 
+ 
+     PyAPI_FUNC(Py_ssize_t) PyNumber_AsSsize_t(PyObject *o, PyObject *exc); 
+ 
+       /* 
+     Returns the Integral instance converted to an int. The 
+     instance is expected to be int or long or have an __int__ 
+     method. Steals integral's reference. error_format will be 
+     used to create the TypeError if integral isn't actually an 
+     Integral instance. error_format should be a format string 
+     that can accept a char* naming integral's type. 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) _PyNumber_ConvertIntegralToInt( 
+         PyObject *integral, 
+         const char* error_format); 
+ 
+       /* 
+    Returns the object converted to Py_ssize_t by going through 
+    PyNumber_Index first.  If an overflow error occurs while 
+    converting the int-or-long to Py_ssize_t, then the second argument 
+    is the error-type to return.  If it is NULL, then the overflow error 
+    is cleared and the value is clipped. 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_Int(PyObject *o); 
+ 
+       /* 
+     Returns the o converted to an integer object on success, or 
+     NULL on failure.  This is the equivalent of the Python 
+     expression: int(o). 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_Long(PyObject *o); 
+ 
+       /* 
+     Returns the o converted to a long integer object on success, 
+     or NULL on failure.  This is the equivalent of the Python 
+     expression: long(o). 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_Float(PyObject *o); 
+ 
+       /* 
+     Returns the o converted to a float object on success, or NULL 
+     on failure.  This is the equivalent of the Python expression: 
+     float(o). 
+       */ 
+ 
+/*  In-place variants of (some of) the above number protocol functions */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_InPlaceAdd(PyObject *o1, PyObject *o2); 
+ 
+       /* 
+     Returns the result of adding o2 to o1, possibly in-place, or null 
+     on failure.  This is the equivalent of the Python expression: 
+     o1 += o2. 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_InPlaceSubtract(PyObject *o1, PyObject *o2); 
+ 
+       /* 
+     Returns the result of subtracting o2 from o1, possibly in-place or 
+     null on failure.  This is the equivalent of the Python expression: 
+     o1 -= o2. 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_InPlaceMultiply(PyObject *o1, PyObject *o2); 
+ 
+       /* 
+     Returns the result of multiplying o1 by o2, possibly in-place, or 
+     null on failure.  This is the equivalent of the Python expression: 
+     o1 *= o2. 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_InPlaceDivide(PyObject *o1, PyObject *o2); 
+ 
+       /* 
+     Returns the result of dividing o1 by o2, possibly in-place, or null 
+     on failure.  This is the equivalent of the Python expression: 
+     o1 /= o2. 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_InPlaceFloorDivide(PyObject *o1, 
+                                                       PyObject *o2); 
+ 
+       /* 
+     Returns the result of dividing o1 by o2 giving an integral result, 
+     possibly in-place, or null on failure. 
+     This is the equivalent of the Python expression: 
+     o1 /= o2. 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_InPlaceTrueDivide(PyObject *o1, 
+                                                      PyObject *o2); 
+ 
+       /* 
+     Returns the result of dividing o1 by o2 giving a float result, 
+     possibly in-place, or null on failure. 
+     This is the equivalent of the Python expression: 
+     o1 /= o2. 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_InPlaceRemainder(PyObject *o1, PyObject *o2); 
+ 
+       /* 
+     Returns the remainder of dividing o1 by o2, possibly in-place, or 
+     null on failure.  This is the equivalent of the Python expression: 
+     o1 %= o2. 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_InPlacePower(PyObject *o1, PyObject *o2, 
+                                                 PyObject *o3); 
+ 
+       /* 
+     Returns the result of raising o1 to the power of o2, possibly 
+     in-place, or null on failure.  This is the equivalent of the Python 
+     expression: o1 **= o2, or pow(o1, o2, o3) if o3 is present. 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_InPlaceLshift(PyObject *o1, PyObject *o2); 
+ 
+       /* 
+     Returns the result of left shifting o1 by o2, possibly in-place, or 
+     null on failure.  This is the equivalent of the Python expression: 
+     o1 <<= o2. 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_InPlaceRshift(PyObject *o1, PyObject *o2); 
+ 
+       /* 
+     Returns the result of right shifting o1 by o2, possibly in-place or 
+     null on failure.  This is the equivalent of the Python expression: 
+     o1 >>= o2. 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_InPlaceAnd(PyObject *o1, PyObject *o2); 
+ 
+       /* 
+     Returns the result of bitwise and of o1 and o2, possibly in-place, 
+     or null on failure. This is the equivalent of the Python 
+     expression: o1 &= o2. 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_InPlaceXor(PyObject *o1, PyObject *o2); 
+ 
+       /* 
+     Returns the bitwise exclusive or of o1 by o2, possibly in-place, or 
+     null on failure.  This is the equivalent of the Python expression: 
+     o1 ^= o2. 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_InPlaceOr(PyObject *o1, PyObject *o2); 
+ 
+       /* 
+     Returns the result of bitwise or of o1 and o2, possibly in-place, 
+     or null on failure.  This is the equivalent of the Python 
+     expression: o1 |= o2. 
+ 
+       */ 
+ 
+ 
+     PyAPI_FUNC(PyObject *) PyNumber_ToBase(PyObject *n, int base); 
+ 
+       /* 
+     Returns the integer n converted to a string with a base, with a base 
+     marker of 0b, 0o or 0x prefixed if applicable. 
+     If n is not an int object, it is converted with PyNumber_Index first. 
+       */ 
+ 
+ 
+/*  Sequence protocol:*/ 
+ 
+     PyAPI_FUNC(int) PySequence_Check(PyObject *o); 
+ 
+       /* 
+     Return 1 if the object provides sequence protocol, and zero 
+     otherwise. 
+ 
+     This function always succeeds. 
+ 
+       */ 
+ 
+     PyAPI_FUNC(Py_ssize_t) PySequence_Size(PyObject *o); 
+ 
+       /* 
+     Return the size of sequence object o, or -1 on failure. 
+ 
+       */ 
+ 
+       /* For DLL compatibility */ 
+#undef PySequence_Length 
+     PyAPI_FUNC(Py_ssize_t) PySequence_Length(PyObject *o); 
+#define PySequence_Length PySequence_Size 
+ 
+ 
+     PyAPI_FUNC(PyObject *) PySequence_Concat(PyObject *o1, PyObject *o2); 
+ 
+       /* 
+     Return the concatenation of o1 and o2 on success, and NULL on 
+     failure.   This is the equivalent of the Python 
+     expression: o1+o2. 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PySequence_Repeat(PyObject *o, Py_ssize_t count); 
+ 
+       /* 
+     Return the result of repeating sequence object o count times, 
+     or NULL on failure.  This is the equivalent of the Python 
+     expression: o1*count. 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PySequence_GetItem(PyObject *o, Py_ssize_t i); 
+ 
+       /* 
+     Return the ith element of o, or NULL on failure. This is the 
+     equivalent of the Python expression: o[i]. 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PySequence_GetSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2); 
+ 
+       /* 
+     Return the slice of sequence object o between i1 and i2, or 
+     NULL on failure. This is the equivalent of the Python 
+     expression: o[i1:i2]. 
+ 
+       */ 
+ 
+     PyAPI_FUNC(int) PySequence_SetItem(PyObject *o, Py_ssize_t i, PyObject *v); 
+ 
+       /* 
      Assign object v to the ith element of o.  Raise an exception and return
      -1 on failure; return 0 on success.  This is the equivalent of the
      Python statement o[i]=v.
-       */
-
-     PyAPI_FUNC(int) PySequence_DelItem(PyObject *o, Py_ssize_t i);
-
-       /*
-     Delete the ith element of object v.  Returns
-     -1 on failure.  This is the equivalent of the Python
-     statement: del o[i].
-       */
-
-     PyAPI_FUNC(int) PySequence_SetSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2,
-                                        PyObject *v);
-
-       /*
-     Assign the sequence object, v, to the slice in sequence
+       */ 
+ 
+     PyAPI_FUNC(int) PySequence_DelItem(PyObject *o, Py_ssize_t i); 
+ 
+       /* 
+     Delete the ith element of object v.  Returns 
+     -1 on failure.  This is the equivalent of the Python 
+     statement: del o[i]. 
+       */ 
+ 
+     PyAPI_FUNC(int) PySequence_SetSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2, 
+                                        PyObject *v); 
+ 
+       /* 
+     Assign the sequence object, v, to the slice in sequence 
      object, o, from i1 to i2.  Raise an exception and return
      -1 on failure; return 0 on success.  This is the
-     equivalent of the Python statement: o[i1:i2]=v.
-       */
-
-     PyAPI_FUNC(int) PySequence_DelSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2);
-
-       /*
-     Delete the slice in sequence object, o, from i1 to i2.
-     Returns -1 on failure. This is the equivalent of the Python
-     statement: del o[i1:i2].
-       */
-
-     PyAPI_FUNC(PyObject *) PySequence_Tuple(PyObject *o);
-
-       /*
-     Returns the sequence, o, as a tuple on success, and NULL on failure.
-     This is equivalent to the Python expression: tuple(o)
-       */
-
-
-     PyAPI_FUNC(PyObject *) PySequence_List(PyObject *o);
-       /*
-     Returns the sequence, o, as a list on success, and NULL on failure.
-     This is equivalent to the Python expression: list(o)
-       */
-
-     PyAPI_FUNC(PyObject *) PySequence_Fast(PyObject *o, const char* m);
-       /*
+     equivalent of the Python statement: o[i1:i2]=v. 
+       */ 
+ 
+     PyAPI_FUNC(int) PySequence_DelSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2); 
+ 
+       /* 
+     Delete the slice in sequence object, o, from i1 to i2. 
+     Returns -1 on failure. This is the equivalent of the Python 
+     statement: del o[i1:i2]. 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PySequence_Tuple(PyObject *o); 
+ 
+       /* 
+     Returns the sequence, o, as a tuple on success, and NULL on failure. 
+     This is equivalent to the Python expression: tuple(o) 
+       */ 
+ 
+ 
+     PyAPI_FUNC(PyObject *) PySequence_List(PyObject *o); 
+       /* 
+     Returns the sequence, o, as a list on success, and NULL on failure. 
+     This is equivalent to the Python expression: list(o) 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PySequence_Fast(PyObject *o, const char* m); 
+       /* 
      Return the sequence, o, as a list, unless it's already a
-     tuple or list.  Use PySequence_Fast_GET_ITEM to access the
-     members of this list, and PySequence_Fast_GET_SIZE to get its length.
-
-     Returns NULL on failure.  If the object does not support iteration,
-     raises a TypeError exception with m as the message text.
-       */
-
-#define PySequence_Fast_GET_SIZE(o) \
-    (PyList_Check(o) ? PyList_GET_SIZE(o) : PyTuple_GET_SIZE(o))
-       /*
-     Return the size of o, assuming that o was returned by
-     PySequence_Fast and is not NULL.
-       */
-
-#define PySequence_Fast_GET_ITEM(o, i)\
-     (PyList_Check(o) ? PyList_GET_ITEM(o, i) : PyTuple_GET_ITEM(o, i))
-       /*
-     Return the ith element of o, assuming that o was returned by
-     PySequence_Fast, and that i is within bounds.
-       */
-
-#define PySequence_ITEM(o, i)\
-    ( Py_TYPE(o)->tp_as_sequence->sq_item(o, i) )
-       /* Assume tp_as_sequence and sq_item exist and that i does not
-      need to be corrected for a negative index
-       */
-
-#define PySequence_Fast_ITEMS(sf) \
-    (PyList_Check(sf) ? ((PyListObject *)(sf))->ob_item \
-                      : ((PyTupleObject *)(sf))->ob_item)
-    /* Return a pointer to the underlying item array for
-       an object retured by PySequence_Fast */
-
-     PyAPI_FUNC(Py_ssize_t) PySequence_Count(PyObject *o, PyObject *value);
-
-       /*
-     Return the number of occurrences on value on o, that is,
-     return the number of keys for which o[key]==value.  On
-     failure, return -1.  This is equivalent to the Python
-     expression: o.count(value).
-       */
-
-     PyAPI_FUNC(int) PySequence_Contains(PyObject *seq, PyObject *ob);
-       /*
-     Return -1 if error; 1 if ob in seq; 0 if ob not in seq.
-     Use __contains__ if possible, else _PySequence_IterSearch().
-       */
-
-#define PY_ITERSEARCH_COUNT    1
-#define PY_ITERSEARCH_INDEX    2
-#define PY_ITERSEARCH_CONTAINS 3
-     PyAPI_FUNC(Py_ssize_t) _PySequence_IterSearch(PyObject *seq,
-                                        PyObject *obj, int operation);
-    /*
-      Iterate over seq.  Result depends on the operation:
-      PY_ITERSEARCH_COUNT:  return # of times obj appears in seq; -1 if
-        error.
-      PY_ITERSEARCH_INDEX:  return 0-based index of first occurrence of
-        obj in seq; set ValueError and return -1 if none found;
-        also return -1 on error.
-      PY_ITERSEARCH_CONTAINS:  return 1 if obj in seq, else 0; -1 on
-        error.
-    */
-
-/* For DLL-level backwards compatibility */
-#undef PySequence_In
-     PyAPI_FUNC(int) PySequence_In(PyObject *o, PyObject *value);
-
-/* For source-level backwards compatibility */
-#define PySequence_In PySequence_Contains
-
-       /*
-     Determine if o contains value.  If an item in o is equal to
-     X, return 1, otherwise return 0.  On error, return -1.  This
-     is equivalent to the Python expression: value in o.
-       */
-
-     PyAPI_FUNC(Py_ssize_t) PySequence_Index(PyObject *o, PyObject *value);
-
-       /*
-     Return the first index for which o[i]=value.  On error,
-     return -1.    This is equivalent to the Python
-     expression: o.index(value).
-       */
-
-/* In-place versions of some of the above Sequence functions. */
-
-     PyAPI_FUNC(PyObject *) PySequence_InPlaceConcat(PyObject *o1, PyObject *o2);
-
-       /*
-     Append o2 to o1, in-place when possible. Return the resulting
-     object, which could be o1, or NULL on failure.  This is the
-     equivalent of the Python expression: o1 += o2.
-
-       */
-
-     PyAPI_FUNC(PyObject *) PySequence_InPlaceRepeat(PyObject *o, Py_ssize_t count);
-
-       /*
-     Repeat o1 by count, in-place when possible. Return the resulting
-     object, which could be o1, or NULL on failure.  This is the
-     equivalent of the Python expression: o1 *= count.
-
-       */
-
-/*  Mapping protocol:*/
-
-     PyAPI_FUNC(int) PyMapping_Check(PyObject *o);
-
-       /*
-     Return 1 if the object provides mapping protocol, and zero
-     otherwise.
-
-     This function always succeeds.
-       */
-
-     PyAPI_FUNC(Py_ssize_t) PyMapping_Size(PyObject *o);
-
-       /*
-     Returns the number of keys in object o on success, and -1 on
-     failure.  For objects that do not provide sequence protocol,
-     this is equivalent to the Python expression: len(o).
-       */
-
-       /* For DLL compatibility */
-#undef PyMapping_Length
-     PyAPI_FUNC(Py_ssize_t) PyMapping_Length(PyObject *o);
-#define PyMapping_Length PyMapping_Size
-
-
-     /* implemented as a macro:
-
-     int PyMapping_DelItemString(PyObject *o, char *key);
-
-     Remove the mapping for object, key, from the object *o.
-     Returns -1 on failure.  This is equivalent to
-     the Python statement: del o[key].
-       */
-#define PyMapping_DelItemString(O,K) PyObject_DelItemString((O),(K))
-
-     /* implemented as a macro:
-
-     int PyMapping_DelItem(PyObject *o, PyObject *key);
-
-     Remove the mapping for object, key, from the object *o.
-     Returns -1 on failure.  This is equivalent to
-     the Python statement: del o[key].
-       */
-#define PyMapping_DelItem(O,K) PyObject_DelItem((O),(K))
-
-     PyAPI_FUNC(int) PyMapping_HasKeyString(PyObject *o, char *key);
-
-       /*
-     On success, return 1 if the mapping object has the key, key,
-     and 0 otherwise.  This is equivalent to the Python expression:
-     o.has_key(key).
-
-     This function always succeeds.
-       */
-
-     PyAPI_FUNC(int) PyMapping_HasKey(PyObject *o, PyObject *key);
-
-       /*
-     Return 1 if the mapping object has the key, key,
-     and 0 otherwise.  This is equivalent to the Python expression:
-     o.has_key(key).
-
-     This function always succeeds.
-
-       */
-
-     /* Implemented as macro:
-
-     PyObject *PyMapping_Keys(PyObject *o);
-
-     On success, return a list of the keys in object o.  On
-     failure, return NULL. This is equivalent to the Python
-     expression: o.keys().
-       */
-#define PyMapping_Keys(O) PyObject_CallMethod(O,"keys",NULL)
-
-     /* Implemented as macro:
-
-     PyObject *PyMapping_Values(PyObject *o);
-
-     On success, return a list of the values in object o.  On
-     failure, return NULL. This is equivalent to the Python
-     expression: o.values().
-       */
-#define PyMapping_Values(O) PyObject_CallMethod(O,"values",NULL)
-
-     /* Implemented as macro:
-
-     PyObject *PyMapping_Items(PyObject *o);
-
-     On success, return a list of the items in object o, where
-     each item is a tuple containing a key-value pair.  On
-     failure, return NULL. This is equivalent to the Python
-     expression: o.items().
-
-       */
-#define PyMapping_Items(O) PyObject_CallMethod(O,"items",NULL)
-
-     PyAPI_FUNC(PyObject *) PyMapping_GetItemString(PyObject *o, char *key);
-
-       /*
-     Return element of o corresponding to the object, key, or NULL
-     on failure. This is the equivalent of the Python expression:
-     o[key].
-       */
-
-     PyAPI_FUNC(int) PyMapping_SetItemString(PyObject *o, char *key,
-                                            PyObject *value);
-
-       /*
-     Map the object, key, to the value, v.  Returns
-     -1 on failure.  This is the equivalent of the Python
-     statement: o[key]=v.
-      */
-
-
-PyAPI_FUNC(int) PyObject_IsInstance(PyObject *object, PyObject *typeorclass);
-      /* isinstance(object, typeorclass) */
-
-PyAPI_FUNC(int) PyObject_IsSubclass(PyObject *object, PyObject *typeorclass);
-      /* issubclass(object, typeorclass) */
-
-
-PyAPI_FUNC(int) _PyObject_RealIsInstance(PyObject *inst, PyObject *cls);
-
-PyAPI_FUNC(int) _PyObject_RealIsSubclass(PyObject *derived, PyObject *cls);
-
-
-/* For internal use by buffer API functions */
-PyAPI_FUNC(void) _Py_add_one_to_index_F(int nd, Py_ssize_t *index,
-                                        const Py_ssize_t *shape);
-PyAPI_FUNC(void) _Py_add_one_to_index_C(int nd, Py_ssize_t *index,
-                                        const Py_ssize_t *shape);
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* Py_ABSTRACTOBJECT_H */
+     tuple or list.  Use PySequence_Fast_GET_ITEM to access the 
+     members of this list, and PySequence_Fast_GET_SIZE to get its length. 
+ 
+     Returns NULL on failure.  If the object does not support iteration, 
+     raises a TypeError exception with m as the message text. 
+       */ 
+ 
+#define PySequence_Fast_GET_SIZE(o) \ 
+    (PyList_Check(o) ? PyList_GET_SIZE(o) : PyTuple_GET_SIZE(o)) 
+       /* 
+     Return the size of o, assuming that o was returned by 
+     PySequence_Fast and is not NULL. 
+       */ 
+ 
+#define PySequence_Fast_GET_ITEM(o, i)\ 
+     (PyList_Check(o) ? PyList_GET_ITEM(o, i) : PyTuple_GET_ITEM(o, i)) 
+       /* 
+     Return the ith element of o, assuming that o was returned by 
+     PySequence_Fast, and that i is within bounds. 
+       */ 
+ 
+#define PySequence_ITEM(o, i)\ 
+    ( Py_TYPE(o)->tp_as_sequence->sq_item(o, i) ) 
+       /* Assume tp_as_sequence and sq_item exist and that i does not 
+      need to be corrected for a negative index 
+       */ 
+ 
+#define PySequence_Fast_ITEMS(sf) \ 
+    (PyList_Check(sf) ? ((PyListObject *)(sf))->ob_item \ 
+                      : ((PyTupleObject *)(sf))->ob_item) 
+    /* Return a pointer to the underlying item array for 
+       an object retured by PySequence_Fast */ 
+ 
+     PyAPI_FUNC(Py_ssize_t) PySequence_Count(PyObject *o, PyObject *value); 
+ 
+       /* 
+     Return the number of occurrences on value on o, that is, 
+     return the number of keys for which o[key]==value.  On 
+     failure, return -1.  This is equivalent to the Python 
+     expression: o.count(value). 
+       */ 
+ 
+     PyAPI_FUNC(int) PySequence_Contains(PyObject *seq, PyObject *ob); 
+       /* 
+     Return -1 if error; 1 if ob in seq; 0 if ob not in seq. 
+     Use __contains__ if possible, else _PySequence_IterSearch(). 
+       */ 
+ 
+#define PY_ITERSEARCH_COUNT    1 
+#define PY_ITERSEARCH_INDEX    2 
+#define PY_ITERSEARCH_CONTAINS 3 
+     PyAPI_FUNC(Py_ssize_t) _PySequence_IterSearch(PyObject *seq, 
+                                        PyObject *obj, int operation); 
+    /* 
+      Iterate over seq.  Result depends on the operation: 
+      PY_ITERSEARCH_COUNT:  return # of times obj appears in seq; -1 if 
+        error. 
+      PY_ITERSEARCH_INDEX:  return 0-based index of first occurrence of 
+        obj in seq; set ValueError and return -1 if none found; 
+        also return -1 on error. 
+      PY_ITERSEARCH_CONTAINS:  return 1 if obj in seq, else 0; -1 on 
+        error. 
+    */ 
+ 
+/* For DLL-level backwards compatibility */ 
+#undef PySequence_In 
+     PyAPI_FUNC(int) PySequence_In(PyObject *o, PyObject *value); 
+ 
+/* For source-level backwards compatibility */ 
+#define PySequence_In PySequence_Contains 
+ 
+       /* 
+     Determine if o contains value.  If an item in o is equal to 
+     X, return 1, otherwise return 0.  On error, return -1.  This 
+     is equivalent to the Python expression: value in o. 
+       */ 
+ 
+     PyAPI_FUNC(Py_ssize_t) PySequence_Index(PyObject *o, PyObject *value); 
+ 
+       /* 
+     Return the first index for which o[i]=value.  On error, 
+     return -1.    This is equivalent to the Python 
+     expression: o.index(value). 
+       */ 
+ 
+/* In-place versions of some of the above Sequence functions. */ 
+ 
+     PyAPI_FUNC(PyObject *) PySequence_InPlaceConcat(PyObject *o1, PyObject *o2); 
+ 
+       /* 
+     Append o2 to o1, in-place when possible. Return the resulting 
+     object, which could be o1, or NULL on failure.  This is the 
+     equivalent of the Python expression: o1 += o2. 
+ 
+       */ 
+ 
+     PyAPI_FUNC(PyObject *) PySequence_InPlaceRepeat(PyObject *o, Py_ssize_t count); 
+ 
+       /* 
+     Repeat o1 by count, in-place when possible. Return the resulting 
+     object, which could be o1, or NULL on failure.  This is the 
+     equivalent of the Python expression: o1 *= count. 
+ 
+       */ 
+ 
+/*  Mapping protocol:*/ 
+ 
+     PyAPI_FUNC(int) PyMapping_Check(PyObject *o); 
+ 
+       /* 
+     Return 1 if the object provides mapping protocol, and zero 
+     otherwise. 
+ 
+     This function always succeeds. 
+       */ 
+ 
+     PyAPI_FUNC(Py_ssize_t) PyMapping_Size(PyObject *o); 
+ 
+       /* 
+     Returns the number of keys in object o on success, and -1 on 
+     failure.  For objects that do not provide sequence protocol, 
+     this is equivalent to the Python expression: len(o). 
+       */ 
+ 
+       /* For DLL compatibility */ 
+#undef PyMapping_Length 
+     PyAPI_FUNC(Py_ssize_t) PyMapping_Length(PyObject *o); 
+#define PyMapping_Length PyMapping_Size 
+ 
+ 
+     /* implemented as a macro: 
+ 
+     int PyMapping_DelItemString(PyObject *o, char *key); 
+ 
+     Remove the mapping for object, key, from the object *o. 
+     Returns -1 on failure.  This is equivalent to 
+     the Python statement: del o[key]. 
+       */ 
+#define PyMapping_DelItemString(O,K) PyObject_DelItemString((O),(K)) 
+ 
+     /* implemented as a macro: 
+ 
+     int PyMapping_DelItem(PyObject *o, PyObject *key); 
+ 
+     Remove the mapping for object, key, from the object *o. 
+     Returns -1 on failure.  This is equivalent to 
+     the Python statement: del o[key]. 
+       */ 
+#define PyMapping_DelItem(O,K) PyObject_DelItem((O),(K)) 
+ 
+     PyAPI_FUNC(int) PyMapping_HasKeyString(PyObject *o, char *key); 
+ 
+       /* 
+     On success, return 1 if the mapping object has the key, key, 
+     and 0 otherwise.  This is equivalent to the Python expression: 
+     o.has_key(key). 
+ 
+     This function always succeeds. 
+       */ 
+ 
+     PyAPI_FUNC(int) PyMapping_HasKey(PyObject *o, PyObject *key); 
+ 
+       /* 
+     Return 1 if the mapping object has the key, key, 
+     and 0 otherwise.  This is equivalent to the Python expression: 
+     o.has_key(key). 
+ 
+     This function always succeeds. 
+ 
+       */ 
+ 
+     /* Implemented as macro: 
+ 
+     PyObject *PyMapping_Keys(PyObject *o); 
+ 
+     On success, return a list of the keys in object o.  On 
+     failure, return NULL. This is equivalent to the Python 
+     expression: o.keys(). 
+       */ 
+#define PyMapping_Keys(O) PyObject_CallMethod(O,"keys",NULL) 
+ 
+     /* Implemented as macro: 
+ 
+     PyObject *PyMapping_Values(PyObject *o); 
+ 
+     On success, return a list of the values in object o.  On 
+     failure, return NULL. This is equivalent to the Python 
+     expression: o.values(). 
+       */ 
+#define PyMapping_Values(O) PyObject_CallMethod(O,"values",NULL) 
+ 
+     /* Implemented as macro: 
+ 
+     PyObject *PyMapping_Items(PyObject *o); 
+ 
+     On success, return a list of the items in object o, where 
+     each item is a tuple containing a key-value pair.  On 
+     failure, return NULL. This is equivalent to the Python 
+     expression: o.items(). 
+ 
+       */ 
+#define PyMapping_Items(O) PyObject_CallMethod(O,"items",NULL) 
+ 
+     PyAPI_FUNC(PyObject *) PyMapping_GetItemString(PyObject *o, char *key); 
+ 
+       /* 
+     Return element of o corresponding to the object, key, or NULL 
+     on failure. This is the equivalent of the Python expression: 
+     o[key]. 
+       */ 
+ 
+     PyAPI_FUNC(int) PyMapping_SetItemString(PyObject *o, char *key, 
+                                            PyObject *value); 
+ 
+       /* 
+     Map the object, key, to the value, v.  Returns 
+     -1 on failure.  This is the equivalent of the Python 
+     statement: o[key]=v. 
+      */ 
+ 
+ 
+PyAPI_FUNC(int) PyObject_IsInstance(PyObject *object, PyObject *typeorclass); 
+      /* isinstance(object, typeorclass) */ 
+ 
+PyAPI_FUNC(int) PyObject_IsSubclass(PyObject *object, PyObject *typeorclass); 
+      /* issubclass(object, typeorclass) */ 
+ 
+ 
+PyAPI_FUNC(int) _PyObject_RealIsInstance(PyObject *inst, PyObject *cls); 
+ 
+PyAPI_FUNC(int) _PyObject_RealIsSubclass(PyObject *derived, PyObject *cls); 
+ 
+ 
+/* For internal use by buffer API functions */ 
+PyAPI_FUNC(void) _Py_add_one_to_index_F(int nd, Py_ssize_t *index, 
+                                        const Py_ssize_t *shape); 
+PyAPI_FUNC(void) _Py_add_one_to_index_C(int nd, Py_ssize_t *index, 
+                                        const Py_ssize_t *shape); 
+ 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* Py_ABSTRACTOBJECT_H */ 
diff --git a/contrib/tools/python/src/Include/asdl.h b/contrib/tools/python/src/Include/asdl.h
index 84e837e752..7983788ab0 100644
--- a/contrib/tools/python/src/Include/asdl.h
+++ b/contrib/tools/python/src/Include/asdl.h
@@ -1,45 +1,45 @@
-#ifndef Py_ASDL_H
-#define Py_ASDL_H
-
-typedef PyObject * identifier;
-typedef PyObject * string;
-typedef PyObject * object;
-
-#ifndef __cplusplus
-typedef enum {false, true} bool;
-#endif
-
-/* It would be nice if the code generated by asdl_c.py was completely
-   independent of Python, but it is a goal the requires too much work
-   at this stage.  So, for example, I'll represent identifiers as
-   interned Python strings.
-*/
-
-/* XXX A sequence should be typed so that its use can be typechecked. */
-
-typedef struct {
-    int size;
-    void *elements[1];
-} asdl_seq;
-
-typedef struct {
-    int size;
-    int elements[1];
-} asdl_int_seq;
-
-asdl_seq *asdl_seq_new(int size, PyArena *arena);
-asdl_int_seq *asdl_int_seq_new(int size, PyArena *arena);
-
-#define asdl_seq_GET(S, I) (S)->elements[(I)]
-#define asdl_seq_LEN(S) ((S) == NULL ? 0 : (S)->size)
-#ifdef Py_DEBUG
-#define asdl_seq_SET(S, I, V) { \
-        int _asdl_i = (I); \
-        assert((S) && _asdl_i < (S)->size); \
-        (S)->elements[_asdl_i] = (V); \
-}
-#else
-#define asdl_seq_SET(S, I, V) (S)->elements[I] = (V)
-#endif
-
-#endif /* !Py_ASDL_H */
+#ifndef Py_ASDL_H 
+#define Py_ASDL_H 
+ 
+typedef PyObject * identifier; 
+typedef PyObject * string; 
+typedef PyObject * object; 
+ 
+#ifndef __cplusplus 
+typedef enum {false, true} bool; 
+#endif 
+ 
+/* It would be nice if the code generated by asdl_c.py was completely 
+   independent of Python, but it is a goal the requires too much work 
+   at this stage.  So, for example, I'll represent identifiers as 
+   interned Python strings. 
+*/ 
+ 
+/* XXX A sequence should be typed so that its use can be typechecked. */ 
+ 
+typedef struct { 
+    int size; 
+    void *elements[1]; 
+} asdl_seq; 
+ 
+typedef struct { 
+    int size; 
+    int elements[1]; 
+} asdl_int_seq; 
+ 
+asdl_seq *asdl_seq_new(int size, PyArena *arena); 
+asdl_int_seq *asdl_int_seq_new(int size, PyArena *arena); 
+ 
+#define asdl_seq_GET(S, I) (S)->elements[(I)] 
+#define asdl_seq_LEN(S) ((S) == NULL ? 0 : (S)->size) 
+#ifdef Py_DEBUG 
+#define asdl_seq_SET(S, I, V) { \ 
+        int _asdl_i = (I); \ 
+        assert((S) && _asdl_i < (S)->size); \ 
+        (S)->elements[_asdl_i] = (V); \ 
+} 
+#else 
+#define asdl_seq_SET(S, I, V) (S)->elements[I] = (V) 
+#endif 
+ 
+#endif /* !Py_ASDL_H */ 
diff --git a/contrib/tools/python/src/Include/ast.h b/contrib/tools/python/src/Include/ast.h
index cc14b7fd76..e3954a62b1 100644
--- a/contrib/tools/python/src/Include/ast.h
+++ b/contrib/tools/python/src/Include/ast.h
@@ -1,13 +1,13 @@
-#ifndef Py_AST_H
-#define Py_AST_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_FUNC(mod_ty) PyAST_FromNode(const node *, PyCompilerFlags *flags,
-				  const char *, PyArena *);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_AST_H */
+#ifndef Py_AST_H 
+#define Py_AST_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+PyAPI_FUNC(mod_ty) PyAST_FromNode(const node *, PyCompilerFlags *flags, 
+				  const char *, PyArena *); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_AST_H */ 
diff --git a/contrib/tools/python/src/Include/bitset.h b/contrib/tools/python/src/Include/bitset.h
index faeb41913d..0313ddfdcd 100644
--- a/contrib/tools/python/src/Include/bitset.h
+++ b/contrib/tools/python/src/Include/bitset.h
@@ -1,32 +1,32 @@
-
-#ifndef Py_BITSET_H
-#define Py_BITSET_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Bitset interface */
-
-#define BYTE		char
-
-typedef BYTE *bitset;
-
-bitset newbitset(int nbits);
-void delbitset(bitset bs);
-#define testbit(ss, ibit) (((ss)[BIT2BYTE(ibit)] & BIT2MASK(ibit)) != 0)
-int addbit(bitset bs, int ibit); /* Returns 0 if already set */
-int samebitset(bitset bs1, bitset bs2, int nbits);
-void mergebitset(bitset bs1, bitset bs2, int nbits);
-
-#define BITSPERBYTE	(8*sizeof(BYTE))
-#define NBYTES(nbits)	(((nbits) + BITSPERBYTE - 1) / BITSPERBYTE)
-
-#define BIT2BYTE(ibit)	((ibit) / BITSPERBYTE)
-#define BIT2SHIFT(ibit)	((ibit) % BITSPERBYTE)
-#define BIT2MASK(ibit)	(1 << BIT2SHIFT(ibit))
-#define BYTE2BIT(ibyte)	((ibyte) * BITSPERBYTE)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_BITSET_H */
+ 
+#ifndef Py_BITSET_H 
+#define Py_BITSET_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+/* Bitset interface */ 
+ 
+#define BYTE		char 
+ 
+typedef BYTE *bitset; 
+ 
+bitset newbitset(int nbits); 
+void delbitset(bitset bs); 
+#define testbit(ss, ibit) (((ss)[BIT2BYTE(ibit)] & BIT2MASK(ibit)) != 0) 
+int addbit(bitset bs, int ibit); /* Returns 0 if already set */ 
+int samebitset(bitset bs1, bitset bs2, int nbits); 
+void mergebitset(bitset bs1, bitset bs2, int nbits); 
+ 
+#define BITSPERBYTE	(8*sizeof(BYTE)) 
+#define NBYTES(nbits)	(((nbits) + BITSPERBYTE - 1) / BITSPERBYTE) 
+ 
+#define BIT2BYTE(ibit)	((ibit) / BITSPERBYTE) 
+#define BIT2SHIFT(ibit)	((ibit) % BITSPERBYTE) 
+#define BIT2MASK(ibit)	(1 << BIT2SHIFT(ibit)) 
+#define BYTE2BIT(ibyte)	((ibyte) * BITSPERBYTE) 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_BITSET_H */ 
diff --git a/contrib/tools/python/src/Include/boolobject.h b/contrib/tools/python/src/Include/boolobject.h
index 74e854f706..47a89451a6 100644
--- a/contrib/tools/python/src/Include/boolobject.h
+++ b/contrib/tools/python/src/Include/boolobject.h
@@ -1,36 +1,36 @@
-/* Boolean object interface */
-
-#ifndef Py_BOOLOBJECT_H
-#define Py_BOOLOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-typedef PyIntObject PyBoolObject;
-
-PyAPI_DATA(PyTypeObject) PyBool_Type;
-
-#define PyBool_Check(x) (Py_TYPE(x) == &PyBool_Type)
-
-/* Py_False and Py_True are the only two bools in existence.
-Don't forget to apply Py_INCREF() when returning either!!! */
-
-/* Don't use these directly */
-PyAPI_DATA(PyIntObject) _Py_ZeroStruct, _Py_TrueStruct;
-
-/* Use these macros */
-#define Py_False ((PyObject *) &_Py_ZeroStruct)
-#define Py_True ((PyObject *) &_Py_TrueStruct)
-
-/* Macros for returning Py_True or Py_False, respectively */
-#define Py_RETURN_TRUE return Py_INCREF(Py_True), Py_True
-#define Py_RETURN_FALSE return Py_INCREF(Py_False), Py_False
-
-/* Function to return a bool from a C long */
-PyAPI_FUNC(PyObject *) PyBool_FromLong(long);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_BOOLOBJECT_H */
+/* Boolean object interface */ 
+ 
+#ifndef Py_BOOLOBJECT_H 
+#define Py_BOOLOBJECT_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+ 
+typedef PyIntObject PyBoolObject; 
+ 
+PyAPI_DATA(PyTypeObject) PyBool_Type; 
+ 
+#define PyBool_Check(x) (Py_TYPE(x) == &PyBool_Type) 
+ 
+/* Py_False and Py_True are the only two bools in existence. 
+Don't forget to apply Py_INCREF() when returning either!!! */ 
+ 
+/* Don't use these directly */ 
+PyAPI_DATA(PyIntObject) _Py_ZeroStruct, _Py_TrueStruct; 
+ 
+/* Use these macros */ 
+#define Py_False ((PyObject *) &_Py_ZeroStruct) 
+#define Py_True ((PyObject *) &_Py_TrueStruct) 
+ 
+/* Macros for returning Py_True or Py_False, respectively */ 
+#define Py_RETURN_TRUE return Py_INCREF(Py_True), Py_True 
+#define Py_RETURN_FALSE return Py_INCREF(Py_False), Py_False 
+ 
+/* Function to return a bool from a C long */ 
+PyAPI_FUNC(PyObject *) PyBool_FromLong(long); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_BOOLOBJECT_H */ 
diff --git a/contrib/tools/python/src/Include/bufferobject.h b/contrib/tools/python/src/Include/bufferobject.h
index 6dd83458c5..49061d801c 100644
--- a/contrib/tools/python/src/Include/bufferobject.h
+++ b/contrib/tools/python/src/Include/bufferobject.h
@@ -1,33 +1,33 @@
-
-/* Buffer object interface */
-
-/* Note: the object's structure is private */
-
-#ifndef Py_BUFFEROBJECT_H
-#define Py_BUFFEROBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-PyAPI_DATA(PyTypeObject) PyBuffer_Type;
-
-#define PyBuffer_Check(op) (Py_TYPE(op) == &PyBuffer_Type)
-
-#define Py_END_OF_BUFFER	(-1)
-
-PyAPI_FUNC(PyObject *) PyBuffer_FromObject(PyObject *base,
-                                           Py_ssize_t offset, Py_ssize_t size);
-PyAPI_FUNC(PyObject *) PyBuffer_FromReadWriteObject(PyObject *base,
-                                                    Py_ssize_t offset,
-                                                    Py_ssize_t size);
-
-PyAPI_FUNC(PyObject *) PyBuffer_FromMemory(void *ptr, Py_ssize_t size);
-PyAPI_FUNC(PyObject *) PyBuffer_FromReadWriteMemory(void *ptr, Py_ssize_t size);
-
-PyAPI_FUNC(PyObject *) PyBuffer_New(Py_ssize_t size);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_BUFFEROBJECT_H */
+ 
+/* Buffer object interface */ 
+ 
+/* Note: the object's structure is private */ 
+ 
+#ifndef Py_BUFFEROBJECT_H 
+#define Py_BUFFEROBJECT_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+ 
+PyAPI_DATA(PyTypeObject) PyBuffer_Type; 
+ 
+#define PyBuffer_Check(op) (Py_TYPE(op) == &PyBuffer_Type) 
+ 
+#define Py_END_OF_BUFFER	(-1) 
+ 
+PyAPI_FUNC(PyObject *) PyBuffer_FromObject(PyObject *base, 
+                                           Py_ssize_t offset, Py_ssize_t size); 
+PyAPI_FUNC(PyObject *) PyBuffer_FromReadWriteObject(PyObject *base, 
+                                                    Py_ssize_t offset, 
+                                                    Py_ssize_t size); 
+ 
+PyAPI_FUNC(PyObject *) PyBuffer_FromMemory(void *ptr, Py_ssize_t size); 
+PyAPI_FUNC(PyObject *) PyBuffer_FromReadWriteMemory(void *ptr, Py_ssize_t size); 
+ 
+PyAPI_FUNC(PyObject *) PyBuffer_New(Py_ssize_t size); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_BUFFEROBJECT_H */ 
diff --git a/contrib/tools/python/src/Include/bytearrayobject.h b/contrib/tools/python/src/Include/bytearrayobject.h
index e1281a628c..e2baf1bc56 100644
--- a/contrib/tools/python/src/Include/bytearrayobject.h
+++ b/contrib/tools/python/src/Include/bytearrayobject.h
@@ -1,57 +1,57 @@
-/* ByteArray object interface */
-
-#ifndef Py_BYTEARRAYOBJECT_H
-#define Py_BYTEARRAYOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdarg.h>
-
-/* Type PyByteArrayObject represents a mutable array of bytes.
- * The Python API is that of a sequence;
- * the bytes are mapped to ints in [0, 256).
- * Bytes are not characters; they may be used to encode characters.
- * The only way to go between bytes and str/unicode is via encoding
- * and decoding.
- * For the convenience of C programmers, the bytes type is considered
- * to contain a char pointer, not an unsigned char pointer.
- */
-
-/* Object layout */
-typedef struct {
-    PyObject_VAR_HEAD
-    /* XXX(nnorwitz): should ob_exports be Py_ssize_t? */
-    int ob_exports; /* how many buffer exports */
-    Py_ssize_t ob_alloc; /* How many bytes allocated */
-    char *ob_bytes;
-} PyByteArrayObject;
-
-/* Type object */
-PyAPI_DATA(PyTypeObject) PyByteArray_Type;
-PyAPI_DATA(PyTypeObject) PyByteArrayIter_Type;
-
-/* Type check macros */
-#define PyByteArray_Check(self) PyObject_TypeCheck(self, &PyByteArray_Type)
-#define PyByteArray_CheckExact(self) (Py_TYPE(self) == &PyByteArray_Type)
-
-/* Direct API functions */
-PyAPI_FUNC(PyObject *) PyByteArray_FromObject(PyObject *);
-PyAPI_FUNC(PyObject *) PyByteArray_Concat(PyObject *, PyObject *);
-PyAPI_FUNC(PyObject *) PyByteArray_FromStringAndSize(const char *, Py_ssize_t);
-PyAPI_FUNC(Py_ssize_t) PyByteArray_Size(PyObject *);
-PyAPI_FUNC(char *) PyByteArray_AsString(PyObject *);
-PyAPI_FUNC(int) PyByteArray_Resize(PyObject *, Py_ssize_t);
-
-/* Macros, trading safety for speed */
-#define PyByteArray_AS_STRING(self) \
-    (assert(PyByteArray_Check(self)), \
-     Py_SIZE(self) ? ((PyByteArrayObject *)(self))->ob_bytes : _PyByteArray_empty_string)
-#define PyByteArray_GET_SIZE(self)  (assert(PyByteArray_Check(self)),Py_SIZE(self))
-
-PyAPI_DATA(char) _PyByteArray_empty_string[];
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_BYTEARRAYOBJECT_H */
+/* ByteArray object interface */ 
+ 
+#ifndef Py_BYTEARRAYOBJECT_H 
+#define Py_BYTEARRAYOBJECT_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+#include <stdarg.h> 
+ 
+/* Type PyByteArrayObject represents a mutable array of bytes. 
+ * The Python API is that of a sequence; 
+ * the bytes are mapped to ints in [0, 256). 
+ * Bytes are not characters; they may be used to encode characters. 
+ * The only way to go between bytes and str/unicode is via encoding 
+ * and decoding. 
+ * For the convenience of C programmers, the bytes type is considered 
+ * to contain a char pointer, not an unsigned char pointer. 
+ */ 
+ 
+/* Object layout */ 
+typedef struct { 
+    PyObject_VAR_HEAD 
+    /* XXX(nnorwitz): should ob_exports be Py_ssize_t? */ 
+    int ob_exports; /* how many buffer exports */ 
+    Py_ssize_t ob_alloc; /* How many bytes allocated */ 
+    char *ob_bytes; 
+} PyByteArrayObject; 
+ 
+/* Type object */ 
+PyAPI_DATA(PyTypeObject) PyByteArray_Type; 
+PyAPI_DATA(PyTypeObject) PyByteArrayIter_Type; 
+ 
+/* Type check macros */ 
+#define PyByteArray_Check(self) PyObject_TypeCheck(self, &PyByteArray_Type) 
+#define PyByteArray_CheckExact(self) (Py_TYPE(self) == &PyByteArray_Type) 
+ 
+/* Direct API functions */ 
+PyAPI_FUNC(PyObject *) PyByteArray_FromObject(PyObject *); 
+PyAPI_FUNC(PyObject *) PyByteArray_Concat(PyObject *, PyObject *); 
+PyAPI_FUNC(PyObject *) PyByteArray_FromStringAndSize(const char *, Py_ssize_t); 
+PyAPI_FUNC(Py_ssize_t) PyByteArray_Size(PyObject *); 
+PyAPI_FUNC(char *) PyByteArray_AsString(PyObject *); 
+PyAPI_FUNC(int) PyByteArray_Resize(PyObject *, Py_ssize_t); 
+ 
+/* Macros, trading safety for speed */ 
+#define PyByteArray_AS_STRING(self) \ 
+    (assert(PyByteArray_Check(self)), \ 
+     Py_SIZE(self) ? ((PyByteArrayObject *)(self))->ob_bytes : _PyByteArray_empty_string) 
+#define PyByteArray_GET_SIZE(self)  (assert(PyByteArray_Check(self)),Py_SIZE(self)) 
+ 
+PyAPI_DATA(char) _PyByteArray_empty_string[]; 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_BYTEARRAYOBJECT_H */ 
diff --git a/contrib/tools/python/src/Include/bytes_methods.h b/contrib/tools/python/src/Include/bytes_methods.h
index 4125666212..465c34bc44 100644
--- a/contrib/tools/python/src/Include/bytes_methods.h
+++ b/contrib/tools/python/src/Include/bytes_methods.h
@@ -1,75 +1,75 @@
-#ifndef Py_BYTES_CTYPE_H
-#define Py_BYTES_CTYPE_H
-
-/*
- * The internal implementation behind PyString (bytes) and PyBytes (buffer)
- * methods of the given names, they operate on ASCII byte strings.
- */
-extern PyObject* _Py_bytes_isspace(const char *cptr, Py_ssize_t len);
-extern PyObject* _Py_bytes_isalpha(const char *cptr, Py_ssize_t len);
-extern PyObject* _Py_bytes_isalnum(const char *cptr, Py_ssize_t len);
-extern PyObject* _Py_bytes_isdigit(const char *cptr, Py_ssize_t len);
-extern PyObject* _Py_bytes_islower(const char *cptr, Py_ssize_t len);
-extern PyObject* _Py_bytes_isupper(const char *cptr, Py_ssize_t len);
-extern PyObject* _Py_bytes_istitle(const char *cptr, Py_ssize_t len);
-
-/* These store their len sized answer in the given preallocated *result arg. */
-extern void _Py_bytes_lower(char *result, const char *cptr, Py_ssize_t len);
-extern void _Py_bytes_upper(char *result, const char *cptr, Py_ssize_t len);
-extern void _Py_bytes_title(char *result, char *s, Py_ssize_t len);
-extern void _Py_bytes_capitalize(char *result, char *s, Py_ssize_t len);
-extern void _Py_bytes_swapcase(char *result, char *s, Py_ssize_t len);
-
-/* Shared __doc__ strings. */
-extern const char _Py_isspace__doc__[];
-extern const char _Py_isalpha__doc__[];
-extern const char _Py_isalnum__doc__[];
-extern const char _Py_isdigit__doc__[];
-extern const char _Py_islower__doc__[];
-extern const char _Py_isupper__doc__[];
-extern const char _Py_istitle__doc__[];
-extern const char _Py_lower__doc__[];
-extern const char _Py_upper__doc__[];
-extern const char _Py_title__doc__[];
-extern const char _Py_capitalize__doc__[];
-extern const char _Py_swapcase__doc__[];
-
-/* These are left in for backward compatibility and will be removed
-   in 2.8/3.2 */
-#define ISLOWER(c)  Py_ISLOWER(c)
-#define ISUPPER(c)  Py_ISUPPER(c)
-#define ISALPHA(c)  Py_ISALPHA(c)
-#define ISDIGIT(c)  Py_ISDIGIT(c)
-#define ISXDIGIT(c) Py_ISXDIGIT(c)
-#define ISALNUM(c)  Py_ISALNUM(c)
-#define ISSPACE(c)  Py_ISSPACE(c)
-
-#undef islower
-#define islower(c) undefined_islower(c)
-#undef isupper
-#define isupper(c) undefined_isupper(c)
-#undef isalpha
-#define isalpha(c) undefined_isalpha(c)
-#undef isdigit
-#define isdigit(c) undefined_isdigit(c)
-#undef isxdigit
-#define isxdigit(c) undefined_isxdigit(c)
-#undef isalnum
-#define isalnum(c) undefined_isalnum(c)
-#undef isspace
-#define isspace(c) undefined_isspace(c)
-
-/* These are left in for backward compatibility and will be removed
-   in 2.8/3.2 */
-#define TOLOWER(c) Py_TOLOWER(c)
-#define TOUPPER(c) Py_TOUPPER(c)
-
-#undef tolower
-#define tolower(c) undefined_tolower(c)
-#undef toupper
-#define toupper(c) undefined_toupper(c)
-
-/* this is needed because some docs are shared from the .o, not static */
-#define PyDoc_STRVAR_shared(name,str) const char name[] = PyDoc_STR(str)
-
-#endif /* !Py_BYTES_CTYPE_H */
+#ifndef Py_BYTES_CTYPE_H 
+#define Py_BYTES_CTYPE_H 
+ 
+/* 
+ * The internal implementation behind PyString (bytes) and PyBytes (buffer) 
+ * methods of the given names, they operate on ASCII byte strings. 
+ */ 
+extern PyObject* _Py_bytes_isspace(const char *cptr, Py_ssize_t len); 
+extern PyObject* _Py_bytes_isalpha(const char *cptr, Py_ssize_t len); 
+extern PyObject* _Py_bytes_isalnum(const char *cptr, Py_ssize_t len); 
+extern PyObject* _Py_bytes_isdigit(const char *cptr, Py_ssize_t len); 
+extern PyObject* _Py_bytes_islower(const char *cptr, Py_ssize_t len); 
+extern PyObject* _Py_bytes_isupper(const char *cptr, Py_ssize_t len); 
+extern PyObject* _Py_bytes_istitle(const char *cptr, Py_ssize_t len); 
+ 
+/* These store their len sized answer in the given preallocated *result arg. */ 
+extern void _Py_bytes_lower(char *result, const char *cptr, Py_ssize_t len); 
+extern void _Py_bytes_upper(char *result, const char *cptr, Py_ssize_t len); 
+extern void _Py_bytes_title(char *result, char *s, Py_ssize_t len); 
+extern void _Py_bytes_capitalize(char *result, char *s, Py_ssize_t len); 
+extern void _Py_bytes_swapcase(char *result, char *s, Py_ssize_t len); 
+ 
+/* Shared __doc__ strings. */ 
+extern const char _Py_isspace__doc__[]; 
+extern const char _Py_isalpha__doc__[]; 
+extern const char _Py_isalnum__doc__[]; 
+extern const char _Py_isdigit__doc__[]; 
+extern const char _Py_islower__doc__[]; 
+extern const char _Py_isupper__doc__[]; 
+extern const char _Py_istitle__doc__[]; 
+extern const char _Py_lower__doc__[]; 
+extern const char _Py_upper__doc__[]; 
+extern const char _Py_title__doc__[]; 
+extern const char _Py_capitalize__doc__[]; 
+extern const char _Py_swapcase__doc__[]; 
+ 
+/* These are left in for backward compatibility and will be removed 
+   in 2.8/3.2 */ 
+#define ISLOWER(c)  Py_ISLOWER(c) 
+#define ISUPPER(c)  Py_ISUPPER(c) 
+#define ISALPHA(c)  Py_ISALPHA(c) 
+#define ISDIGIT(c)  Py_ISDIGIT(c) 
+#define ISXDIGIT(c) Py_ISXDIGIT(c) 
+#define ISALNUM(c)  Py_ISALNUM(c) 
+#define ISSPACE(c)  Py_ISSPACE(c) 
+ 
+#undef islower 
+#define islower(c) undefined_islower(c) 
+#undef isupper 
+#define isupper(c) undefined_isupper(c) 
+#undef isalpha 
+#define isalpha(c) undefined_isalpha(c) 
+#undef isdigit 
+#define isdigit(c) undefined_isdigit(c) 
+#undef isxdigit 
+#define isxdigit(c) undefined_isxdigit(c) 
+#undef isalnum 
+#define isalnum(c) undefined_isalnum(c) 
+#undef isspace 
+#define isspace(c) undefined_isspace(c) 
+ 
+/* These are left in for backward compatibility and will be removed 
+   in 2.8/3.2 */ 
+#define TOLOWER(c) Py_TOLOWER(c) 
+#define TOUPPER(c) Py_TOUPPER(c) 
+ 
+#undef tolower 
+#define tolower(c) undefined_tolower(c) 
+#undef toupper 
+#define toupper(c) undefined_toupper(c) 
+ 
+/* this is needed because some docs are shared from the .o, not static */ 
+#define PyDoc_STRVAR_shared(name,str) const char name[] = PyDoc_STR(str) 
+ 
+#endif /* !Py_BYTES_CTYPE_H */ 
diff --git a/contrib/tools/python/src/Include/bytesobject.h b/contrib/tools/python/src/Include/bytesobject.h
index 1083da9c82..996d258433 100644
--- a/contrib/tools/python/src/Include/bytesobject.h
+++ b/contrib/tools/python/src/Include/bytesobject.h
@@ -1,27 +1,27 @@
-#define PyBytesObject PyStringObject
-#define PyBytes_Type PyString_Type
-
-#define PyBytes_Check PyString_Check
-#define PyBytes_CheckExact PyString_CheckExact 
-#define PyBytes_CHECK_INTERNED PyString_CHECK_INTERNED
-#define PyBytes_AS_STRING PyString_AS_STRING
-#define PyBytes_GET_SIZE PyString_GET_SIZE
-#define Py_TPFLAGS_BYTES_SUBCLASS Py_TPFLAGS_STRING_SUBCLASS
-
-#define PyBytes_FromStringAndSize PyString_FromStringAndSize
-#define PyBytes_FromString PyString_FromString
-#define PyBytes_FromFormatV PyString_FromFormatV
-#define PyBytes_FromFormat PyString_FromFormat
-#define PyBytes_Size PyString_Size
-#define PyBytes_AsString PyString_AsString
-#define PyBytes_Repr PyString_Repr
-#define PyBytes_Concat PyString_Concat
-#define PyBytes_ConcatAndDel PyString_ConcatAndDel
-#define _PyBytes_Resize _PyString_Resize
-#define _PyBytes_Eq _PyString_Eq
-#define PyBytes_Format PyString_Format
-#define _PyBytes_FormatLong _PyString_FormatLong
-#define PyBytes_DecodeEscape PyString_DecodeEscape
-#define _PyBytes_Join _PyString_Join
-#define PyBytes_AsStringAndSize PyString_AsStringAndSize
-#define _PyBytes_InsertThousandsGrouping _PyString_InsertThousandsGrouping
+#define PyBytesObject PyStringObject 
+#define PyBytes_Type PyString_Type 
+ 
+#define PyBytes_Check PyString_Check 
+#define PyBytes_CheckExact PyString_CheckExact  
+#define PyBytes_CHECK_INTERNED PyString_CHECK_INTERNED 
+#define PyBytes_AS_STRING PyString_AS_STRING 
+#define PyBytes_GET_SIZE PyString_GET_SIZE 
+#define Py_TPFLAGS_BYTES_SUBCLASS Py_TPFLAGS_STRING_SUBCLASS 
+ 
+#define PyBytes_FromStringAndSize PyString_FromStringAndSize 
+#define PyBytes_FromString PyString_FromString 
+#define PyBytes_FromFormatV PyString_FromFormatV 
+#define PyBytes_FromFormat PyString_FromFormat 
+#define PyBytes_Size PyString_Size 
+#define PyBytes_AsString PyString_AsString 
+#define PyBytes_Repr PyString_Repr 
+#define PyBytes_Concat PyString_Concat 
+#define PyBytes_ConcatAndDel PyString_ConcatAndDel 
+#define _PyBytes_Resize _PyString_Resize 
+#define _PyBytes_Eq _PyString_Eq 
+#define PyBytes_Format PyString_Format 
+#define _PyBytes_FormatLong _PyString_FormatLong 
+#define PyBytes_DecodeEscape PyString_DecodeEscape 
+#define _PyBytes_Join _PyString_Join 
+#define PyBytes_AsStringAndSize PyString_AsStringAndSize 
+#define _PyBytes_InsertThousandsGrouping _PyString_InsertThousandsGrouping 
diff --git a/contrib/tools/python/src/Include/cStringIO.h b/contrib/tools/python/src/Include/cStringIO.h
index 973a471086..751b702e08 100644
--- a/contrib/tools/python/src/Include/cStringIO.h
+++ b/contrib/tools/python/src/Include/cStringIO.h
@@ -1,73 +1,73 @@
-#ifndef Py_CSTRINGIO_H
-#define Py_CSTRINGIO_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
-
-  This header provides access to cStringIO objects from C.
-  Functions are provided for calling cStringIO objects and
+#ifndef Py_CSTRINGIO_H 
+#define Py_CSTRINGIO_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+/* 
+ 
+  This header provides access to cStringIO objects from C. 
+  Functions are provided for calling cStringIO objects and 
   macros are provided for testing whether you have cStringIO
-  objects.
-
-  Before calling any of the functions or macros, you must initialize
-  the routines with:
-
-    PycString_IMPORT
-
-  This would typically be done in your init function.
-
-*/
-
-#define PycStringIO_CAPSULE_NAME "cStringIO.cStringIO_CAPI"
-
-#define PycString_IMPORT \
-  PycStringIO = ((struct PycStringIO_CAPI*)PyCapsule_Import(\
-    PycStringIO_CAPSULE_NAME, 0))
-
-/* Basic functions to manipulate cStringIO objects from C */
-
-static struct PycStringIO_CAPI {
-
- /* Read a string from an input object.  If the last argument
-    is -1, the remainder will be read.
-    */
-  int(*cread)(PyObject *, char **, Py_ssize_t);
-
- /* Read a line from an input object.  Returns the length of the read
-    line as an int and a pointer inside the object buffer as char** (so
-    the caller doesn't have to provide its own buffer as destination).
-    */
-  int(*creadline)(PyObject *, char **);
-
-  /* Write a string to an output object*/
-  int(*cwrite)(PyObject *, const char *, Py_ssize_t);
-
-  /* Get the output object as a Python string (returns new reference). */
-  PyObject *(*cgetvalue)(PyObject *);
-
-  /* Create a new output object */
-  PyObject *(*NewOutput)(int);
-
-  /* Create an input object from a Python string
-     (copies the Python string reference).
-     */
-  PyObject *(*NewInput)(PyObject *);
-
-  /* The Python types for cStringIO input and output objects.
-     Note that you can do input on an output object.
-     */
-  PyTypeObject *InputType, *OutputType;
-
-} *PycStringIO;
-
-/* These can be used to test if you have one */
-#define PycStringIO_InputCheck(O) \
-  (Py_TYPE(O)==PycStringIO->InputType)
-#define PycStringIO_OutputCheck(O) \
-  (Py_TYPE(O)==PycStringIO->OutputType)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_CSTRINGIO_H */
+  objects. 
+ 
+  Before calling any of the functions or macros, you must initialize 
+  the routines with: 
+ 
+    PycString_IMPORT 
+ 
+  This would typically be done in your init function. 
+ 
+*/ 
+ 
+#define PycStringIO_CAPSULE_NAME "cStringIO.cStringIO_CAPI" 
+ 
+#define PycString_IMPORT \ 
+  PycStringIO = ((struct PycStringIO_CAPI*)PyCapsule_Import(\ 
+    PycStringIO_CAPSULE_NAME, 0)) 
+ 
+/* Basic functions to manipulate cStringIO objects from C */ 
+ 
+static struct PycStringIO_CAPI { 
+
+ /* Read a string from an input object.  If the last argument 
+    is -1, the remainder will be read. 
+    */ 
+  int(*cread)(PyObject *, char **, Py_ssize_t); 
+ 
+ /* Read a line from an input object.  Returns the length of the read 
+    line as an int and a pointer inside the object buffer as char** (so 
+    the caller doesn't have to provide its own buffer as destination). 
+    */ 
+  int(*creadline)(PyObject *, char **); 
+ 
+  /* Write a string to an output object*/ 
+  int(*cwrite)(PyObject *, const char *, Py_ssize_t); 
+ 
+  /* Get the output object as a Python string (returns new reference). */ 
+  PyObject *(*cgetvalue)(PyObject *); 
+ 
+  /* Create a new output object */ 
+  PyObject *(*NewOutput)(int); 
+ 
+  /* Create an input object from a Python string 
+     (copies the Python string reference). 
+     */ 
+  PyObject *(*NewInput)(PyObject *); 
+ 
+  /* The Python types for cStringIO input and output objects. 
+     Note that you can do input on an output object. 
+     */ 
+  PyTypeObject *InputType, *OutputType; 
+ 
+} *PycStringIO; 
+ 
+/* These can be used to test if you have one */ 
+#define PycStringIO_InputCheck(O) \ 
+  (Py_TYPE(O)==PycStringIO->InputType) 
+#define PycStringIO_OutputCheck(O) \ 
+  (Py_TYPE(O)==PycStringIO->OutputType) 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_CSTRINGIO_H */ 
diff --git a/contrib/tools/python/src/Include/cellobject.h b/contrib/tools/python/src/Include/cellobject.h
index c927ee5da1..b927cd1f2a 100644
--- a/contrib/tools/python/src/Include/cellobject.h
+++ b/contrib/tools/python/src/Include/cellobject.h
@@ -1,28 +1,28 @@
-/* Cell object interface */
-
-#ifndef Py_CELLOBJECT_H
-#define Py_CELLOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
-	PyObject_HEAD
-	PyObject *ob_ref;	/* Content of the cell or NULL when empty */
-} PyCellObject;
-
-PyAPI_DATA(PyTypeObject) PyCell_Type;
-
-#define PyCell_Check(op) (Py_TYPE(op) == &PyCell_Type)
-
-PyAPI_FUNC(PyObject *) PyCell_New(PyObject *);
-PyAPI_FUNC(PyObject *) PyCell_Get(PyObject *);
-PyAPI_FUNC(int) PyCell_Set(PyObject *, PyObject *);
-
-#define PyCell_GET(op) (((PyCellObject *)(op))->ob_ref)
-#define PyCell_SET(op, v) (((PyCellObject *)(op))->ob_ref = v)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_TUPLEOBJECT_H */
+/* Cell object interface */ 
+ 
+#ifndef Py_CELLOBJECT_H 
+#define Py_CELLOBJECT_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+typedef struct { 
+	PyObject_HEAD 
+	PyObject *ob_ref;	/* Content of the cell or NULL when empty */ 
+} PyCellObject; 
+ 
+PyAPI_DATA(PyTypeObject) PyCell_Type; 
+ 
+#define PyCell_Check(op) (Py_TYPE(op) == &PyCell_Type) 
+ 
+PyAPI_FUNC(PyObject *) PyCell_New(PyObject *); 
+PyAPI_FUNC(PyObject *) PyCell_Get(PyObject *); 
+PyAPI_FUNC(int) PyCell_Set(PyObject *, PyObject *); 
+ 
+#define PyCell_GET(op) (((PyCellObject *)(op))->ob_ref) 
+#define PyCell_SET(op, v) (((PyCellObject *)(op))->ob_ref = v) 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_TUPLEOBJECT_H */ 
diff --git a/contrib/tools/python/src/Include/ceval.h b/contrib/tools/python/src/Include/ceval.h
index f46160158e..38cc42eb7f 100644
--- a/contrib/tools/python/src/Include/ceval.h
+++ b/contrib/tools/python/src/Include/ceval.h
@@ -1,154 +1,154 @@
-#ifndef Py_CEVAL_H
-#define Py_CEVAL_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Interface to random parts in ceval.c */
-
-PyAPI_FUNC(PyObject *) PyEval_CallObjectWithKeywords(
-    PyObject *, PyObject *, PyObject *);
-
-/* Inline this */
-#define PyEval_CallObject(func,arg) \
-    PyEval_CallObjectWithKeywords(func, arg, (PyObject *)NULL)
-
-PyAPI_FUNC(PyObject *) PyEval_CallFunction(PyObject *obj,
-                                           const char *format, ...);
-PyAPI_FUNC(PyObject *) PyEval_CallMethod(PyObject *obj,
-                                         const char *methodname,
-                                         const char *format, ...);
-
-PyAPI_FUNC(void) PyEval_SetProfile(Py_tracefunc, PyObject *);
-PyAPI_FUNC(void) PyEval_SetTrace(Py_tracefunc, PyObject *);
-
-struct _frame; /* Avoid including frameobject.h */
-
-PyAPI_FUNC(PyObject *) PyEval_GetBuiltins(void);
-PyAPI_FUNC(PyObject *) PyEval_GetGlobals(void);
-PyAPI_FUNC(PyObject *) PyEval_GetLocals(void);
-PyAPI_FUNC(struct _frame *) PyEval_GetFrame(void);
-PyAPI_FUNC(int) PyEval_GetRestricted(void);
-
-/* Look at the current frame's (if any) code's co_flags, and turn on
-   the corresponding compiler flags in cf->cf_flags.  Return 1 if any
-   flag was set, else return 0. */
-PyAPI_FUNC(int) PyEval_MergeCompilerFlags(PyCompilerFlags *cf);
-
-PyAPI_FUNC(int) Py_FlushLine(void);
-
-PyAPI_FUNC(int) Py_AddPendingCall(int (*func)(void *), void *arg);
-PyAPI_FUNC(int) Py_MakePendingCalls(void);
-
-/* Protection against deeply nested recursive calls */
-PyAPI_FUNC(void) Py_SetRecursionLimit(int);
-PyAPI_FUNC(int) Py_GetRecursionLimit(void);
-
-#define Py_EnterRecursiveCall(where)                                    \
-            (_Py_MakeRecCheck(PyThreadState_GET()->recursion_depth) &&  \
-             _Py_CheckRecursiveCall(where))
-#define Py_LeaveRecursiveCall()                         \
-            (--PyThreadState_GET()->recursion_depth)
+#ifndef Py_CEVAL_H 
+#define Py_CEVAL_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+ 
+/* Interface to random parts in ceval.c */ 
+ 
+PyAPI_FUNC(PyObject *) PyEval_CallObjectWithKeywords( 
+    PyObject *, PyObject *, PyObject *); 
+ 
+/* Inline this */ 
+#define PyEval_CallObject(func,arg) \ 
+    PyEval_CallObjectWithKeywords(func, arg, (PyObject *)NULL) 
+ 
+PyAPI_FUNC(PyObject *) PyEval_CallFunction(PyObject *obj, 
+                                           const char *format, ...); 
+PyAPI_FUNC(PyObject *) PyEval_CallMethod(PyObject *obj, 
+                                         const char *methodname, 
+                                         const char *format, ...); 
+ 
+PyAPI_FUNC(void) PyEval_SetProfile(Py_tracefunc, PyObject *); 
+PyAPI_FUNC(void) PyEval_SetTrace(Py_tracefunc, PyObject *); 
+ 
+struct _frame; /* Avoid including frameobject.h */ 
+ 
+PyAPI_FUNC(PyObject *) PyEval_GetBuiltins(void); 
+PyAPI_FUNC(PyObject *) PyEval_GetGlobals(void); 
+PyAPI_FUNC(PyObject *) PyEval_GetLocals(void); 
+PyAPI_FUNC(struct _frame *) PyEval_GetFrame(void); 
+PyAPI_FUNC(int) PyEval_GetRestricted(void); 
+ 
+/* Look at the current frame's (if any) code's co_flags, and turn on 
+   the corresponding compiler flags in cf->cf_flags.  Return 1 if any 
+   flag was set, else return 0. */ 
+PyAPI_FUNC(int) PyEval_MergeCompilerFlags(PyCompilerFlags *cf); 
+ 
+PyAPI_FUNC(int) Py_FlushLine(void); 
+ 
+PyAPI_FUNC(int) Py_AddPendingCall(int (*func)(void *), void *arg); 
+PyAPI_FUNC(int) Py_MakePendingCalls(void); 
+ 
+/* Protection against deeply nested recursive calls */ 
+PyAPI_FUNC(void) Py_SetRecursionLimit(int); 
+PyAPI_FUNC(int) Py_GetRecursionLimit(void); 
+ 
+#define Py_EnterRecursiveCall(where)                                    \ 
+            (_Py_MakeRecCheck(PyThreadState_GET()->recursion_depth) &&  \ 
+             _Py_CheckRecursiveCall(where)) 
+#define Py_LeaveRecursiveCall()                         \ 
+            (--PyThreadState_GET()->recursion_depth) 
 PyAPI_FUNC(int) _Py_CheckRecursiveCall(const char *where);
-PyAPI_DATA(int) _Py_CheckRecursionLimit;
-#ifdef USE_STACKCHECK
-#  define _Py_MakeRecCheck(x)  (++(x) > --_Py_CheckRecursionLimit)
-#else
-#  define _Py_MakeRecCheck(x)  (++(x) > _Py_CheckRecursionLimit)
-#endif
-
-PyAPI_FUNC(const char *) PyEval_GetFuncName(PyObject *);
-PyAPI_FUNC(const char *) PyEval_GetFuncDesc(PyObject *);
-
-PyAPI_FUNC(PyObject *) PyEval_GetCallStats(PyObject *);
-PyAPI_FUNC(PyObject *) PyEval_EvalFrame(struct _frame *);
-PyAPI_FUNC(PyObject *) PyEval_EvalFrameEx(struct _frame *f, int exc);
-
-/* this used to be handled on a per-thread basis - now just two globals */
-PyAPI_DATA(volatile int) _Py_Ticker;
-PyAPI_DATA(int) _Py_CheckInterval;
-
-/* Interface for threads.
-
-   A module that plans to do a blocking system call (or something else
-   that lasts a long time and doesn't touch Python data) can allow other
-   threads to run as follows:
-
-    ...preparations here...
-    Py_BEGIN_ALLOW_THREADS
-    ...blocking system call here...
-    Py_END_ALLOW_THREADS
-    ...interpret result here...
-
-   The Py_BEGIN_ALLOW_THREADS/Py_END_ALLOW_THREADS pair expands to a
-   {}-surrounded block.
-   To leave the block in the middle (e.g., with return), you must insert
-   a line containing Py_BLOCK_THREADS before the return, e.g.
-
-    if (...premature_exit...) {
-        Py_BLOCK_THREADS
-        PyErr_SetFromErrno(PyExc_IOError);
-        return NULL;
-    }
-
-   An alternative is:
-
-    Py_BLOCK_THREADS
-    if (...premature_exit...) {
-        PyErr_SetFromErrno(PyExc_IOError);
-        return NULL;
-    }
-    Py_UNBLOCK_THREADS
-
-   For convenience, that the value of 'errno' is restored across
-   Py_END_ALLOW_THREADS and Py_BLOCK_THREADS.
-
-   WARNING: NEVER NEST CALLS TO Py_BEGIN_ALLOW_THREADS AND
-   Py_END_ALLOW_THREADS!!!
-
-   The function PyEval_InitThreads() should be called only from
-   initthread() in "threadmodule.c".
-
-   Note that not yet all candidates have been converted to use this
-   mechanism!
-*/
-
-PyAPI_FUNC(PyThreadState *) PyEval_SaveThread(void);
-PyAPI_FUNC(void) PyEval_RestoreThread(PyThreadState *);
-
-#ifdef WITH_THREAD
-
-PyAPI_FUNC(int)  PyEval_ThreadsInitialized(void);
-PyAPI_FUNC(void) PyEval_InitThreads(void);
-PyAPI_FUNC(void) PyEval_AcquireLock(void);
-PyAPI_FUNC(void) PyEval_ReleaseLock(void);
-PyAPI_FUNC(void) PyEval_AcquireThread(PyThreadState *tstate);
-PyAPI_FUNC(void) PyEval_ReleaseThread(PyThreadState *tstate);
-PyAPI_FUNC(void) PyEval_ReInitThreads(void);
-
-#define Py_BEGIN_ALLOW_THREADS { \
-                        PyThreadState *_save; \
-                        _save = PyEval_SaveThread();
-#define Py_BLOCK_THREADS        PyEval_RestoreThread(_save);
-#define Py_UNBLOCK_THREADS      _save = PyEval_SaveThread();
-#define Py_END_ALLOW_THREADS    PyEval_RestoreThread(_save); \
-                 }
-
-#else /* !WITH_THREAD */
-
-#define Py_BEGIN_ALLOW_THREADS {
-#define Py_BLOCK_THREADS
-#define Py_UNBLOCK_THREADS
-#define Py_END_ALLOW_THREADS }
-
-#endif /* !WITH_THREAD */
-
-PyAPI_FUNC(int) _PyEval_SliceIndex(PyObject *, Py_ssize_t *);
+PyAPI_DATA(int) _Py_CheckRecursionLimit; 
+#ifdef USE_STACKCHECK 
+#  define _Py_MakeRecCheck(x)  (++(x) > --_Py_CheckRecursionLimit) 
+#else 
+#  define _Py_MakeRecCheck(x)  (++(x) > _Py_CheckRecursionLimit) 
+#endif 
+ 
+PyAPI_FUNC(const char *) PyEval_GetFuncName(PyObject *); 
+PyAPI_FUNC(const char *) PyEval_GetFuncDesc(PyObject *); 
+ 
+PyAPI_FUNC(PyObject *) PyEval_GetCallStats(PyObject *); 
+PyAPI_FUNC(PyObject *) PyEval_EvalFrame(struct _frame *); 
+PyAPI_FUNC(PyObject *) PyEval_EvalFrameEx(struct _frame *f, int exc); 
+ 
+/* this used to be handled on a per-thread basis - now just two globals */ 
+PyAPI_DATA(volatile int) _Py_Ticker; 
+PyAPI_DATA(int) _Py_CheckInterval; 
+ 
+/* Interface for threads. 
+ 
+   A module that plans to do a blocking system call (or something else 
+   that lasts a long time and doesn't touch Python data) can allow other 
+   threads to run as follows: 
+ 
+    ...preparations here... 
+    Py_BEGIN_ALLOW_THREADS 
+    ...blocking system call here... 
+    Py_END_ALLOW_THREADS 
+    ...interpret result here... 
+ 
+   The Py_BEGIN_ALLOW_THREADS/Py_END_ALLOW_THREADS pair expands to a 
+   {}-surrounded block. 
+   To leave the block in the middle (e.g., with return), you must insert 
+   a line containing Py_BLOCK_THREADS before the return, e.g. 
+ 
+    if (...premature_exit...) { 
+        Py_BLOCK_THREADS 
+        PyErr_SetFromErrno(PyExc_IOError); 
+        return NULL; 
+    } 
+ 
+   An alternative is: 
+ 
+    Py_BLOCK_THREADS 
+    if (...premature_exit...) { 
+        PyErr_SetFromErrno(PyExc_IOError); 
+        return NULL; 
+    } 
+    Py_UNBLOCK_THREADS 
+ 
+   For convenience, that the value of 'errno' is restored across 
+   Py_END_ALLOW_THREADS and Py_BLOCK_THREADS. 
+ 
+   WARNING: NEVER NEST CALLS TO Py_BEGIN_ALLOW_THREADS AND 
+   Py_END_ALLOW_THREADS!!! 
+ 
+   The function PyEval_InitThreads() should be called only from 
+   initthread() in "threadmodule.c". 
+ 
+   Note that not yet all candidates have been converted to use this 
+   mechanism! 
+*/ 
+ 
+PyAPI_FUNC(PyThreadState *) PyEval_SaveThread(void); 
+PyAPI_FUNC(void) PyEval_RestoreThread(PyThreadState *); 
+ 
+#ifdef WITH_THREAD 
+ 
+PyAPI_FUNC(int)  PyEval_ThreadsInitialized(void); 
+PyAPI_FUNC(void) PyEval_InitThreads(void); 
+PyAPI_FUNC(void) PyEval_AcquireLock(void); 
+PyAPI_FUNC(void) PyEval_ReleaseLock(void); 
+PyAPI_FUNC(void) PyEval_AcquireThread(PyThreadState *tstate); 
+PyAPI_FUNC(void) PyEval_ReleaseThread(PyThreadState *tstate); 
+PyAPI_FUNC(void) PyEval_ReInitThreads(void); 
+ 
+#define Py_BEGIN_ALLOW_THREADS { \ 
+                        PyThreadState *_save; \ 
+                        _save = PyEval_SaveThread(); 
+#define Py_BLOCK_THREADS        PyEval_RestoreThread(_save); 
+#define Py_UNBLOCK_THREADS      _save = PyEval_SaveThread(); 
+#define Py_END_ALLOW_THREADS    PyEval_RestoreThread(_save); \ 
+                 } 
+ 
+#else /* !WITH_THREAD */ 
+ 
+#define Py_BEGIN_ALLOW_THREADS { 
+#define Py_BLOCK_THREADS 
+#define Py_UNBLOCK_THREADS 
+#define Py_END_ALLOW_THREADS } 
+ 
+#endif /* !WITH_THREAD */ 
+ 
+PyAPI_FUNC(int) _PyEval_SliceIndex(PyObject *, Py_ssize_t *); 
 PyAPI_FUNC(int) _PyEval_SliceIndexNotNone(PyObject *, Py_ssize_t *);
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_CEVAL_H */
+ 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_CEVAL_H */ 
diff --git a/contrib/tools/python/src/Include/classobject.h b/contrib/tools/python/src/Include/classobject.h
index bc03e0d027..8a4ae0c9ae 100644
--- a/contrib/tools/python/src/Include/classobject.h
+++ b/contrib/tools/python/src/Include/classobject.h
@@ -1,83 +1,83 @@
-
-/* Class object interface */
-
-/* Revealing some structures (not for general use) */
-
-#ifndef Py_CLASSOBJECT_H
-#define Py_CLASSOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
-    PyObject_HEAD
-    PyObject	*cl_bases;	/* A tuple of class objects */
-    PyObject	*cl_dict;	/* A dictionary */
-    PyObject	*cl_name;	/* A string */
-    /* The following three are functions or NULL */
-    PyObject	*cl_getattr;
-    PyObject	*cl_setattr;
-    PyObject	*cl_delattr;
-    PyObject    *cl_weakreflist; /* List of weak references */
-} PyClassObject;
-
-typedef struct {
-    PyObject_HEAD
-    PyClassObject *in_class;	/* The class object */
-    PyObject	  *in_dict;	/* A dictionary */
-    PyObject	  *in_weakreflist; /* List of weak references */
-} PyInstanceObject;
-
-typedef struct {
-    PyObject_HEAD
-    PyObject *im_func;   /* The callable object implementing the method */
-    PyObject *im_self;   /* The instance it is bound to, or NULL */
-    PyObject *im_class;  /* The class that asked for the method */
-    PyObject *im_weakreflist; /* List of weak references */
-} PyMethodObject;
-
-PyAPI_DATA(PyTypeObject) PyClass_Type, PyInstance_Type, PyMethod_Type;
-
-#define PyClass_Check(op) ((op)->ob_type == &PyClass_Type)
-#define PyInstance_Check(op) ((op)->ob_type == &PyInstance_Type)
-#define PyMethod_Check(op) ((op)->ob_type == &PyMethod_Type)
-
-PyAPI_FUNC(PyObject *) PyClass_New(PyObject *, PyObject *, PyObject *);
-PyAPI_FUNC(PyObject *) PyInstance_New(PyObject *, PyObject *,
-                                            PyObject *);
-PyAPI_FUNC(PyObject *) PyInstance_NewRaw(PyObject *, PyObject *);
-PyAPI_FUNC(PyObject *) PyMethod_New(PyObject *, PyObject *, PyObject *);
-
-PyAPI_FUNC(PyObject *) PyMethod_Function(PyObject *);
-PyAPI_FUNC(PyObject *) PyMethod_Self(PyObject *);
-PyAPI_FUNC(PyObject *) PyMethod_Class(PyObject *);
-
-/* Look up attribute with name (a string) on instance object pinst, using
- * only the instance and base class dicts.  If a descriptor is found in
- * a class dict, the descriptor is returned without calling it.
- * Returns NULL if nothing found, else a borrowed reference to the
- * value associated with name in the dict in which name was found.
- * The point of this routine is that it never calls arbitrary Python
- * code, so is always "safe":  all it does is dict lookups.  The function
- * can't fail, never sets an exception, and NULL is not an error (it just
- * means "not found").
- */
-PyAPI_FUNC(PyObject *) _PyInstance_Lookup(PyObject *pinst, PyObject *name);
-
-/* Macros for direct access to these values. Type checks are *not*
-   done, so use with care. */
-#define PyMethod_GET_FUNCTION(meth) \
-        (((PyMethodObject *)meth) -> im_func)
-#define PyMethod_GET_SELF(meth) \
-	(((PyMethodObject *)meth) -> im_self)
-#define PyMethod_GET_CLASS(meth) \
-	(((PyMethodObject *)meth) -> im_class)
-
-PyAPI_FUNC(int) PyClass_IsSubclass(PyObject *, PyObject *);
-
-PyAPI_FUNC(int) PyMethod_ClearFreeList(void);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_CLASSOBJECT_H */
+ 
+/* Class object interface */ 
+ 
+/* Revealing some structures (not for general use) */ 
+ 
+#ifndef Py_CLASSOBJECT_H 
+#define Py_CLASSOBJECT_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+typedef struct { 
+    PyObject_HEAD 
+    PyObject	*cl_bases;	/* A tuple of class objects */ 
+    PyObject	*cl_dict;	/* A dictionary */ 
+    PyObject	*cl_name;	/* A string */ 
+    /* The following three are functions or NULL */ 
+    PyObject	*cl_getattr; 
+    PyObject	*cl_setattr; 
+    PyObject	*cl_delattr; 
+    PyObject    *cl_weakreflist; /* List of weak references */ 
+} PyClassObject; 
+ 
+typedef struct { 
+    PyObject_HEAD 
+    PyClassObject *in_class;	/* The class object */ 
+    PyObject	  *in_dict;	/* A dictionary */ 
+    PyObject	  *in_weakreflist; /* List of weak references */ 
+} PyInstanceObject; 
+ 
+typedef struct { 
+    PyObject_HEAD 
+    PyObject *im_func;   /* The callable object implementing the method */ 
+    PyObject *im_self;   /* The instance it is bound to, or NULL */ 
+    PyObject *im_class;  /* The class that asked for the method */ 
+    PyObject *im_weakreflist; /* List of weak references */ 
+} PyMethodObject; 
+ 
+PyAPI_DATA(PyTypeObject) PyClass_Type, PyInstance_Type, PyMethod_Type; 
+ 
+#define PyClass_Check(op) ((op)->ob_type == &PyClass_Type) 
+#define PyInstance_Check(op) ((op)->ob_type == &PyInstance_Type) 
+#define PyMethod_Check(op) ((op)->ob_type == &PyMethod_Type) 
+ 
+PyAPI_FUNC(PyObject *) PyClass_New(PyObject *, PyObject *, PyObject *); 
+PyAPI_FUNC(PyObject *) PyInstance_New(PyObject *, PyObject *, 
+                                            PyObject *); 
+PyAPI_FUNC(PyObject *) PyInstance_NewRaw(PyObject *, PyObject *); 
+PyAPI_FUNC(PyObject *) PyMethod_New(PyObject *, PyObject *, PyObject *); 
+ 
+PyAPI_FUNC(PyObject *) PyMethod_Function(PyObject *); 
+PyAPI_FUNC(PyObject *) PyMethod_Self(PyObject *); 
+PyAPI_FUNC(PyObject *) PyMethod_Class(PyObject *); 
+ 
+/* Look up attribute with name (a string) on instance object pinst, using 
+ * only the instance and base class dicts.  If a descriptor is found in 
+ * a class dict, the descriptor is returned without calling it. 
+ * Returns NULL if nothing found, else a borrowed reference to the 
+ * value associated with name in the dict in which name was found. 
+ * The point of this routine is that it never calls arbitrary Python 
+ * code, so is always "safe":  all it does is dict lookups.  The function 
+ * can't fail, never sets an exception, and NULL is not an error (it just 
+ * means "not found"). 
+ */ 
+PyAPI_FUNC(PyObject *) _PyInstance_Lookup(PyObject *pinst, PyObject *name); 
+ 
+/* Macros for direct access to these values. Type checks are *not* 
+   done, so use with care. */ 
+#define PyMethod_GET_FUNCTION(meth) \ 
+        (((PyMethodObject *)meth) -> im_func) 
+#define PyMethod_GET_SELF(meth) \ 
+	(((PyMethodObject *)meth) -> im_self) 
+#define PyMethod_GET_CLASS(meth) \ 
+	(((PyMethodObject *)meth) -> im_class) 
+ 
+PyAPI_FUNC(int) PyClass_IsSubclass(PyObject *, PyObject *); 
+ 
+PyAPI_FUNC(int) PyMethod_ClearFreeList(void); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_CLASSOBJECT_H */ 
diff --git a/contrib/tools/python/src/Include/cobject.h b/contrib/tools/python/src/Include/cobject.h
index ad3cd9c982..6ee7c756ab 100644
--- a/contrib/tools/python/src/Include/cobject.h
+++ b/contrib/tools/python/src/Include/cobject.h
@@ -1,89 +1,89 @@
-/*
-   CObjects are marked Pending Deprecation as of Python 2.7.
-   The full schedule for 2.x is as follows:
-     - CObjects are marked Pending Deprecation in Python 2.7.
-     - CObjects will be marked Deprecated in Python 2.8
-       (if there is one).
-     - CObjects will be removed in Python 2.9 (if there is one).
-
-   Additionally, for the Python 3.x series:
-     - CObjects were marked Deprecated in Python 3.1.
-     - CObjects will be removed in Python 3.2.
-
-   You should switch all use of CObjects to capsules.  Capsules
-   have a safer and more consistent API.  For more information,
-   see Include/pycapsule.h, or read the "Capsules" topic in
-   the "Python/C API Reference Manual".
-
-   Python 2.7 no longer uses CObjects itself; all objects which
-   were formerly CObjects are now capsules.  Note that this change
-   does not by itself break binary compatibility with extensions
-   built for previous versions of Python--PyCObject_AsVoidPtr()
-   has been changed to also understand capsules.
-
-*/
-
-/* original file header comment follows: */
-
-/* C objects to be exported from one extension module to another.
- 
-   C objects are used for communication between extension modules.
-   They provide a way for an extension module to export a C interface
-   to other extension modules, so that extension modules can use the
-   Python import mechanism to link to one another.
-
-*/
-
-#ifndef Py_COBJECT_H
-#define Py_COBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_DATA(PyTypeObject) PyCObject_Type;
-
-#define PyCObject_Check(op) (Py_TYPE(op) == &PyCObject_Type)
-
-/* Create a PyCObject from a pointer to a C object and an optional
-   destructor function.  If the second argument is non-null, then it
-   will be called with the first argument if and when the PyCObject is
-   destroyed.
-
-*/
-PyAPI_FUNC(PyObject *) PyCObject_FromVoidPtr(
-	void *cobj, void (*destruct)(void*));
-
-
-/* Create a PyCObject from a pointer to a C object, a description object,
-   and an optional destructor function.  If the third argument is non-null,
-   then it will be called with the first and second arguments if and when 
-   the PyCObject is destroyed.
-*/
-PyAPI_FUNC(PyObject *) PyCObject_FromVoidPtrAndDesc(
-	void *cobj, void *desc, void (*destruct)(void*,void*));
-
-/* Retrieve a pointer to a C object from a PyCObject. */
-PyAPI_FUNC(void *) PyCObject_AsVoidPtr(PyObject *);
-
-/* Retrieve a pointer to a description object from a PyCObject. */
-PyAPI_FUNC(void *) PyCObject_GetDesc(PyObject *);
-
-/* Import a pointer to a C object from a module using a PyCObject. */
-PyAPI_FUNC(void *) PyCObject_Import(char *module_name, char *cobject_name);
-
-/* Modify a C object. Fails (==0) if object has a destructor. */
-PyAPI_FUNC(int) PyCObject_SetVoidPtr(PyObject *self, void *cobj);
-
-
-typedef struct {
-    PyObject_HEAD
-    void *cobject;
-    void *desc;
-    void (*destructor)(void *);
-} PyCObject;
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_COBJECT_H */
+/* 
+   CObjects are marked Pending Deprecation as of Python 2.7. 
+   The full schedule for 2.x is as follows: 
+     - CObjects are marked Pending Deprecation in Python 2.7. 
+     - CObjects will be marked Deprecated in Python 2.8 
+       (if there is one). 
+     - CObjects will be removed in Python 2.9 (if there is one). 
+ 
+   Additionally, for the Python 3.x series: 
+     - CObjects were marked Deprecated in Python 3.1. 
+     - CObjects will be removed in Python 3.2. 
+ 
+   You should switch all use of CObjects to capsules.  Capsules 
+   have a safer and more consistent API.  For more information, 
+   see Include/pycapsule.h, or read the "Capsules" topic in 
+   the "Python/C API Reference Manual". 
+ 
+   Python 2.7 no longer uses CObjects itself; all objects which 
+   were formerly CObjects are now capsules.  Note that this change 
+   does not by itself break binary compatibility with extensions 
+   built for previous versions of Python--PyCObject_AsVoidPtr() 
+   has been changed to also understand capsules. 
+ 
+*/ 
+ 
+/* original file header comment follows: */ 
+ 
+/* C objects to be exported from one extension module to another. 
+  
+   C objects are used for communication between extension modules. 
+   They provide a way for an extension module to export a C interface 
+   to other extension modules, so that extension modules can use the 
+   Python import mechanism to link to one another. 
+ 
+*/ 
+ 
+#ifndef Py_COBJECT_H 
+#define Py_COBJECT_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+PyAPI_DATA(PyTypeObject) PyCObject_Type; 
+ 
+#define PyCObject_Check(op) (Py_TYPE(op) == &PyCObject_Type) 
+ 
+/* Create a PyCObject from a pointer to a C object and an optional 
+   destructor function.  If the second argument is non-null, then it 
+   will be called with the first argument if and when the PyCObject is 
+   destroyed. 
+ 
+*/ 
+PyAPI_FUNC(PyObject *) PyCObject_FromVoidPtr( 
+	void *cobj, void (*destruct)(void*)); 
+ 
+ 
+/* Create a PyCObject from a pointer to a C object, a description object, 
+   and an optional destructor function.  If the third argument is non-null, 
+   then it will be called with the first and second arguments if and when  
+   the PyCObject is destroyed. 
+*/ 
+PyAPI_FUNC(PyObject *) PyCObject_FromVoidPtrAndDesc( 
+	void *cobj, void *desc, void (*destruct)(void*,void*)); 
+ 
+/* Retrieve a pointer to a C object from a PyCObject. */ 
+PyAPI_FUNC(void *) PyCObject_AsVoidPtr(PyObject *); 
+ 
+/* Retrieve a pointer to a description object from a PyCObject. */ 
+PyAPI_FUNC(void *) PyCObject_GetDesc(PyObject *); 
+ 
+/* Import a pointer to a C object from a module using a PyCObject. */ 
+PyAPI_FUNC(void *) PyCObject_Import(char *module_name, char *cobject_name); 
+ 
+/* Modify a C object. Fails (==0) if object has a destructor. */ 
+PyAPI_FUNC(int) PyCObject_SetVoidPtr(PyObject *self, void *cobj); 
+ 
+ 
+typedef struct { 
+    PyObject_HEAD 
+    void *cobject; 
+    void *desc; 
+    void (*destructor)(void *); 
+} PyCObject; 
+ 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_COBJECT_H */ 
diff --git a/contrib/tools/python/src/Include/code.h b/contrib/tools/python/src/Include/code.h
index 16aee701e0..8edd577e2b 100644
--- a/contrib/tools/python/src/Include/code.h
+++ b/contrib/tools/python/src/Include/code.h
@@ -1,103 +1,103 @@
-/* Definitions for bytecode */
-
-#ifndef Py_CODE_H
-#define Py_CODE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Bytecode object */
-typedef struct {
-    PyObject_HEAD
-    int co_argcount;		/* #arguments, except *args */
-    int co_nlocals;		/* #local variables */
-    int co_stacksize;		/* #entries needed for evaluation stack */
-    int co_flags;		/* CO_..., see below */
-    PyObject *co_code;		/* instruction opcodes */
-    PyObject *co_consts;	/* list (constants used) */
-    PyObject *co_names;		/* list of strings (names used) */
-    PyObject *co_varnames;	/* tuple of strings (local variable names) */
-    PyObject *co_freevars;	/* tuple of strings (free variable names) */
-    PyObject *co_cellvars;      /* tuple of strings (cell variable names) */
-    /* The rest doesn't count for hash/cmp */
-    PyObject *co_filename;	/* string (where it was loaded from) */
-    PyObject *co_name;		/* string (name, for reference) */
-    int co_firstlineno;		/* first source line number */
-    PyObject *co_lnotab;	/* string (encoding addr<->lineno mapping) See
-				   Objects/lnotab_notes.txt for details. */
-    void *co_zombieframe;     /* for optimization only (see frameobject.c) */
-    PyObject *co_weakreflist;   /* to support weakrefs to code objects */
-} PyCodeObject;
-
-/* Masks for co_flags above */
-#define CO_OPTIMIZED	0x0001
-#define CO_NEWLOCALS	0x0002
-#define CO_VARARGS	0x0004
-#define CO_VARKEYWORDS	0x0008
-#define CO_NESTED       0x0010
-#define CO_GENERATOR    0x0020
-/* The CO_NOFREE flag is set if there are no free or cell variables.
-   This information is redundant, but it allows a single flag test
-   to determine whether there is any extra work to be done when the
-   call frame it setup.
-*/
-#define CO_NOFREE       0x0040
-
-#if 0
-/* This is no longer used.  Stopped defining in 2.5, do not re-use. */
-#define CO_GENERATOR_ALLOWED    0x1000
-#endif
-#define CO_FUTURE_DIVISION    	0x2000
-#define CO_FUTURE_ABSOLUTE_IMPORT 0x4000 /* do absolute imports by default */
-#define CO_FUTURE_WITH_STATEMENT  0x8000
-#define CO_FUTURE_PRINT_FUNCTION  0x10000
-#define CO_FUTURE_UNICODE_LITERALS 0x20000
-
-/* This should be defined if a future statement modifies the syntax.
-   For example, when a keyword is added.
-*/
-#if 1
-#define PY_PARSER_REQUIRES_FUTURE_KEYWORD
-#endif
-
-#define CO_MAXBLOCKS 20 /* Max static block nesting within a function */
-
-PyAPI_DATA(PyTypeObject) PyCode_Type;
-
-#define PyCode_Check(op) (Py_TYPE(op) == &PyCode_Type)
-#define PyCode_GetNumFree(op) (PyTuple_GET_SIZE((op)->co_freevars))
-
-/* Public interface */
-PyAPI_FUNC(PyCodeObject *) PyCode_New(
-	int, int, int, int, PyObject *, PyObject *, PyObject *, PyObject *,
+/* Definitions for bytecode */ 
+ 
+#ifndef Py_CODE_H 
+#define Py_CODE_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+/* Bytecode object */ 
+typedef struct { 
+    PyObject_HEAD 
+    int co_argcount;		/* #arguments, except *args */ 
+    int co_nlocals;		/* #local variables */ 
+    int co_stacksize;		/* #entries needed for evaluation stack */ 
+    int co_flags;		/* CO_..., see below */ 
+    PyObject *co_code;		/* instruction opcodes */ 
+    PyObject *co_consts;	/* list (constants used) */ 
+    PyObject *co_names;		/* list of strings (names used) */ 
+    PyObject *co_varnames;	/* tuple of strings (local variable names) */ 
+    PyObject *co_freevars;	/* tuple of strings (free variable names) */ 
+    PyObject *co_cellvars;      /* tuple of strings (cell variable names) */ 
+    /* The rest doesn't count for hash/cmp */ 
+    PyObject *co_filename;	/* string (where it was loaded from) */ 
+    PyObject *co_name;		/* string (name, for reference) */ 
+    int co_firstlineno;		/* first source line number */ 
+    PyObject *co_lnotab;	/* string (encoding addr<->lineno mapping) See 
+				   Objects/lnotab_notes.txt for details. */ 
+    void *co_zombieframe;     /* for optimization only (see frameobject.c) */ 
+    PyObject *co_weakreflist;   /* to support weakrefs to code objects */ 
+} PyCodeObject; 
+ 
+/* Masks for co_flags above */ 
+#define CO_OPTIMIZED	0x0001 
+#define CO_NEWLOCALS	0x0002 
+#define CO_VARARGS	0x0004 
+#define CO_VARKEYWORDS	0x0008 
+#define CO_NESTED       0x0010 
+#define CO_GENERATOR    0x0020 
+/* The CO_NOFREE flag is set if there are no free or cell variables. 
+   This information is redundant, but it allows a single flag test 
+   to determine whether there is any extra work to be done when the 
+   call frame it setup. 
+*/ 
+#define CO_NOFREE       0x0040 
+ 
+#if 0 
+/* This is no longer used.  Stopped defining in 2.5, do not re-use. */ 
+#define CO_GENERATOR_ALLOWED    0x1000 
+#endif 
+#define CO_FUTURE_DIVISION    	0x2000 
+#define CO_FUTURE_ABSOLUTE_IMPORT 0x4000 /* do absolute imports by default */ 
+#define CO_FUTURE_WITH_STATEMENT  0x8000 
+#define CO_FUTURE_PRINT_FUNCTION  0x10000 
+#define CO_FUTURE_UNICODE_LITERALS 0x20000 
+ 
+/* This should be defined if a future statement modifies the syntax. 
+   For example, when a keyword is added. 
+*/ 
+#if 1 
+#define PY_PARSER_REQUIRES_FUTURE_KEYWORD 
+#endif 
+ 
+#define CO_MAXBLOCKS 20 /* Max static block nesting within a function */ 
+ 
+PyAPI_DATA(PyTypeObject) PyCode_Type; 
+ 
+#define PyCode_Check(op) (Py_TYPE(op) == &PyCode_Type) 
+#define PyCode_GetNumFree(op) (PyTuple_GET_SIZE((op)->co_freevars)) 
+ 
+/* Public interface */ 
+PyAPI_FUNC(PyCodeObject *) PyCode_New( 
+	int, int, int, int, PyObject *, PyObject *, PyObject *, PyObject *, 
 	PyObject *, PyObject *, PyObject *, PyObject *, int, PyObject *);
-        /* same as struct above */
-
-/* Creates a new empty code object with the specified source location. */
-PyAPI_FUNC(PyCodeObject *)
-PyCode_NewEmpty(const char *filename, const char *funcname, int firstlineno);
-
-/* Return the line number associated with the specified bytecode index
-   in this code object.  If you just need the line number of a frame,
-   use PyFrame_GetLineNumber() instead. */
-PyAPI_FUNC(int) PyCode_Addr2Line(PyCodeObject *, int);
-
-/* for internal use only */
-#define _PyCode_GETCODEPTR(co, pp) \
-	((*Py_TYPE((co)->co_code)->tp_as_buffer->bf_getreadbuffer) \
-	 ((co)->co_code, 0, (void **)(pp)))
-
-typedef struct _addr_pair {
-        int ap_lower;
-        int ap_upper;
-} PyAddrPair;
-
-/* Update *bounds to describe the first and one-past-the-last instructions in the
-   same line as lasti.  Return the number of that line.
-*/
-PyAPI_FUNC(int) _PyCode_CheckLineNumber(PyCodeObject* co,
-                                        int lasti, PyAddrPair *bounds);
-
+        /* same as struct above */ 
+ 
+/* Creates a new empty code object with the specified source location. */ 
+PyAPI_FUNC(PyCodeObject *) 
+PyCode_NewEmpty(const char *filename, const char *funcname, int firstlineno); 
+ 
+/* Return the line number associated with the specified bytecode index 
+   in this code object.  If you just need the line number of a frame, 
+   use PyFrame_GetLineNumber() instead. */ 
+PyAPI_FUNC(int) PyCode_Addr2Line(PyCodeObject *, int); 
+ 
+/* for internal use only */ 
+#define _PyCode_GETCODEPTR(co, pp) \ 
+	((*Py_TYPE((co)->co_code)->tp_as_buffer->bf_getreadbuffer) \ 
+	 ((co)->co_code, 0, (void **)(pp))) 
+ 
+typedef struct _addr_pair { 
+        int ap_lower; 
+        int ap_upper; 
+} PyAddrPair; 
+ 
+/* Update *bounds to describe the first and one-past-the-last instructions in the 
+   same line as lasti.  Return the number of that line. 
+*/ 
+PyAPI_FUNC(int) _PyCode_CheckLineNumber(PyCodeObject* co, 
+                                        int lasti, PyAddrPair *bounds); 
+ 
 /* Create a comparable key used to compare constants taking in account the
  * object type. It is used to make sure types are not coerced (e.g., float and
  * complex) _and_ to distinguish 0.0 from -0.0 e.g. on IEEE platforms
@@ -107,10 +107,10 @@ PyAPI_FUNC(int) _PyCode_CheckLineNumber(PyCodeObject* co,
  * compare bytes and str which can raise a BytesWarning exception. */
 PyAPI_FUNC(PyObject*) _PyCode_ConstantKey(PyObject *obj);
 
-PyAPI_FUNC(PyObject*) PyCode_Optimize(PyObject *code, PyObject* consts,
+PyAPI_FUNC(PyObject*) PyCode_Optimize(PyObject *code, PyObject* consts, 
                                       PyObject *names, PyObject *lnotab);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_CODE_H */
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_CODE_H */ 
diff --git a/contrib/tools/python/src/Include/codecs.h b/contrib/tools/python/src/Include/codecs.h
index 851bc9f107..29edfd3112 100644
--- a/contrib/tools/python/src/Include/codecs.h
+++ b/contrib/tools/python/src/Include/codecs.h
@@ -1,86 +1,86 @@
-#ifndef Py_CODECREGISTRY_H
-#define Py_CODECREGISTRY_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* ------------------------------------------------------------------------
-
-   Python Codec Registry and support functions
-
-
-Written by Marc-Andre Lemburg (mal@lemburg.com).
-
-Copyright (c) Corporation for National Research Initiatives.
-
-   ------------------------------------------------------------------------ */
-
-/* Register a new codec search function.
-
-   As side effect, this tries to load the encodings package, if not
-   yet done, to make sure that it is always first in the list of
-   search functions.
-
-   The search_function's refcount is incremented by this function. */
-
-PyAPI_FUNC(int) PyCodec_Register(
-       PyObject *search_function
-       );
-
-/* Codec register lookup API.
-
-   Looks up the given encoding and returns a CodecInfo object with
-   function attributes which implement the different aspects of
-   processing the encoding.
-
-   The encoding string is looked up converted to all lower-case
-   characters. This makes encodings looked up through this mechanism
-   effectively case-insensitive.
-
-   If no codec is found, a KeyError is set and NULL returned.
-
-   As side effect, this tries to load the encodings package, if not
-   yet done. This is part of the lazy load strategy for the encodings
-   package.
-
- */
-
-PyAPI_FUNC(PyObject *) _PyCodec_Lookup(
-       const char *encoding
-       );
-
-/* Generic codec based encoding API.
-
-   object is passed through the encoder function found for the given
-   encoding using the error handling method defined by errors. errors
-   may be NULL to use the default method defined for the codec.
-   
-   Raises a LookupError in case no encoder can be found.
-
- */
-
-PyAPI_FUNC(PyObject *) PyCodec_Encode(
-       PyObject *object,
-       const char *encoding,
-       const char *errors
-       );
-
-/* Generic codec based decoding API.
-
-   object is passed through the decoder function found for the given
-   encoding using the error handling method defined by errors. errors
-   may be NULL to use the default method defined for the codec.
-   
-   Raises a LookupError in case no encoder can be found.
-
- */
-
-PyAPI_FUNC(PyObject *) PyCodec_Decode(
-       PyObject *object,
-       const char *encoding,
-       const char *errors
-       );
-
+#ifndef Py_CODECREGISTRY_H 
+#define Py_CODECREGISTRY_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+/* ------------------------------------------------------------------------ 
+ 
+   Python Codec Registry and support functions 
+ 
+ 
+Written by Marc-Andre Lemburg (mal@lemburg.com). 
+ 
+Copyright (c) Corporation for National Research Initiatives. 
+ 
+   ------------------------------------------------------------------------ */ 
+ 
+/* Register a new codec search function. 
+ 
+   As side effect, this tries to load the encodings package, if not 
+   yet done, to make sure that it is always first in the list of 
+   search functions. 
+ 
+   The search_function's refcount is incremented by this function. */ 
+ 
+PyAPI_FUNC(int) PyCodec_Register( 
+       PyObject *search_function 
+       ); 
+ 
+/* Codec register lookup API. 
+ 
+   Looks up the given encoding and returns a CodecInfo object with 
+   function attributes which implement the different aspects of 
+   processing the encoding. 
+ 
+   The encoding string is looked up converted to all lower-case 
+   characters. This makes encodings looked up through this mechanism 
+   effectively case-insensitive. 
+ 
+   If no codec is found, a KeyError is set and NULL returned. 
+ 
+   As side effect, this tries to load the encodings package, if not 
+   yet done. This is part of the lazy load strategy for the encodings 
+   package. 
+ 
+ */ 
+ 
+PyAPI_FUNC(PyObject *) _PyCodec_Lookup( 
+       const char *encoding 
+       ); 
+ 
+/* Generic codec based encoding API. 
+ 
+   object is passed through the encoder function found for the given 
+   encoding using the error handling method defined by errors. errors 
+   may be NULL to use the default method defined for the codec. 
+    
+   Raises a LookupError in case no encoder can be found. 
+ 
+ */ 
+ 
+PyAPI_FUNC(PyObject *) PyCodec_Encode( 
+       PyObject *object, 
+       const char *encoding, 
+       const char *errors 
+       ); 
+ 
+/* Generic codec based decoding API. 
+ 
+   object is passed through the decoder function found for the given 
+   encoding using the error handling method defined by errors. errors 
+   may be NULL to use the default method defined for the codec. 
+    
+   Raises a LookupError in case no encoder can be found. 
+ 
+ */ 
+ 
+PyAPI_FUNC(PyObject *) PyCodec_Decode( 
+       PyObject *object, 
+       const char *encoding, 
+       const char *errors 
+       ); 
+ 
 /* Text codec specific encoding and decoding API.
 
    Checks the encoding against a list of codecs which do not
@@ -126,87 +126,87 @@ PyAPI_FUNC(PyObject *) _PyCodecInfo_GetIncrementalEncoder(
 
 
 
-/* --- Codec Lookup APIs -------------------------------------------------- 
-
-   All APIs return a codec object with incremented refcount and are
-   based on _PyCodec_Lookup().  The same comments w/r to the encoding
-   name also apply to these APIs.
-
-*/
-
-/* Get an encoder function for the given encoding. */
-
-PyAPI_FUNC(PyObject *) PyCodec_Encoder(
-       const char *encoding
-       );
-
-/* Get a decoder function for the given encoding. */
-
-PyAPI_FUNC(PyObject *) PyCodec_Decoder(
-       const char *encoding
-       );
-
+/* --- Codec Lookup APIs --------------------------------------------------  
+ 
+   All APIs return a codec object with incremented refcount and are 
+   based on _PyCodec_Lookup().  The same comments w/r to the encoding 
+   name also apply to these APIs. 
+ 
+*/ 
+ 
+/* Get an encoder function for the given encoding. */ 
+ 
+PyAPI_FUNC(PyObject *) PyCodec_Encoder( 
+       const char *encoding 
+       ); 
+ 
+/* Get a decoder function for the given encoding. */ 
+ 
+PyAPI_FUNC(PyObject *) PyCodec_Decoder( 
+       const char *encoding 
+       ); 
+ 
 /* Get an IncrementalEncoder object for the given encoding. */
-
-PyAPI_FUNC(PyObject *) PyCodec_IncrementalEncoder(
-       const char *encoding,
-       const char *errors
-       );
-
+ 
+PyAPI_FUNC(PyObject *) PyCodec_IncrementalEncoder( 
+       const char *encoding, 
+       const char *errors 
+       ); 
+ 
 /* Get an IncrementalDecoder object function for the given encoding. */
-
-PyAPI_FUNC(PyObject *) PyCodec_IncrementalDecoder(
-       const char *encoding,
-       const char *errors
-       );
-
-/* Get a StreamReader factory function for the given encoding. */
-
-PyAPI_FUNC(PyObject *) PyCodec_StreamReader(
-       const char *encoding,
-       PyObject *stream,
-       const char *errors
-       );
-
-/* Get a StreamWriter factory function for the given encoding. */
-
-PyAPI_FUNC(PyObject *) PyCodec_StreamWriter(
-       const char *encoding,
-       PyObject *stream,
-       const char *errors
-       );
-
-/* Unicode encoding error handling callback registry API */
-
-/* Register the error handling callback function error under the given
-   name. This function will be called by the codec when it encounters
-   unencodable characters/undecodable bytes and doesn't know the
-   callback name, when name is specified as the error parameter
-   in the call to the encode/decode function.
-   Return 0 on success, -1 on error */
-PyAPI_FUNC(int) PyCodec_RegisterError(const char *name, PyObject *error);
-
-/* Lookup the error handling callback function registered under the given
-   name. As a special case NULL can be passed, in which case
-   the error handling callback for "strict" will be returned. */
-PyAPI_FUNC(PyObject *) PyCodec_LookupError(const char *name);
-
-/* raise exc as an exception */
-PyAPI_FUNC(PyObject *) PyCodec_StrictErrors(PyObject *exc);
-
-/* ignore the unicode error, skipping the faulty input */
-PyAPI_FUNC(PyObject *) PyCodec_IgnoreErrors(PyObject *exc);
-
-/* replace the unicode encode error with ? or U+FFFD */
-PyAPI_FUNC(PyObject *) PyCodec_ReplaceErrors(PyObject *exc);
-
-/* replace the unicode encode error with XML character references */
-PyAPI_FUNC(PyObject *) PyCodec_XMLCharRefReplaceErrors(PyObject *exc);
-
-/* replace the unicode encode error with backslash escapes (\x, \u and \U) */
-PyAPI_FUNC(PyObject *) PyCodec_BackslashReplaceErrors(PyObject *exc);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_CODECREGISTRY_H */
+ 
+PyAPI_FUNC(PyObject *) PyCodec_IncrementalDecoder( 
+       const char *encoding, 
+       const char *errors 
+       ); 
+ 
+/* Get a StreamReader factory function for the given encoding. */ 
+ 
+PyAPI_FUNC(PyObject *) PyCodec_StreamReader( 
+       const char *encoding, 
+       PyObject *stream, 
+       const char *errors 
+       ); 
+ 
+/* Get a StreamWriter factory function for the given encoding. */ 
+ 
+PyAPI_FUNC(PyObject *) PyCodec_StreamWriter( 
+       const char *encoding, 
+       PyObject *stream, 
+       const char *errors 
+       ); 
+ 
+/* Unicode encoding error handling callback registry API */ 
+ 
+/* Register the error handling callback function error under the given 
+   name. This function will be called by the codec when it encounters 
+   unencodable characters/undecodable bytes and doesn't know the 
+   callback name, when name is specified as the error parameter 
+   in the call to the encode/decode function. 
+   Return 0 on success, -1 on error */ 
+PyAPI_FUNC(int) PyCodec_RegisterError(const char *name, PyObject *error); 
+ 
+/* Lookup the error handling callback function registered under the given 
+   name. As a special case NULL can be passed, in which case 
+   the error handling callback for "strict" will be returned. */ 
+PyAPI_FUNC(PyObject *) PyCodec_LookupError(const char *name); 
+ 
+/* raise exc as an exception */ 
+PyAPI_FUNC(PyObject *) PyCodec_StrictErrors(PyObject *exc); 
+ 
+/* ignore the unicode error, skipping the faulty input */ 
+PyAPI_FUNC(PyObject *) PyCodec_IgnoreErrors(PyObject *exc); 
+ 
+/* replace the unicode encode error with ? or U+FFFD */ 
+PyAPI_FUNC(PyObject *) PyCodec_ReplaceErrors(PyObject *exc); 
+ 
+/* replace the unicode encode error with XML character references */ 
+PyAPI_FUNC(PyObject *) PyCodec_XMLCharRefReplaceErrors(PyObject *exc); 
+ 
+/* replace the unicode encode error with backslash escapes (\x, \u and \U) */ 
+PyAPI_FUNC(PyObject *) PyCodec_BackslashReplaceErrors(PyObject *exc); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_CODECREGISTRY_H */ 
diff --git a/contrib/tools/python/src/Include/compile.h b/contrib/tools/python/src/Include/compile.h
index 61001016aa..051824435b 100644
--- a/contrib/tools/python/src/Include/compile.h
+++ b/contrib/tools/python/src/Include/compile.h
@@ -1,40 +1,40 @@
-
-#ifndef Py_COMPILE_H
-#define Py_COMPILE_H
-
-#include "code.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Public interface */
-struct _node; /* Declare the existence of this type */
-PyAPI_FUNC(PyCodeObject *) PyNode_Compile(struct _node *, const char *);
-
-/* Future feature support */
-
-typedef struct {
-    int ff_features;      /* flags set by future statements */
-    int ff_lineno;        /* line number of last future statement */
-} PyFutureFeatures;
-
-#define FUTURE_NESTED_SCOPES "nested_scopes"
-#define FUTURE_GENERATORS "generators"
-#define FUTURE_DIVISION "division"
-#define FUTURE_ABSOLUTE_IMPORT "absolute_import"
-#define FUTURE_WITH_STATEMENT "with_statement"
-#define FUTURE_PRINT_FUNCTION "print_function"
-#define FUTURE_UNICODE_LITERALS "unicode_literals"
-
-
-struct _mod; /* Declare the existence of this type */
-PyAPI_FUNC(PyCodeObject *) PyAST_Compile(struct _mod *, const char *,
-					PyCompilerFlags *, PyArena *);
-PyAPI_FUNC(PyFutureFeatures *) PyFuture_FromAST(struct _mod *, const char *);
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_COMPILE_H */
+ 
+#ifndef Py_COMPILE_H 
+#define Py_COMPILE_H 
+ 
+#include "code.h" 
+ 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+/* Public interface */ 
+struct _node; /* Declare the existence of this type */ 
+PyAPI_FUNC(PyCodeObject *) PyNode_Compile(struct _node *, const char *); 
+ 
+/* Future feature support */ 
+ 
+typedef struct { 
+    int ff_features;      /* flags set by future statements */ 
+    int ff_lineno;        /* line number of last future statement */ 
+} PyFutureFeatures; 
+ 
+#define FUTURE_NESTED_SCOPES "nested_scopes" 
+#define FUTURE_GENERATORS "generators" 
+#define FUTURE_DIVISION "division" 
+#define FUTURE_ABSOLUTE_IMPORT "absolute_import" 
+#define FUTURE_WITH_STATEMENT "with_statement" 
+#define FUTURE_PRINT_FUNCTION "print_function" 
+#define FUTURE_UNICODE_LITERALS "unicode_literals" 
+ 
+ 
+struct _mod; /* Declare the existence of this type */ 
+PyAPI_FUNC(PyCodeObject *) PyAST_Compile(struct _mod *, const char *, 
+					PyCompilerFlags *, PyArena *); 
+PyAPI_FUNC(PyFutureFeatures *) PyFuture_FromAST(struct _mod *, const char *); 
+ 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_COMPILE_H */ 
diff --git a/contrib/tools/python/src/Include/complexobject.h b/contrib/tools/python/src/Include/complexobject.h
index c9a9500fd7..3461abd07b 100644
--- a/contrib/tools/python/src/Include/complexobject.h
+++ b/contrib/tools/python/src/Include/complexobject.h
@@ -1,66 +1,66 @@
-/* Complex number structure */
-
-#ifndef Py_COMPLEXOBJECT_H
-#define Py_COMPLEXOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
-    double real;
-    double imag;
-} Py_complex;
-
-/* Operations on complex numbers from complexmodule.c */
-
-#define c_sum _Py_c_sum
-#define c_diff _Py_c_diff
-#define c_neg _Py_c_neg
-#define c_prod _Py_c_prod
-#define c_quot _Py_c_quot
-#define c_pow _Py_c_pow
-#define c_abs _Py_c_abs
-
-PyAPI_FUNC(Py_complex) c_sum(Py_complex, Py_complex);
-PyAPI_FUNC(Py_complex) c_diff(Py_complex, Py_complex);
-PyAPI_FUNC(Py_complex) c_neg(Py_complex);
-PyAPI_FUNC(Py_complex) c_prod(Py_complex, Py_complex);
-PyAPI_FUNC(Py_complex) c_quot(Py_complex, Py_complex);
-PyAPI_FUNC(Py_complex) c_pow(Py_complex, Py_complex);
-PyAPI_FUNC(double) c_abs(Py_complex);
-
-
-/* Complex object interface */
-
-/*
-PyComplexObject represents a complex number with double-precision
-real and imaginary parts.
-*/
-
-typedef struct {
-    PyObject_HEAD
-    Py_complex cval;
-} PyComplexObject;     
-
-PyAPI_DATA(PyTypeObject) PyComplex_Type;
-
-#define PyComplex_Check(op) PyObject_TypeCheck(op, &PyComplex_Type)
-#define PyComplex_CheckExact(op) (Py_TYPE(op) == &PyComplex_Type)
-
-PyAPI_FUNC(PyObject *) PyComplex_FromCComplex(Py_complex);
-PyAPI_FUNC(PyObject *) PyComplex_FromDoubles(double real, double imag);
-
-PyAPI_FUNC(double) PyComplex_RealAsDouble(PyObject *op);
-PyAPI_FUNC(double) PyComplex_ImagAsDouble(PyObject *op);
-PyAPI_FUNC(Py_complex) PyComplex_AsCComplex(PyObject *op);
-
-/* Format the object based on the format_spec, as defined in PEP 3101
-   (Advanced String Formatting). */
-PyAPI_FUNC(PyObject *) _PyComplex_FormatAdvanced(PyObject *obj,
-                                                 char *format_spec,
-                                                 Py_ssize_t format_spec_len);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_COMPLEXOBJECT_H */
+/* Complex number structure */ 
+ 
+#ifndef Py_COMPLEXOBJECT_H 
+#define Py_COMPLEXOBJECT_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+typedef struct { 
+    double real; 
+    double imag; 
+} Py_complex; 
+ 
+/* Operations on complex numbers from complexmodule.c */ 
+ 
+#define c_sum _Py_c_sum 
+#define c_diff _Py_c_diff 
+#define c_neg _Py_c_neg 
+#define c_prod _Py_c_prod 
+#define c_quot _Py_c_quot 
+#define c_pow _Py_c_pow 
+#define c_abs _Py_c_abs 
+ 
+PyAPI_FUNC(Py_complex) c_sum(Py_complex, Py_complex); 
+PyAPI_FUNC(Py_complex) c_diff(Py_complex, Py_complex); 
+PyAPI_FUNC(Py_complex) c_neg(Py_complex); 
+PyAPI_FUNC(Py_complex) c_prod(Py_complex, Py_complex); 
+PyAPI_FUNC(Py_complex) c_quot(Py_complex, Py_complex); 
+PyAPI_FUNC(Py_complex) c_pow(Py_complex, Py_complex); 
+PyAPI_FUNC(double) c_abs(Py_complex); 
+ 
+ 
+/* Complex object interface */ 
+ 
+/* 
+PyComplexObject represents a complex number with double-precision 
+real and imaginary parts. 
+*/ 
+ 
+typedef struct { 
+    PyObject_HEAD 
+    Py_complex cval; 
+} PyComplexObject;      
+ 
+PyAPI_DATA(PyTypeObject) PyComplex_Type; 
+ 
+#define PyComplex_Check(op) PyObject_TypeCheck(op, &PyComplex_Type) 
+#define PyComplex_CheckExact(op) (Py_TYPE(op) == &PyComplex_Type) 
+ 
+PyAPI_FUNC(PyObject *) PyComplex_FromCComplex(Py_complex); 
+PyAPI_FUNC(PyObject *) PyComplex_FromDoubles(double real, double imag); 
+ 
+PyAPI_FUNC(double) PyComplex_RealAsDouble(PyObject *op); 
+PyAPI_FUNC(double) PyComplex_ImagAsDouble(PyObject *op); 
+PyAPI_FUNC(Py_complex) PyComplex_AsCComplex(PyObject *op); 
+ 
+/* Format the object based on the format_spec, as defined in PEP 3101 
+   (Advanced String Formatting). */ 
+PyAPI_FUNC(PyObject *) _PyComplex_FormatAdvanced(PyObject *obj, 
+                                                 char *format_spec, 
+                                                 Py_ssize_t format_spec_len); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_COMPLEXOBJECT_H */ 
diff --git a/contrib/tools/python/src/Include/datetime.h b/contrib/tools/python/src/Include/datetime.h
index c0e7ffd00a..f51a567bb5 100644
--- a/contrib/tools/python/src/Include/datetime.h
+++ b/contrib/tools/python/src/Include/datetime.h
@@ -1,239 +1,239 @@
-/*  datetime.h
- */
-
-#ifndef DATETIME_H
-#define DATETIME_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Fields are packed into successive bytes, each viewed as unsigned and
- * big-endian, unless otherwise noted:
- *
- * byte offset
- *  0           year     2 bytes, 1-9999
- *  2           month    1 byte, 1-12
- *  3           day      1 byte, 1-31
- *  4           hour     1 byte, 0-23
- *  5           minute   1 byte, 0-59
- *  6           second   1 byte, 0-59
- *  7           usecond  3 bytes, 0-999999
- * 10
- */
-
-/* # of bytes for year, month, and day. */
-#define _PyDateTime_DATE_DATASIZE 4
-
-/* # of bytes for hour, minute, second, and usecond. */
-#define _PyDateTime_TIME_DATASIZE 6
-
-/* # of bytes for year, month, day, hour, minute, second, and usecond. */
-#define _PyDateTime_DATETIME_DATASIZE 10
-
-
-typedef struct
-{
-    PyObject_HEAD
-    long hashcode;              /* -1 when unknown */
-    int days;                   /* -MAX_DELTA_DAYS <= days <= MAX_DELTA_DAYS */
-    int seconds;                /* 0 <= seconds < 24*3600 is invariant */
-    int microseconds;           /* 0 <= microseconds < 1000000 is invariant */
-} PyDateTime_Delta;
-
-typedef struct
-{
+/*  datetime.h 
+ */ 
+ 
+#ifndef DATETIME_H 
+#define DATETIME_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+/* Fields are packed into successive bytes, each viewed as unsigned and 
+ * big-endian, unless otherwise noted: 
+ * 
+ * byte offset 
+ *  0           year     2 bytes, 1-9999 
+ *  2           month    1 byte, 1-12 
+ *  3           day      1 byte, 1-31 
+ *  4           hour     1 byte, 0-23 
+ *  5           minute   1 byte, 0-59 
+ *  6           second   1 byte, 0-59 
+ *  7           usecond  3 bytes, 0-999999 
+ * 10 
+ */ 
+ 
+/* # of bytes for year, month, and day. */ 
+#define _PyDateTime_DATE_DATASIZE 4 
+ 
+/* # of bytes for hour, minute, second, and usecond. */ 
+#define _PyDateTime_TIME_DATASIZE 6 
+ 
+/* # of bytes for year, month, day, hour, minute, second, and usecond. */ 
+#define _PyDateTime_DATETIME_DATASIZE 10 
+ 
+ 
+typedef struct 
+{ 
+    PyObject_HEAD 
+    long hashcode;              /* -1 when unknown */ 
+    int days;                   /* -MAX_DELTA_DAYS <= days <= MAX_DELTA_DAYS */ 
+    int seconds;                /* 0 <= seconds < 24*3600 is invariant */ 
+    int microseconds;           /* 0 <= microseconds < 1000000 is invariant */ 
+} PyDateTime_Delta; 
+ 
+typedef struct 
+{ 
     PyObject_HEAD               /* a pure abstract base class */
-} PyDateTime_TZInfo;
-
-
-/* The datetime and time types have hashcodes, and an optional tzinfo member,
- * present if and only if hastzinfo is true.
- */
-#define _PyTZINFO_HEAD          \
-    PyObject_HEAD               \
-    long hashcode;              \
-    char hastzinfo;             /* boolean flag */
-
-/* No _PyDateTime_BaseTZInfo is allocated; it's just to have something
- * convenient to cast to, when getting at the hastzinfo member of objects
- * starting with _PyTZINFO_HEAD.
- */
-typedef struct
-{
-    _PyTZINFO_HEAD
-} _PyDateTime_BaseTZInfo;
-
-/* All time objects are of PyDateTime_TimeType, but that can be allocated
- * in two ways, with or without a tzinfo member.  Without is the same as
- * tzinfo == None, but consumes less memory.  _PyDateTime_BaseTime is an
- * internal struct used to allocate the right amount of space for the
- * "without" case.
- */
-#define _PyDateTime_TIMEHEAD    \
-    _PyTZINFO_HEAD              \
-    unsigned char data[_PyDateTime_TIME_DATASIZE];
-
-typedef struct
-{
-    _PyDateTime_TIMEHEAD
-} _PyDateTime_BaseTime;         /* hastzinfo false */
-
-typedef struct
-{
-    _PyDateTime_TIMEHEAD
-    PyObject *tzinfo;
-} PyDateTime_Time;              /* hastzinfo true */
-
-
-/* All datetime objects are of PyDateTime_DateTimeType, but that can be
- * allocated in two ways too, just like for time objects above.  In addition,
- * the plain date type is a base class for datetime, so it must also have
- * a hastzinfo member (although it's unused there).
- */
-typedef struct
-{
-    _PyTZINFO_HEAD
-    unsigned char data[_PyDateTime_DATE_DATASIZE];
-} PyDateTime_Date;
-
-#define _PyDateTime_DATETIMEHEAD        \
-    _PyTZINFO_HEAD                      \
-    unsigned char data[_PyDateTime_DATETIME_DATASIZE];
-
-typedef struct
-{
-    _PyDateTime_DATETIMEHEAD
-} _PyDateTime_BaseDateTime;     /* hastzinfo false */
-
-typedef struct
-{
-    _PyDateTime_DATETIMEHEAD
-    PyObject *tzinfo;
-} PyDateTime_DateTime;          /* hastzinfo true */
-
-
-/* Apply for date and datetime instances. */
-#define PyDateTime_GET_YEAR(o)     ((((PyDateTime_Date*)o)->data[0] << 8) | \
-                     ((PyDateTime_Date*)o)->data[1])
-#define PyDateTime_GET_MONTH(o)    (((PyDateTime_Date*)o)->data[2])
-#define PyDateTime_GET_DAY(o)      (((PyDateTime_Date*)o)->data[3])
-
-#define PyDateTime_DATE_GET_HOUR(o)        (((PyDateTime_DateTime*)o)->data[4])
-#define PyDateTime_DATE_GET_MINUTE(o)      (((PyDateTime_DateTime*)o)->data[5])
-#define PyDateTime_DATE_GET_SECOND(o)      (((PyDateTime_DateTime*)o)->data[6])
-#define PyDateTime_DATE_GET_MICROSECOND(o)              \
-    ((((PyDateTime_DateTime*)o)->data[7] << 16) |       \
-     (((PyDateTime_DateTime*)o)->data[8] << 8)  |       \
-      ((PyDateTime_DateTime*)o)->data[9])
-
-/* Apply for time instances. */
-#define PyDateTime_TIME_GET_HOUR(o)        (((PyDateTime_Time*)o)->data[0])
-#define PyDateTime_TIME_GET_MINUTE(o)      (((PyDateTime_Time*)o)->data[1])
-#define PyDateTime_TIME_GET_SECOND(o)      (((PyDateTime_Time*)o)->data[2])
-#define PyDateTime_TIME_GET_MICROSECOND(o)              \
-    ((((PyDateTime_Time*)o)->data[3] << 16) |           \
-     (((PyDateTime_Time*)o)->data[4] << 8)  |           \
-      ((PyDateTime_Time*)o)->data[5])
-
-
-/* Define structure for C API. */
-typedef struct {
-    /* type objects */
-    PyTypeObject *DateType;
-    PyTypeObject *DateTimeType;
-    PyTypeObject *TimeType;
-    PyTypeObject *DeltaType;
-    PyTypeObject *TZInfoType;
-
-    /* constructors */
-    PyObject *(*Date_FromDate)(int, int, int, PyTypeObject*);
-    PyObject *(*DateTime_FromDateAndTime)(int, int, int, int, int, int, int,
-        PyObject*, PyTypeObject*);
-    PyObject *(*Time_FromTime)(int, int, int, int, PyObject*, PyTypeObject*);
-    PyObject *(*Delta_FromDelta)(int, int, int, int, PyTypeObject*);
-
-    /* constructors for the DB API */
-    PyObject *(*DateTime_FromTimestamp)(PyObject*, PyObject*, PyObject*);
-    PyObject *(*Date_FromTimestamp)(PyObject*, PyObject*);
-
-} PyDateTime_CAPI;
-
-#define PyDateTime_CAPSULE_NAME "datetime.datetime_CAPI"
-
-
-/* "magic" constant used to partially protect against developer mistakes. */
-#define DATETIME_API_MAGIC 0x414548d5
-
-#ifdef Py_BUILD_CORE
-
-/* Macros for type checking when building the Python core. */
-#define PyDate_Check(op) PyObject_TypeCheck(op, &PyDateTime_DateType)
-#define PyDate_CheckExact(op) (Py_TYPE(op) == &PyDateTime_DateType)
-
-#define PyDateTime_Check(op) PyObject_TypeCheck(op, &PyDateTime_DateTimeType)
-#define PyDateTime_CheckExact(op) (Py_TYPE(op) == &PyDateTime_DateTimeType)
-
-#define PyTime_Check(op) PyObject_TypeCheck(op, &PyDateTime_TimeType)
-#define PyTime_CheckExact(op) (Py_TYPE(op) == &PyDateTime_TimeType)
-
-#define PyDelta_Check(op) PyObject_TypeCheck(op, &PyDateTime_DeltaType)
-#define PyDelta_CheckExact(op) (Py_TYPE(op) == &PyDateTime_DeltaType)
-
-#define PyTZInfo_Check(op) PyObject_TypeCheck(op, &PyDateTime_TZInfoType)
-#define PyTZInfo_CheckExact(op) (Py_TYPE(op) == &PyDateTime_TZInfoType)
-
-#else
-
-/* Define global variable for the C API and a macro for setting it. */
-static PyDateTime_CAPI *PyDateTimeAPI = NULL;
-
-#define PyDateTime_IMPORT \
-    PyDateTimeAPI = (PyDateTime_CAPI *)PyCapsule_Import(PyDateTime_CAPSULE_NAME, 0)
-
-/* Macros for type checking when not building the Python core. */
-#define PyDate_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->DateType)
-#define PyDate_CheckExact(op) (Py_TYPE(op) == PyDateTimeAPI->DateType)
-
-#define PyDateTime_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->DateTimeType)
-#define PyDateTime_CheckExact(op) (Py_TYPE(op) == PyDateTimeAPI->DateTimeType)
-
-#define PyTime_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->TimeType)
-#define PyTime_CheckExact(op) (Py_TYPE(op) == PyDateTimeAPI->TimeType)
-
-#define PyDelta_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->DeltaType)
-#define PyDelta_CheckExact(op) (Py_TYPE(op) == PyDateTimeAPI->DeltaType)
-
-#define PyTZInfo_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->TZInfoType)
-#define PyTZInfo_CheckExact(op) (Py_TYPE(op) == PyDateTimeAPI->TZInfoType)
-
-/* Macros for accessing constructors in a simplified fashion. */
-#define PyDate_FromDate(year, month, day) \
-    PyDateTimeAPI->Date_FromDate(year, month, day, PyDateTimeAPI->DateType)
-
-#define PyDateTime_FromDateAndTime(year, month, day, hour, min, sec, usec) \
-    PyDateTimeAPI->DateTime_FromDateAndTime(year, month, day, hour, \
-        min, sec, usec, Py_None, PyDateTimeAPI->DateTimeType)
-
-#define PyTime_FromTime(hour, minute, second, usecond) \
-    PyDateTimeAPI->Time_FromTime(hour, minute, second, usecond, \
-        Py_None, PyDateTimeAPI->TimeType)
-
-#define PyDelta_FromDSU(days, seconds, useconds) \
-    PyDateTimeAPI->Delta_FromDelta(days, seconds, useconds, 1, \
-        PyDateTimeAPI->DeltaType)
-
-/* Macros supporting the DB API. */
-#define PyDateTime_FromTimestamp(args) \
-    PyDateTimeAPI->DateTime_FromTimestamp( \
-        (PyObject*) (PyDateTimeAPI->DateTimeType), args, NULL)
-
-#define PyDate_FromTimestamp(args) \
-    PyDateTimeAPI->Date_FromTimestamp( \
-        (PyObject*) (PyDateTimeAPI->DateType), args)
-
-#endif  /* Py_BUILD_CORE */
-
-#ifdef __cplusplus
-}
-#endif
-#endif
+} PyDateTime_TZInfo; 
+ 
+ 
+/* The datetime and time types have hashcodes, and an optional tzinfo member, 
+ * present if and only if hastzinfo is true. 
+ */ 
+#define _PyTZINFO_HEAD          \ 
+    PyObject_HEAD               \ 
+    long hashcode;              \ 
+    char hastzinfo;             /* boolean flag */ 
+ 
+/* No _PyDateTime_BaseTZInfo is allocated; it's just to have something 
+ * convenient to cast to, when getting at the hastzinfo member of objects 
+ * starting with _PyTZINFO_HEAD. 
+ */ 
+typedef struct 
+{ 
+    _PyTZINFO_HEAD 
+} _PyDateTime_BaseTZInfo; 
+ 
+/* All time objects are of PyDateTime_TimeType, but that can be allocated 
+ * in two ways, with or without a tzinfo member.  Without is the same as 
+ * tzinfo == None, but consumes less memory.  _PyDateTime_BaseTime is an 
+ * internal struct used to allocate the right amount of space for the 
+ * "without" case. 
+ */ 
+#define _PyDateTime_TIMEHEAD    \ 
+    _PyTZINFO_HEAD              \ 
+    unsigned char data[_PyDateTime_TIME_DATASIZE]; 
+ 
+typedef struct 
+{ 
+    _PyDateTime_TIMEHEAD 
+} _PyDateTime_BaseTime;         /* hastzinfo false */ 
+ 
+typedef struct 
+{ 
+    _PyDateTime_TIMEHEAD 
+    PyObject *tzinfo; 
+} PyDateTime_Time;              /* hastzinfo true */ 
+ 
+ 
+/* All datetime objects are of PyDateTime_DateTimeType, but that can be 
+ * allocated in two ways too, just like for time objects above.  In addition, 
+ * the plain date type is a base class for datetime, so it must also have 
+ * a hastzinfo member (although it's unused there). 
+ */ 
+typedef struct 
+{ 
+    _PyTZINFO_HEAD 
+    unsigned char data[_PyDateTime_DATE_DATASIZE]; 
+} PyDateTime_Date; 
+ 
+#define _PyDateTime_DATETIMEHEAD        \ 
+    _PyTZINFO_HEAD                      \ 
+    unsigned char data[_PyDateTime_DATETIME_DATASIZE]; 
+ 
+typedef struct 
+{ 
+    _PyDateTime_DATETIMEHEAD 
+} _PyDateTime_BaseDateTime;     /* hastzinfo false */ 
+ 
+typedef struct 
+{ 
+    _PyDateTime_DATETIMEHEAD 
+    PyObject *tzinfo; 
+} PyDateTime_DateTime;          /* hastzinfo true */ 
+ 
+ 
+/* Apply for date and datetime instances. */ 
+#define PyDateTime_GET_YEAR(o)     ((((PyDateTime_Date*)o)->data[0] << 8) | \ 
+                     ((PyDateTime_Date*)o)->data[1]) 
+#define PyDateTime_GET_MONTH(o)    (((PyDateTime_Date*)o)->data[2]) 
+#define PyDateTime_GET_DAY(o)      (((PyDateTime_Date*)o)->data[3]) 
+ 
+#define PyDateTime_DATE_GET_HOUR(o)        (((PyDateTime_DateTime*)o)->data[4]) 
+#define PyDateTime_DATE_GET_MINUTE(o)      (((PyDateTime_DateTime*)o)->data[5]) 
+#define PyDateTime_DATE_GET_SECOND(o)      (((PyDateTime_DateTime*)o)->data[6]) 
+#define PyDateTime_DATE_GET_MICROSECOND(o)              \ 
+    ((((PyDateTime_DateTime*)o)->data[7] << 16) |       \ 
+     (((PyDateTime_DateTime*)o)->data[8] << 8)  |       \ 
+      ((PyDateTime_DateTime*)o)->data[9]) 
+ 
+/* Apply for time instances. */ 
+#define PyDateTime_TIME_GET_HOUR(o)        (((PyDateTime_Time*)o)->data[0]) 
+#define PyDateTime_TIME_GET_MINUTE(o)      (((PyDateTime_Time*)o)->data[1]) 
+#define PyDateTime_TIME_GET_SECOND(o)      (((PyDateTime_Time*)o)->data[2]) 
+#define PyDateTime_TIME_GET_MICROSECOND(o)              \ 
+    ((((PyDateTime_Time*)o)->data[3] << 16) |           \ 
+     (((PyDateTime_Time*)o)->data[4] << 8)  |           \ 
+      ((PyDateTime_Time*)o)->data[5]) 
+ 
+ 
+/* Define structure for C API. */ 
+typedef struct { 
+    /* type objects */ 
+    PyTypeObject *DateType; 
+    PyTypeObject *DateTimeType; 
+    PyTypeObject *TimeType; 
+    PyTypeObject *DeltaType; 
+    PyTypeObject *TZInfoType; 
+ 
+    /* constructors */ 
+    PyObject *(*Date_FromDate)(int, int, int, PyTypeObject*); 
+    PyObject *(*DateTime_FromDateAndTime)(int, int, int, int, int, int, int, 
+        PyObject*, PyTypeObject*); 
+    PyObject *(*Time_FromTime)(int, int, int, int, PyObject*, PyTypeObject*); 
+    PyObject *(*Delta_FromDelta)(int, int, int, int, PyTypeObject*); 
+ 
+    /* constructors for the DB API */ 
+    PyObject *(*DateTime_FromTimestamp)(PyObject*, PyObject*, PyObject*); 
+    PyObject *(*Date_FromTimestamp)(PyObject*, PyObject*); 
+ 
+} PyDateTime_CAPI; 
+ 
+#define PyDateTime_CAPSULE_NAME "datetime.datetime_CAPI" 
+ 
+ 
+/* "magic" constant used to partially protect against developer mistakes. */ 
+#define DATETIME_API_MAGIC 0x414548d5 
+ 
+#ifdef Py_BUILD_CORE 
+ 
+/* Macros for type checking when building the Python core. */ 
+#define PyDate_Check(op) PyObject_TypeCheck(op, &PyDateTime_DateType) 
+#define PyDate_CheckExact(op) (Py_TYPE(op) == &PyDateTime_DateType) 
+ 
+#define PyDateTime_Check(op) PyObject_TypeCheck(op, &PyDateTime_DateTimeType) 
+#define PyDateTime_CheckExact(op) (Py_TYPE(op) == &PyDateTime_DateTimeType) 
+ 
+#define PyTime_Check(op) PyObject_TypeCheck(op, &PyDateTime_TimeType) 
+#define PyTime_CheckExact(op) (Py_TYPE(op) == &PyDateTime_TimeType) 
+ 
+#define PyDelta_Check(op) PyObject_TypeCheck(op, &PyDateTime_DeltaType) 
+#define PyDelta_CheckExact(op) (Py_TYPE(op) == &PyDateTime_DeltaType) 
+ 
+#define PyTZInfo_Check(op) PyObject_TypeCheck(op, &PyDateTime_TZInfoType) 
+#define PyTZInfo_CheckExact(op) (Py_TYPE(op) == &PyDateTime_TZInfoType) 
+ 
+#else 
+ 
+/* Define global variable for the C API and a macro for setting it. */ 
+static PyDateTime_CAPI *PyDateTimeAPI = NULL; 
+ 
+#define PyDateTime_IMPORT \ 
+    PyDateTimeAPI = (PyDateTime_CAPI *)PyCapsule_Import(PyDateTime_CAPSULE_NAME, 0) 
+ 
+/* Macros for type checking when not building the Python core. */ 
+#define PyDate_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->DateType) 
+#define PyDate_CheckExact(op) (Py_TYPE(op) == PyDateTimeAPI->DateType) 
+ 
+#define PyDateTime_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->DateTimeType) 
+#define PyDateTime_CheckExact(op) (Py_TYPE(op) == PyDateTimeAPI->DateTimeType) 
+ 
+#define PyTime_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->TimeType) 
+#define PyTime_CheckExact(op) (Py_TYPE(op) == PyDateTimeAPI->TimeType) 
+ 
+#define PyDelta_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->DeltaType) 
+#define PyDelta_CheckExact(op) (Py_TYPE(op) == PyDateTimeAPI->DeltaType) 
+ 
+#define PyTZInfo_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->TZInfoType) 
+#define PyTZInfo_CheckExact(op) (Py_TYPE(op) == PyDateTimeAPI->TZInfoType) 
+ 
+/* Macros for accessing constructors in a simplified fashion. */ 
+#define PyDate_FromDate(year, month, day) \ 
+    PyDateTimeAPI->Date_FromDate(year, month, day, PyDateTimeAPI->DateType) 
+ 
+#define PyDateTime_FromDateAndTime(year, month, day, hour, min, sec, usec) \ 
+    PyDateTimeAPI->DateTime_FromDateAndTime(year, month, day, hour, \ 
+        min, sec, usec, Py_None, PyDateTimeAPI->DateTimeType) 
+ 
+#define PyTime_FromTime(hour, minute, second, usecond) \ 
+    PyDateTimeAPI->Time_FromTime(hour, minute, second, usecond, \ 
+        Py_None, PyDateTimeAPI->TimeType) 
+ 
+#define PyDelta_FromDSU(days, seconds, useconds) \ 
+    PyDateTimeAPI->Delta_FromDelta(days, seconds, useconds, 1, \ 
+        PyDateTimeAPI->DeltaType) 
+ 
+/* Macros supporting the DB API. */ 
+#define PyDateTime_FromTimestamp(args) \ 
+    PyDateTimeAPI->DateTime_FromTimestamp( \ 
+        (PyObject*) (PyDateTimeAPI->DateTimeType), args, NULL) 
+ 
+#define PyDate_FromTimestamp(args) \ 
+    PyDateTimeAPI->Date_FromTimestamp( \ 
+        (PyObject*) (PyDateTimeAPI->DateType), args) 
+ 
+#endif  /* Py_BUILD_CORE */ 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif 
diff --git a/contrib/tools/python/src/Include/descrobject.h b/contrib/tools/python/src/Include/descrobject.h
index d2c9468dcf..f84be15503 100644
--- a/contrib/tools/python/src/Include/descrobject.h
+++ b/contrib/tools/python/src/Include/descrobject.h
@@ -1,94 +1,94 @@
-/* Descriptors */
-#ifndef Py_DESCROBJECT_H
-#define Py_DESCROBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef PyObject *(*getter)(PyObject *, void *);
-typedef int (*setter)(PyObject *, PyObject *, void *);
-
-typedef struct PyGetSetDef {
+/* Descriptors */ 
+#ifndef Py_DESCROBJECT_H 
+#define Py_DESCROBJECT_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+typedef PyObject *(*getter)(PyObject *, void *); 
+typedef int (*setter)(PyObject *, PyObject *, void *); 
+ 
+typedef struct PyGetSetDef { 
     const char *name;
-    getter get;
-    setter set;
+    getter get; 
+    setter set; 
     const char *doc;
-    void *closure;
-} PyGetSetDef;
-
-typedef PyObject *(*wrapperfunc)(PyObject *self, PyObject *args,
-                                 void *wrapped);
-
-typedef PyObject *(*wrapperfunc_kwds)(PyObject *self, PyObject *args,
-                                      void *wrapped, PyObject *kwds);
-
-struct wrapperbase {
-    char *name;
-    int offset;
-    void *function;
-    wrapperfunc wrapper;
-    char *doc;
-    int flags;
-    PyObject *name_strobj;
-};
-
-/* Flags for above struct */
-#define PyWrapperFlag_KEYWORDS 1 /* wrapper function takes keyword args */
-
-/* Various kinds of descriptor objects */
-
-#define PyDescr_COMMON \
-    PyObject_HEAD \
-    PyTypeObject *d_type; \
-    PyObject *d_name
-
-typedef struct {
-    PyDescr_COMMON;
-} PyDescrObject;
-
-typedef struct {
-    PyDescr_COMMON;
-    PyMethodDef *d_method;
-} PyMethodDescrObject;
-
-typedef struct {
-    PyDescr_COMMON;
-    struct PyMemberDef *d_member;
-} PyMemberDescrObject;
-
-typedef struct {
-    PyDescr_COMMON;
-    PyGetSetDef *d_getset;
-} PyGetSetDescrObject;
-
-typedef struct {
-    PyDescr_COMMON;
-    struct wrapperbase *d_base;
-    void *d_wrapped; /* This can be any function pointer */
-} PyWrapperDescrObject;
-
-PyAPI_DATA(PyTypeObject) PyWrapperDescr_Type;
-PyAPI_DATA(PyTypeObject) PyDictProxy_Type;
-PyAPI_DATA(PyTypeObject) PyGetSetDescr_Type;
-PyAPI_DATA(PyTypeObject) PyMemberDescr_Type;
-
-PyAPI_FUNC(PyObject *) PyDescr_NewMethod(PyTypeObject *, PyMethodDef *);
-PyAPI_FUNC(PyObject *) PyDescr_NewClassMethod(PyTypeObject *, PyMethodDef *);
-PyAPI_FUNC(PyObject *) PyDescr_NewMember(PyTypeObject *,
-                                               struct PyMemberDef *);
-PyAPI_FUNC(PyObject *) PyDescr_NewGetSet(PyTypeObject *,
-                                               struct PyGetSetDef *);
-PyAPI_FUNC(PyObject *) PyDescr_NewWrapper(PyTypeObject *,
-                                                struct wrapperbase *, void *);
-#define PyDescr_IsData(d) (Py_TYPE(d)->tp_descr_set != NULL)
-
-PyAPI_FUNC(PyObject *) PyDictProxy_New(PyObject *);
-PyAPI_FUNC(PyObject *) PyWrapper_New(PyObject *, PyObject *);
-
-
-PyAPI_DATA(PyTypeObject) PyProperty_Type;
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_DESCROBJECT_H */
-
+    void *closure; 
+} PyGetSetDef; 
+ 
+typedef PyObject *(*wrapperfunc)(PyObject *self, PyObject *args, 
+                                 void *wrapped); 
+ 
+typedef PyObject *(*wrapperfunc_kwds)(PyObject *self, PyObject *args, 
+                                      void *wrapped, PyObject *kwds); 
+ 
+struct wrapperbase { 
+    char *name; 
+    int offset; 
+    void *function; 
+    wrapperfunc wrapper; 
+    char *doc; 
+    int flags; 
+    PyObject *name_strobj; 
+}; 
+ 
+/* Flags for above struct */ 
+#define PyWrapperFlag_KEYWORDS 1 /* wrapper function takes keyword args */ 
+ 
+/* Various kinds of descriptor objects */ 
+ 
+#define PyDescr_COMMON \ 
+    PyObject_HEAD \ 
+    PyTypeObject *d_type; \ 
+    PyObject *d_name 
+ 
+typedef struct { 
+    PyDescr_COMMON; 
+} PyDescrObject; 
+ 
+typedef struct { 
+    PyDescr_COMMON; 
+    PyMethodDef *d_method; 
+} PyMethodDescrObject; 
+ 
+typedef struct { 
+    PyDescr_COMMON; 
+    struct PyMemberDef *d_member; 
+} PyMemberDescrObject; 
+ 
+typedef struct { 
+    PyDescr_COMMON; 
+    PyGetSetDef *d_getset; 
+} PyGetSetDescrObject; 
+ 
+typedef struct { 
+    PyDescr_COMMON; 
+    struct wrapperbase *d_base; 
+    void *d_wrapped; /* This can be any function pointer */ 
+} PyWrapperDescrObject; 
+ 
+PyAPI_DATA(PyTypeObject) PyWrapperDescr_Type; 
+PyAPI_DATA(PyTypeObject) PyDictProxy_Type; 
+PyAPI_DATA(PyTypeObject) PyGetSetDescr_Type; 
+PyAPI_DATA(PyTypeObject) PyMemberDescr_Type; 
+ 
+PyAPI_FUNC(PyObject *) PyDescr_NewMethod(PyTypeObject *, PyMethodDef *); 
+PyAPI_FUNC(PyObject *) PyDescr_NewClassMethod(PyTypeObject *, PyMethodDef *); 
+PyAPI_FUNC(PyObject *) PyDescr_NewMember(PyTypeObject *, 
+                                               struct PyMemberDef *); 
+PyAPI_FUNC(PyObject *) PyDescr_NewGetSet(PyTypeObject *, 
+                                               struct PyGetSetDef *); 
+PyAPI_FUNC(PyObject *) PyDescr_NewWrapper(PyTypeObject *, 
+                                                struct wrapperbase *, void *); 
+#define PyDescr_IsData(d) (Py_TYPE(d)->tp_descr_set != NULL) 
+ 
+PyAPI_FUNC(PyObject *) PyDictProxy_New(PyObject *); 
+PyAPI_FUNC(PyObject *) PyWrapper_New(PyObject *, PyObject *); 
+ 
+ 
+PyAPI_DATA(PyTypeObject) PyProperty_Type; 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_DESCROBJECT_H */ 
+ 
diff --git a/contrib/tools/python/src/Include/dictobject.h b/contrib/tools/python/src/Include/dictobject.h
index 5a1e9feea1..d661c214dd 100644
--- a/contrib/tools/python/src/Include/dictobject.h
+++ b/contrib/tools/python/src/Include/dictobject.h
@@ -1,160 +1,160 @@
-#ifndef Py_DICTOBJECT_H
-#define Py_DICTOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Dictionary object type -- mapping from hashable object to object */
-
-/* The distribution includes a separate file, Objects/dictnotes.txt,
-   describing explorations into dictionary design and optimization.
-   It covers typical dictionary use patterns, the parameters for
-   tuning dictionaries, and several ideas for possible optimizations.
-*/
-
-/*
-There are three kinds of slots in the table:
-
-1. Unused.  me_key == me_value == NULL
-   Does not hold an active (key, value) pair now and never did.  Unused can
-   transition to Active upon key insertion.  This is the only case in which
-   me_key is NULL, and is each slot's initial state.
-
-2. Active.  me_key != NULL and me_key != dummy and me_value != NULL
-   Holds an active (key, value) pair.  Active can transition to Dummy upon
-   key deletion.  This is the only case in which me_value != NULL.
-
-3. Dummy.  me_key == dummy and me_value == NULL
-   Previously held an active (key, value) pair, but that was deleted and an
-   active pair has not yet overwritten the slot.  Dummy can transition to
-   Active upon key insertion.  Dummy slots cannot be made Unused again
-   (cannot have me_key set to NULL), else the probe sequence in case of
-   collision would have no way to know they were once active.
-
-Note: .popitem() abuses the me_hash field of an Unused or Dummy slot to
-hold a search finger.  The me_hash field of Unused or Dummy slots has no
-meaning otherwise.
-*/
-
-/* PyDict_MINSIZE is the minimum size of a dictionary.  This many slots are
- * allocated directly in the dict object (in the ma_smalltable member).
- * It must be a power of 2, and at least 4.  8 allows dicts with no more
- * than 5 active entries to live in ma_smalltable (and so avoid an
- * additional malloc); instrumentation suggested this suffices for the
- * majority of dicts (consisting mostly of usually-small instance dicts and
- * usually-small dicts created to pass keyword arguments).
- */
-#define PyDict_MINSIZE 8
-
-typedef struct {
-    /* Cached hash code of me_key.  Note that hash codes are C longs.
-     * We have to use Py_ssize_t instead because dict_popitem() abuses
-     * me_hash to hold a search finger.
-     */
-    Py_ssize_t me_hash;
-    PyObject *me_key;
-    PyObject *me_value;
-} PyDictEntry;
-
-/*
-To ensure the lookup algorithm terminates, there must be at least one Unused
-slot (NULL key) in the table.
-The value ma_fill is the number of non-NULL keys (sum of Active and Dummy);
-ma_used is the number of non-NULL, non-dummy keys (== the number of non-NULL
-values == the number of Active items).
-To avoid slowing down lookups on a near-full table, we resize the table when
-it's two-thirds full.
-*/
-typedef struct _dictobject PyDictObject;
-struct _dictobject {
-    PyObject_HEAD
-    Py_ssize_t ma_fill;  /* # Active + # Dummy */
-    Py_ssize_t ma_used;  /* # Active */
-
-    /* The table contains ma_mask + 1 slots, and that's a power of 2.
-     * We store the mask instead of the size because the mask is more
-     * frequently needed.
-     */
-    Py_ssize_t ma_mask;
-
-    /* ma_table points to ma_smalltable for small tables, else to
-     * additional malloc'ed memory.  ma_table is never NULL!  This rule
-     * saves repeated runtime null-tests in the workhorse getitem and
-     * setitem calls.
-     */
-    PyDictEntry *ma_table;
-    PyDictEntry *(*ma_lookup)(PyDictObject *mp, PyObject *key, long hash);
-    PyDictEntry ma_smalltable[PyDict_MINSIZE];
-};
-
-PyAPI_DATA(PyTypeObject) PyDict_Type;
-PyAPI_DATA(PyTypeObject) PyDictIterKey_Type;
-PyAPI_DATA(PyTypeObject) PyDictIterValue_Type;
-PyAPI_DATA(PyTypeObject) PyDictIterItem_Type;
-PyAPI_DATA(PyTypeObject) PyDictKeys_Type;
-PyAPI_DATA(PyTypeObject) PyDictItems_Type;
-PyAPI_DATA(PyTypeObject) PyDictValues_Type;
-
-#define PyDict_Check(op) \
-                 PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_DICT_SUBCLASS)
-#define PyDict_CheckExact(op) (Py_TYPE(op) == &PyDict_Type)
-#define PyDictKeys_Check(op) (Py_TYPE(op) == &PyDictKeys_Type)
-#define PyDictItems_Check(op) (Py_TYPE(op) == &PyDictItems_Type)
-#define PyDictValues_Check(op) (Py_TYPE(op) == &PyDictValues_Type)
-/* This excludes Values, since they are not sets. */
-# define PyDictViewSet_Check(op) \
-    (PyDictKeys_Check(op) || PyDictItems_Check(op))
-
-PyAPI_FUNC(PyObject *) PyDict_New(void);
-PyAPI_FUNC(PyObject *) PyDict_GetItem(PyObject *mp, PyObject *key);
+#ifndef Py_DICTOBJECT_H 
+#define Py_DICTOBJECT_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+ 
+/* Dictionary object type -- mapping from hashable object to object */ 
+ 
+/* The distribution includes a separate file, Objects/dictnotes.txt, 
+   describing explorations into dictionary design and optimization. 
+   It covers typical dictionary use patterns, the parameters for 
+   tuning dictionaries, and several ideas for possible optimizations. 
+*/ 
+ 
+/* 
+There are three kinds of slots in the table: 
+ 
+1. Unused.  me_key == me_value == NULL 
+   Does not hold an active (key, value) pair now and never did.  Unused can 
+   transition to Active upon key insertion.  This is the only case in which 
+   me_key is NULL, and is each slot's initial state. 
+ 
+2. Active.  me_key != NULL and me_key != dummy and me_value != NULL 
+   Holds an active (key, value) pair.  Active can transition to Dummy upon 
+   key deletion.  This is the only case in which me_value != NULL. 
+ 
+3. Dummy.  me_key == dummy and me_value == NULL 
+   Previously held an active (key, value) pair, but that was deleted and an 
+   active pair has not yet overwritten the slot.  Dummy can transition to 
+   Active upon key insertion.  Dummy slots cannot be made Unused again 
+   (cannot have me_key set to NULL), else the probe sequence in case of 
+   collision would have no way to know they were once active. 
+ 
+Note: .popitem() abuses the me_hash field of an Unused or Dummy slot to 
+hold a search finger.  The me_hash field of Unused or Dummy slots has no 
+meaning otherwise. 
+*/ 
+ 
+/* PyDict_MINSIZE is the minimum size of a dictionary.  This many slots are 
+ * allocated directly in the dict object (in the ma_smalltable member). 
+ * It must be a power of 2, and at least 4.  8 allows dicts with no more 
+ * than 5 active entries to live in ma_smalltable (and so avoid an 
+ * additional malloc); instrumentation suggested this suffices for the 
+ * majority of dicts (consisting mostly of usually-small instance dicts and 
+ * usually-small dicts created to pass keyword arguments). 
+ */ 
+#define PyDict_MINSIZE 8 
+ 
+typedef struct { 
+    /* Cached hash code of me_key.  Note that hash codes are C longs. 
+     * We have to use Py_ssize_t instead because dict_popitem() abuses 
+     * me_hash to hold a search finger. 
+     */ 
+    Py_ssize_t me_hash; 
+    PyObject *me_key; 
+    PyObject *me_value; 
+} PyDictEntry; 
+ 
+/* 
+To ensure the lookup algorithm terminates, there must be at least one Unused 
+slot (NULL key) in the table. 
+The value ma_fill is the number of non-NULL keys (sum of Active and Dummy); 
+ma_used is the number of non-NULL, non-dummy keys (== the number of non-NULL 
+values == the number of Active items). 
+To avoid slowing down lookups on a near-full table, we resize the table when 
+it's two-thirds full. 
+*/ 
+typedef struct _dictobject PyDictObject; 
+struct _dictobject { 
+    PyObject_HEAD 
+    Py_ssize_t ma_fill;  /* # Active + # Dummy */ 
+    Py_ssize_t ma_used;  /* # Active */ 
+ 
+    /* The table contains ma_mask + 1 slots, and that's a power of 2. 
+     * We store the mask instead of the size because the mask is more 
+     * frequently needed. 
+     */ 
+    Py_ssize_t ma_mask; 
+ 
+    /* ma_table points to ma_smalltable for small tables, else to 
+     * additional malloc'ed memory.  ma_table is never NULL!  This rule 
+     * saves repeated runtime null-tests in the workhorse getitem and 
+     * setitem calls. 
+     */ 
+    PyDictEntry *ma_table; 
+    PyDictEntry *(*ma_lookup)(PyDictObject *mp, PyObject *key, long hash); 
+    PyDictEntry ma_smalltable[PyDict_MINSIZE]; 
+}; 
+ 
+PyAPI_DATA(PyTypeObject) PyDict_Type; 
+PyAPI_DATA(PyTypeObject) PyDictIterKey_Type; 
+PyAPI_DATA(PyTypeObject) PyDictIterValue_Type; 
+PyAPI_DATA(PyTypeObject) PyDictIterItem_Type; 
+PyAPI_DATA(PyTypeObject) PyDictKeys_Type; 
+PyAPI_DATA(PyTypeObject) PyDictItems_Type; 
+PyAPI_DATA(PyTypeObject) PyDictValues_Type; 
+ 
+#define PyDict_Check(op) \ 
+                 PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_DICT_SUBCLASS) 
+#define PyDict_CheckExact(op) (Py_TYPE(op) == &PyDict_Type) 
+#define PyDictKeys_Check(op) (Py_TYPE(op) == &PyDictKeys_Type) 
+#define PyDictItems_Check(op) (Py_TYPE(op) == &PyDictItems_Type) 
+#define PyDictValues_Check(op) (Py_TYPE(op) == &PyDictValues_Type) 
+/* This excludes Values, since they are not sets. */ 
+# define PyDictViewSet_Check(op) \ 
+    (PyDictKeys_Check(op) || PyDictItems_Check(op)) 
+ 
+PyAPI_FUNC(PyObject *) PyDict_New(void); 
+PyAPI_FUNC(PyObject *) PyDict_GetItem(PyObject *mp, PyObject *key); 
 PyAPI_FUNC(PyObject *) _PyDict_GetItemWithError(PyObject *mp, PyObject *key);
-PyAPI_FUNC(int) PyDict_SetItem(PyObject *mp, PyObject *key, PyObject *item);
-PyAPI_FUNC(int) PyDict_DelItem(PyObject *mp, PyObject *key);
+PyAPI_FUNC(int) PyDict_SetItem(PyObject *mp, PyObject *key, PyObject *item); 
+PyAPI_FUNC(int) PyDict_DelItem(PyObject *mp, PyObject *key); 
 PyAPI_FUNC(int) _PyDict_DelItemIf(PyObject *mp, PyObject *key,
                                   int (*predicate)(PyObject *value));
 
-PyAPI_FUNC(void) PyDict_Clear(PyObject *mp);
-PyAPI_FUNC(int) PyDict_Next(
-    PyObject *mp, Py_ssize_t *pos, PyObject **key, PyObject **value);
-PyAPI_FUNC(int) _PyDict_Next(
-    PyObject *mp, Py_ssize_t *pos, PyObject **key, PyObject **value, long *hash);
-PyAPI_FUNC(PyObject *) PyDict_Keys(PyObject *mp);
-PyAPI_FUNC(PyObject *) PyDict_Values(PyObject *mp);
-PyAPI_FUNC(PyObject *) PyDict_Items(PyObject *mp);
-PyAPI_FUNC(Py_ssize_t) PyDict_Size(PyObject *mp);
-PyAPI_FUNC(PyObject *) PyDict_Copy(PyObject *mp);
-PyAPI_FUNC(int) PyDict_Contains(PyObject *mp, PyObject *key);
-PyAPI_FUNC(int) _PyDict_Contains(PyObject *mp, PyObject *key, long hash);
-PyAPI_FUNC(PyObject *) _PyDict_NewPresized(Py_ssize_t minused);
-PyAPI_FUNC(void) _PyDict_MaybeUntrack(PyObject *mp);
-
-/* PyDict_Update(mp, other) is equivalent to PyDict_Merge(mp, other, 1). */
-PyAPI_FUNC(int) PyDict_Update(PyObject *mp, PyObject *other);
-
-/* PyDict_Merge updates/merges from a mapping object (an object that
-   supports PyMapping_Keys() and PyObject_GetItem()).  If override is true,
-   the last occurrence of a key wins, else the first.  The Python
-   dict.update(other) is equivalent to PyDict_Merge(dict, other, 1).
-*/
-PyAPI_FUNC(int) PyDict_Merge(PyObject *mp,
-                                   PyObject *other,
-                                   int override);
-
-/* PyDict_MergeFromSeq2 updates/merges from an iterable object producing
-   iterable objects of length 2.  If override is true, the last occurrence
-   of a key wins, else the first.  The Python dict constructor dict(seq2)
-   is equivalent to dict={}; PyDict_MergeFromSeq(dict, seq2, 1).
-*/
-PyAPI_FUNC(int) PyDict_MergeFromSeq2(PyObject *d,
-                                           PyObject *seq2,
-                                           int override);
-
-PyAPI_FUNC(PyObject *) PyDict_GetItemString(PyObject *dp, const char *key);
-PyAPI_FUNC(int) PyDict_SetItemString(PyObject *dp, const char *key, PyObject *item);
-PyAPI_FUNC(int) PyDict_DelItemString(PyObject *dp, const char *key);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_DICTOBJECT_H */
+PyAPI_FUNC(void) PyDict_Clear(PyObject *mp); 
+PyAPI_FUNC(int) PyDict_Next( 
+    PyObject *mp, Py_ssize_t *pos, PyObject **key, PyObject **value); 
+PyAPI_FUNC(int) _PyDict_Next( 
+    PyObject *mp, Py_ssize_t *pos, PyObject **key, PyObject **value, long *hash); 
+PyAPI_FUNC(PyObject *) PyDict_Keys(PyObject *mp); 
+PyAPI_FUNC(PyObject *) PyDict_Values(PyObject *mp); 
+PyAPI_FUNC(PyObject *) PyDict_Items(PyObject *mp); 
+PyAPI_FUNC(Py_ssize_t) PyDict_Size(PyObject *mp); 
+PyAPI_FUNC(PyObject *) PyDict_Copy(PyObject *mp); 
+PyAPI_FUNC(int) PyDict_Contains(PyObject *mp, PyObject *key); 
+PyAPI_FUNC(int) _PyDict_Contains(PyObject *mp, PyObject *key, long hash); 
+PyAPI_FUNC(PyObject *) _PyDict_NewPresized(Py_ssize_t minused); 
+PyAPI_FUNC(void) _PyDict_MaybeUntrack(PyObject *mp); 
+ 
+/* PyDict_Update(mp, other) is equivalent to PyDict_Merge(mp, other, 1). */ 
+PyAPI_FUNC(int) PyDict_Update(PyObject *mp, PyObject *other); 
+ 
+/* PyDict_Merge updates/merges from a mapping object (an object that 
+   supports PyMapping_Keys() and PyObject_GetItem()).  If override is true, 
+   the last occurrence of a key wins, else the first.  The Python 
+   dict.update(other) is equivalent to PyDict_Merge(dict, other, 1). 
+*/ 
+PyAPI_FUNC(int) PyDict_Merge(PyObject *mp, 
+                                   PyObject *other, 
+                                   int override); 
+ 
+/* PyDict_MergeFromSeq2 updates/merges from an iterable object producing 
+   iterable objects of length 2.  If override is true, the last occurrence 
+   of a key wins, else the first.  The Python dict constructor dict(seq2) 
+   is equivalent to dict={}; PyDict_MergeFromSeq(dict, seq2, 1). 
+*/ 
+PyAPI_FUNC(int) PyDict_MergeFromSeq2(PyObject *d, 
+                                           PyObject *seq2, 
+                                           int override); 
+ 
+PyAPI_FUNC(PyObject *) PyDict_GetItemString(PyObject *dp, const char *key); 
+PyAPI_FUNC(int) PyDict_SetItemString(PyObject *dp, const char *key, PyObject *item); 
+PyAPI_FUNC(int) PyDict_DelItemString(PyObject *dp, const char *key); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_DICTOBJECT_H */ 
diff --git a/contrib/tools/python/src/Include/dtoa.h b/contrib/tools/python/src/Include/dtoa.h
index 9b434b77b6..62fec87291 100644
--- a/contrib/tools/python/src/Include/dtoa.h
+++ b/contrib/tools/python/src/Include/dtoa.h
@@ -1,15 +1,15 @@
-#ifndef PY_NO_SHORT_FLOAT_REPR
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_FUNC(double) _Py_dg_strtod(const char *str, char **ptr);
-PyAPI_FUNC(char *) _Py_dg_dtoa(double d, int mode, int ndigits,
-                        int *decpt, int *sign, char **rve);
-PyAPI_FUNC(void) _Py_dg_freedtoa(char *s);
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif
+#ifndef PY_NO_SHORT_FLOAT_REPR 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+PyAPI_FUNC(double) _Py_dg_strtod(const char *str, char **ptr); 
+PyAPI_FUNC(char *) _Py_dg_dtoa(double d, int mode, int ndigits, 
+                        int *decpt, int *sign, char **rve); 
+PyAPI_FUNC(void) _Py_dg_freedtoa(char *s); 
+ 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif 
diff --git a/contrib/tools/python/src/Include/enumobject.h b/contrib/tools/python/src/Include/enumobject.h
index c14dbfc8c3..c82359f0fe 100644
--- a/contrib/tools/python/src/Include/enumobject.h
+++ b/contrib/tools/python/src/Include/enumobject.h
@@ -1,17 +1,17 @@
-#ifndef Py_ENUMOBJECT_H
-#define Py_ENUMOBJECT_H
-
-/* Enumerate Object */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_DATA(PyTypeObject) PyEnum_Type;
-PyAPI_DATA(PyTypeObject) PyReversed_Type;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !Py_ENUMOBJECT_H */
+#ifndef Py_ENUMOBJECT_H 
+#define Py_ENUMOBJECT_H 
+ 
+/* Enumerate Object */ 
+ 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+PyAPI_DATA(PyTypeObject) PyEnum_Type; 
+PyAPI_DATA(PyTypeObject) PyReversed_Type; 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+ 
+#endif /* !Py_ENUMOBJECT_H */ 
diff --git a/contrib/tools/python/src/Include/errcode.h b/contrib/tools/python/src/Include/errcode.h
index 5c5a0f7fa3..c0b819bb98 100644
--- a/contrib/tools/python/src/Include/errcode.h
+++ b/contrib/tools/python/src/Include/errcode.h
@@ -1,37 +1,37 @@
-#ifndef Py_ERRCODE_H
-#define Py_ERRCODE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Error codes passed around between file input, tokenizer, parser and
-   interpreter.  This is necessary so we can turn them into Python
-   exceptions at a higher level.  Note that some errors have a
-   slightly different meaning when passed from the tokenizer to the
-   parser than when passed from the parser to the interpreter; e.g.
-   the parser only returns E_EOF when it hits EOF immediately, and it
-   never returns E_OK. */
-
-#define E_OK		10	/* No error */
-#define E_EOF		11	/* End Of File */
-#define E_INTR		12	/* Interrupted */
-#define E_TOKEN		13	/* Bad token */
-#define E_SYNTAX	14	/* Syntax error */
-#define E_NOMEM		15	/* Ran out of memory */
-#define E_DONE		16	/* Parsing complete */
-#define E_ERROR		17	/* Execution error */
-#define E_TABSPACE	18	/* Inconsistent mixing of tabs and spaces */
-#define E_OVERFLOW      19	/* Node had too many children */
-#define E_TOODEEP	20	/* Too many indentation levels */
-#define E_DEDENT	21	/* No matching outer block for dedent */
-#define E_DECODE	22	/* Error in decoding into Unicode */
-#define E_EOFS		23	/* EOF in triple-quoted string */
-#define E_EOLS		24	/* EOL in single-quoted string */
-#define E_LINECONT	25	/* Unexpected characters after a line continuation */
+#ifndef Py_ERRCODE_H 
+#define Py_ERRCODE_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+ 
+/* Error codes passed around between file input, tokenizer, parser and 
+   interpreter.  This is necessary so we can turn them into Python 
+   exceptions at a higher level.  Note that some errors have a 
+   slightly different meaning when passed from the tokenizer to the 
+   parser than when passed from the parser to the interpreter; e.g. 
+   the parser only returns E_EOF when it hits EOF immediately, and it 
+   never returns E_OK. */ 
+ 
+#define E_OK		10	/* No error */ 
+#define E_EOF		11	/* End Of File */ 
+#define E_INTR		12	/* Interrupted */ 
+#define E_TOKEN		13	/* Bad token */ 
+#define E_SYNTAX	14	/* Syntax error */ 
+#define E_NOMEM		15	/* Ran out of memory */ 
+#define E_DONE		16	/* Parsing complete */ 
+#define E_ERROR		17	/* Execution error */ 
+#define E_TABSPACE	18	/* Inconsistent mixing of tabs and spaces */ 
+#define E_OVERFLOW      19	/* Node had too many children */ 
+#define E_TOODEEP	20	/* Too many indentation levels */ 
+#define E_DEDENT	21	/* No matching outer block for dedent */ 
+#define E_DECODE	22	/* Error in decoding into Unicode */ 
+#define E_EOFS		23	/* EOF in triple-quoted string */ 
+#define E_EOLS		24	/* EOL in single-quoted string */ 
+#define E_LINECONT	25	/* Unexpected characters after a line continuation */ 
 #define E_IO    	26	/* I/O error */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_ERRCODE_H */
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_ERRCODE_H */ 
diff --git a/contrib/tools/python/src/Include/eval.h b/contrib/tools/python/src/Include/eval.h
index b78dfe0fae..813a9cc49e 100644
--- a/contrib/tools/python/src/Include/eval.h
+++ b/contrib/tools/python/src/Include/eval.h
@@ -1,25 +1,25 @@
-
-/* Interface to execute compiled code */
-
-#ifndef Py_EVAL_H
-#define Py_EVAL_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_FUNC(PyObject *) PyEval_EvalCode(PyCodeObject *, PyObject *, PyObject *);
-
-PyAPI_FUNC(PyObject *) PyEval_EvalCodeEx(PyCodeObject *co,
-					PyObject *globals,
-					PyObject *locals,
-					PyObject **args, int argc,
-					PyObject **kwds, int kwdc,
-					PyObject **defs, int defc,
-					PyObject *closure);
-
-PyAPI_FUNC(PyObject *) _PyEval_CallTracing(PyObject *func, PyObject *args);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_EVAL_H */
+ 
+/* Interface to execute compiled code */ 
+ 
+#ifndef Py_EVAL_H 
+#define Py_EVAL_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+PyAPI_FUNC(PyObject *) PyEval_EvalCode(PyCodeObject *, PyObject *, PyObject *); 
+ 
+PyAPI_FUNC(PyObject *) PyEval_EvalCodeEx(PyCodeObject *co, 
+					PyObject *globals, 
+					PyObject *locals, 
+					PyObject **args, int argc, 
+					PyObject **kwds, int kwdc, 
+					PyObject **defs, int defc, 
+					PyObject *closure); 
+ 
+PyAPI_FUNC(PyObject *) _PyEval_CallTracing(PyObject *func, PyObject *args); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_EVAL_H */ 
diff --git a/contrib/tools/python/src/Include/fileobject.h b/contrib/tools/python/src/Include/fileobject.h
index 1b540f902f..0a849494b7 100644
--- a/contrib/tools/python/src/Include/fileobject.h
+++ b/contrib/tools/python/src/Include/fileobject.h
@@ -1,97 +1,97 @@
-
-/* File object interface */
-
-#ifndef Py_FILEOBJECT_H
-#define Py_FILEOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
-    PyObject_HEAD
-    FILE *f_fp;
-    PyObject *f_name;
-    PyObject *f_mode;
-    int (*f_close)(FILE *);
-    int f_softspace;            /* Flag used by 'print' command */
-    int f_binary;               /* Flag which indicates whether the file is
-                               open in binary (1) or text (0) mode */
-    char* f_buf;                /* Allocated readahead buffer */
-    char* f_bufend;             /* Points after last occupied position */
-    char* f_bufptr;             /* Current buffer position */
-    char *f_setbuf;             /* Buffer for setbuf(3) and setvbuf(3) */
-    int f_univ_newline;         /* Handle any newline convention */
-    int f_newlinetypes;         /* Types of newlines seen */
-    int f_skipnextlf;           /* Skip next \n */
-    PyObject *f_encoding;
-    PyObject *f_errors;
-    PyObject *weakreflist; /* List of weak references */
-    int unlocked_count;         /* Num. currently running sections of code
-                               using f_fp with the GIL released. */
-    int readable;
-    int writable;
-} PyFileObject;
-
-PyAPI_DATA(PyTypeObject) PyFile_Type;
-
-#define PyFile_Check(op) PyObject_TypeCheck(op, &PyFile_Type)
-#define PyFile_CheckExact(op) (Py_TYPE(op) == &PyFile_Type)
-
-PyAPI_FUNC(PyObject *) PyFile_FromString(char *, char *);
-PyAPI_FUNC(void) PyFile_SetBufSize(PyObject *, int);
-PyAPI_FUNC(int) PyFile_SetEncoding(PyObject *, const char *);
-PyAPI_FUNC(int) PyFile_SetEncodingAndErrors(PyObject *, const char *, char *errors);
-PyAPI_FUNC(PyObject *) PyFile_FromFile(FILE *, char *, char *,
-                                             int (*)(FILE *));
-PyAPI_FUNC(FILE *) PyFile_AsFile(PyObject *);
-PyAPI_FUNC(void) PyFile_IncUseCount(PyFileObject *);
-PyAPI_FUNC(void) PyFile_DecUseCount(PyFileObject *);
-PyAPI_FUNC(PyObject *) PyFile_Name(PyObject *);
-PyAPI_FUNC(PyObject *) PyFile_GetLine(PyObject *, int);
-PyAPI_FUNC(int) PyFile_WriteObject(PyObject *, PyObject *, int);
-PyAPI_FUNC(int) PyFile_SoftSpace(PyObject *, int);
-PyAPI_FUNC(int) PyFile_WriteString(const char *, PyObject *);
-PyAPI_FUNC(int) PyObject_AsFileDescriptor(PyObject *);
-
-/* The default encoding used by the platform file system APIs
-   If non-NULL, this is different than the default encoding for strings
-*/
-PyAPI_DATA(const char *) Py_FileSystemDefaultEncoding;
-
-/* Routines to replace fread() and fgets() which accept any of \r, \n
-   or \r\n as line terminators.
-*/
-#define PY_STDIOTEXTMODE "b"
-char *Py_UniversalNewlineFgets(char *, int, FILE*, PyObject *);
-size_t Py_UniversalNewlineFread(char *, size_t, FILE *, PyObject *);
-
-/* A routine to do sanity checking on the file mode string.  returns
-   non-zero on if an exception occurred
-*/
-int _PyFile_SanitizeMode(char *mode);
-
-#if defined _MSC_VER && _MSC_VER >= 1400
-/* A routine to check if a file descriptor is valid on Windows.  Returns 0
- * and sets errno to EBADF if it isn't.  This is to avoid Assertions
- * from various functions in the Windows CRT beginning with
- * Visual Studio 2005
- */
-int _PyVerify_fd(int fd);
-#elif defined _MSC_VER && _MSC_VER >= 1200
-/* fdopen doesn't set errno EBADF and crashes for large fd on debug build */
-#define _PyVerify_fd(fd) (_get_osfhandle(fd) >= 0)
-#else
-#define _PyVerify_fd(A) (1) /* dummy */
-#endif
-
-/* A routine to check if a file descriptor can be select()-ed. */
-#ifdef HAVE_SELECT
- #define _PyIsSelectable_fd(FD) (((FD) >= 0) && ((FD) < FD_SETSIZE))
-#else
- #define _PyIsSelectable_fd(FD) (1)
-#endif /* HAVE_SELECT */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_FILEOBJECT_H */
+ 
+/* File object interface */ 
+ 
+#ifndef Py_FILEOBJECT_H 
+#define Py_FILEOBJECT_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+typedef struct { 
+    PyObject_HEAD 
+    FILE *f_fp; 
+    PyObject *f_name; 
+    PyObject *f_mode; 
+    int (*f_close)(FILE *); 
+    int f_softspace;            /* Flag used by 'print' command */ 
+    int f_binary;               /* Flag which indicates whether the file is 
+                               open in binary (1) or text (0) mode */ 
+    char* f_buf;                /* Allocated readahead buffer */ 
+    char* f_bufend;             /* Points after last occupied position */ 
+    char* f_bufptr;             /* Current buffer position */ 
+    char *f_setbuf;             /* Buffer for setbuf(3) and setvbuf(3) */ 
+    int f_univ_newline;         /* Handle any newline convention */ 
+    int f_newlinetypes;         /* Types of newlines seen */ 
+    int f_skipnextlf;           /* Skip next \n */ 
+    PyObject *f_encoding; 
+    PyObject *f_errors; 
+    PyObject *weakreflist; /* List of weak references */ 
+    int unlocked_count;         /* Num. currently running sections of code 
+                               using f_fp with the GIL released. */ 
+    int readable; 
+    int writable; 
+} PyFileObject; 
+ 
+PyAPI_DATA(PyTypeObject) PyFile_Type; 
+ 
+#define PyFile_Check(op) PyObject_TypeCheck(op, &PyFile_Type) 
+#define PyFile_CheckExact(op) (Py_TYPE(op) == &PyFile_Type) 
+ 
+PyAPI_FUNC(PyObject *) PyFile_FromString(char *, char *); 
+PyAPI_FUNC(void) PyFile_SetBufSize(PyObject *, int); 
+PyAPI_FUNC(int) PyFile_SetEncoding(PyObject *, const char *); 
+PyAPI_FUNC(int) PyFile_SetEncodingAndErrors(PyObject *, const char *, char *errors); 
+PyAPI_FUNC(PyObject *) PyFile_FromFile(FILE *, char *, char *, 
+                                             int (*)(FILE *)); 
+PyAPI_FUNC(FILE *) PyFile_AsFile(PyObject *); 
+PyAPI_FUNC(void) PyFile_IncUseCount(PyFileObject *); 
+PyAPI_FUNC(void) PyFile_DecUseCount(PyFileObject *); 
+PyAPI_FUNC(PyObject *) PyFile_Name(PyObject *); 
+PyAPI_FUNC(PyObject *) PyFile_GetLine(PyObject *, int); 
+PyAPI_FUNC(int) PyFile_WriteObject(PyObject *, PyObject *, int); 
+PyAPI_FUNC(int) PyFile_SoftSpace(PyObject *, int); 
+PyAPI_FUNC(int) PyFile_WriteString(const char *, PyObject *); 
+PyAPI_FUNC(int) PyObject_AsFileDescriptor(PyObject *); 
+ 
+/* The default encoding used by the platform file system APIs 
+   If non-NULL, this is different than the default encoding for strings 
+*/ 
+PyAPI_DATA(const char *) Py_FileSystemDefaultEncoding; 
+ 
+/* Routines to replace fread() and fgets() which accept any of \r, \n 
+   or \r\n as line terminators. 
+*/ 
+#define PY_STDIOTEXTMODE "b" 
+char *Py_UniversalNewlineFgets(char *, int, FILE*, PyObject *); 
+size_t Py_UniversalNewlineFread(char *, size_t, FILE *, PyObject *); 
+ 
+/* A routine to do sanity checking on the file mode string.  returns 
+   non-zero on if an exception occurred 
+*/ 
+int _PyFile_SanitizeMode(char *mode); 
+ 
+#if defined _MSC_VER && _MSC_VER >= 1400 
+/* A routine to check if a file descriptor is valid on Windows.  Returns 0 
+ * and sets errno to EBADF if it isn't.  This is to avoid Assertions 
+ * from various functions in the Windows CRT beginning with 
+ * Visual Studio 2005 
+ */ 
+int _PyVerify_fd(int fd); 
+#elif defined _MSC_VER && _MSC_VER >= 1200 
+/* fdopen doesn't set errno EBADF and crashes for large fd on debug build */ 
+#define _PyVerify_fd(fd) (_get_osfhandle(fd) >= 0) 
+#else 
+#define _PyVerify_fd(A) (1) /* dummy */ 
+#endif 
+ 
+/* A routine to check if a file descriptor can be select()-ed. */ 
+#ifdef HAVE_SELECT 
+ #define _PyIsSelectable_fd(FD) (((FD) >= 0) && ((FD) < FD_SETSIZE)) 
+#else 
+ #define _PyIsSelectable_fd(FD) (1) 
+#endif /* HAVE_SELECT */ 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_FILEOBJECT_H */ 
diff --git a/contrib/tools/python/src/Include/floatobject.h b/contrib/tools/python/src/Include/floatobject.h
index 54e88256a2..8a6b572a01 100644
--- a/contrib/tools/python/src/Include/floatobject.h
+++ b/contrib/tools/python/src/Include/floatobject.h
@@ -1,140 +1,140 @@
-
-/* Float object interface */
-
-/*
-PyFloatObject represents a (double precision) floating point number.
-*/
-
-#ifndef Py_FLOATOBJECT_H
-#define Py_FLOATOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
-    PyObject_HEAD
-    double ob_fval;
-} PyFloatObject;
-
-PyAPI_DATA(PyTypeObject) PyFloat_Type;
-
-#define PyFloat_Check(op) PyObject_TypeCheck(op, &PyFloat_Type)
-#define PyFloat_CheckExact(op) (Py_TYPE(op) == &PyFloat_Type)
-
-/* The str() precision PyFloat_STR_PRECISION is chosen so that in most cases,
-   the rounding noise created by various operations is suppressed, while
-   giving plenty of precision for practical use. */
-
-#define PyFloat_STR_PRECISION 12
-
-#ifdef Py_NAN
-#define Py_RETURN_NAN return PyFloat_FromDouble(Py_NAN)
-#endif
-
-#define Py_RETURN_INF(sign) do					\
-	if (copysign(1., sign) == 1.) {				\
-		return PyFloat_FromDouble(Py_HUGE_VAL);	\
-	} else {						\
-		return PyFloat_FromDouble(-Py_HUGE_VAL);	\
-	} while(0)
-
-PyAPI_FUNC(double) PyFloat_GetMax(void);
-PyAPI_FUNC(double) PyFloat_GetMin(void);
-PyAPI_FUNC(PyObject *) PyFloat_GetInfo(void);
-
-/* Return Python float from string PyObject.  Second argument ignored on
-   input, and, if non-NULL, NULL is stored into *junk (this tried to serve a
-   purpose once but can't be made to work as intended). */
-PyAPI_FUNC(PyObject *) PyFloat_FromString(PyObject*, char** junk);
-
-/* Return Python float from C double. */
-PyAPI_FUNC(PyObject *) PyFloat_FromDouble(double);
-
-/* Extract C double from Python float.  The macro version trades safety for
-   speed. */
-PyAPI_FUNC(double) PyFloat_AsDouble(PyObject *);
-#define PyFloat_AS_DOUBLE(op) (((PyFloatObject *)(op))->ob_fval)
-
-/* Write repr(v) into the char buffer argument, followed by null byte.  The
-   buffer must be "big enough"; >= 100 is very safe.
-   PyFloat_AsReprString(buf, x) strives to print enough digits so that
-   PyFloat_FromString(buf) then reproduces x exactly. */
-PyAPI_FUNC(void) PyFloat_AsReprString(char*, PyFloatObject *v);
-
-/* Write str(v) into the char buffer argument, followed by null byte.  The
-   buffer must be "big enough"; >= 100 is very safe.  Note that it's
-   unusual to be able to get back the float you started with from
-   PyFloat_AsString's result -- use PyFloat_AsReprString() if you want to
-   preserve precision across conversions. */
-PyAPI_FUNC(void) PyFloat_AsString(char*, PyFloatObject *v);
-
-/* _PyFloat_{Pack,Unpack}{4,8}
- *
- * The struct and pickle (at least) modules need an efficient platform-
- * independent way to store floating-point values as byte strings.
- * The Pack routines produce a string from a C double, and the Unpack
- * routines produce a C double from such a string.  The suffix (4 or 8)
- * specifies the number of bytes in the string.
- *
- * On platforms that appear to use (see _PyFloat_Init()) IEEE-754 formats
- * these functions work by copying bits.  On other platforms, the formats the
- * 4- byte format is identical to the IEEE-754 single precision format, and
- * the 8-byte format to the IEEE-754 double precision format, although the
- * packing of INFs and NaNs (if such things exist on the platform) isn't
- * handled correctly, and attempting to unpack a string containing an IEEE
- * INF or NaN will raise an exception.
- *
- * On non-IEEE platforms with more precision, or larger dynamic range, than
- * 754 supports, not all values can be packed; on non-IEEE platforms with less
- * precision, or smaller dynamic range, not all values can be unpacked.  What
- * happens in such cases is partly accidental (alas).
- */
-
-/* The pack routines write 4 or 8 bytes, starting at p.  le is a bool
- * argument, true if you want the string in little-endian format (exponent
- * last, at p+3 or p+7), false if you want big-endian format (exponent
- * first, at p).
- * Return value:  0 if all is OK, -1 if error (and an exception is
- * set, most likely OverflowError).
- * There are two problems on non-IEEE platforms:
- * 1):  What this does is undefined if x is a NaN or infinity.
- * 2):  -0.0 and +0.0 produce the same string.
- */
-PyAPI_FUNC(int) _PyFloat_Pack4(double x, unsigned char *p, int le);
-PyAPI_FUNC(int) _PyFloat_Pack8(double x, unsigned char *p, int le);
-
-/* Used to get the important decimal digits of a double */
-PyAPI_FUNC(int) _PyFloat_Digits(char *buf, double v, int *signum);
-PyAPI_FUNC(void) _PyFloat_DigitsInit(void);
-
-/* The unpack routines read 4 or 8 bytes, starting at p.  le is a bool
- * argument, true if the string is in little-endian format (exponent
- * last, at p+3 or p+7), false if big-endian (exponent first, at p).
- * Return value:  The unpacked double.  On error, this is -1.0 and
- * PyErr_Occurred() is true (and an exception is set, most likely
- * OverflowError).  Note that on a non-IEEE platform this will refuse
- * to unpack a string that represents a NaN or infinity.
- */
-PyAPI_FUNC(double) _PyFloat_Unpack4(const unsigned char *p, int le);
-PyAPI_FUNC(double) _PyFloat_Unpack8(const unsigned char *p, int le);
-
-/* free list api */
-PyAPI_FUNC(int) PyFloat_ClearFreeList(void);
-
-/* Format the object based on the format_spec, as defined in PEP 3101
-   (Advanced String Formatting). */
-PyAPI_FUNC(PyObject *) _PyFloat_FormatAdvanced(PyObject *obj,
-					       char *format_spec,
-					       Py_ssize_t format_spec_len);
-
-/* Round a C double x to the closest multiple of 10**-ndigits.  Returns a
-   Python float on success, or NULL (with an appropriate exception set) on
-   failure.  Used in builtin_round in bltinmodule.c. */
-PyAPI_FUNC(PyObject *) _Py_double_round(double x, int ndigits);
-
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_FLOATOBJECT_H */
+ 
+/* Float object interface */ 
+ 
+/* 
+PyFloatObject represents a (double precision) floating point number. 
+*/ 
+ 
+#ifndef Py_FLOATOBJECT_H 
+#define Py_FLOATOBJECT_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+typedef struct { 
+    PyObject_HEAD 
+    double ob_fval; 
+} PyFloatObject; 
+ 
+PyAPI_DATA(PyTypeObject) PyFloat_Type; 
+ 
+#define PyFloat_Check(op) PyObject_TypeCheck(op, &PyFloat_Type) 
+#define PyFloat_CheckExact(op) (Py_TYPE(op) == &PyFloat_Type) 
+ 
+/* The str() precision PyFloat_STR_PRECISION is chosen so that in most cases, 
+   the rounding noise created by various operations is suppressed, while 
+   giving plenty of precision for practical use. */ 
+ 
+#define PyFloat_STR_PRECISION 12 
+ 
+#ifdef Py_NAN 
+#define Py_RETURN_NAN return PyFloat_FromDouble(Py_NAN) 
+#endif 
+ 
+#define Py_RETURN_INF(sign) do					\ 
+	if (copysign(1., sign) == 1.) {				\ 
+		return PyFloat_FromDouble(Py_HUGE_VAL);	\ 
+	} else {						\ 
+		return PyFloat_FromDouble(-Py_HUGE_VAL);	\ 
+	} while(0) 
+ 
+PyAPI_FUNC(double) PyFloat_GetMax(void); 
+PyAPI_FUNC(double) PyFloat_GetMin(void); 
+PyAPI_FUNC(PyObject *) PyFloat_GetInfo(void); 
+ 
+/* Return Python float from string PyObject.  Second argument ignored on 
+   input, and, if non-NULL, NULL is stored into *junk (this tried to serve a 
+   purpose once but can't be made to work as intended). */ 
+PyAPI_FUNC(PyObject *) PyFloat_FromString(PyObject*, char** junk); 
+ 
+/* Return Python float from C double. */ 
+PyAPI_FUNC(PyObject *) PyFloat_FromDouble(double); 
+ 
+/* Extract C double from Python float.  The macro version trades safety for 
+   speed. */ 
+PyAPI_FUNC(double) PyFloat_AsDouble(PyObject *); 
+#define PyFloat_AS_DOUBLE(op) (((PyFloatObject *)(op))->ob_fval) 
+ 
+/* Write repr(v) into the char buffer argument, followed by null byte.  The 
+   buffer must be "big enough"; >= 100 is very safe. 
+   PyFloat_AsReprString(buf, x) strives to print enough digits so that 
+   PyFloat_FromString(buf) then reproduces x exactly. */ 
+PyAPI_FUNC(void) PyFloat_AsReprString(char*, PyFloatObject *v); 
+ 
+/* Write str(v) into the char buffer argument, followed by null byte.  The 
+   buffer must be "big enough"; >= 100 is very safe.  Note that it's 
+   unusual to be able to get back the float you started with from 
+   PyFloat_AsString's result -- use PyFloat_AsReprString() if you want to 
+   preserve precision across conversions. */ 
+PyAPI_FUNC(void) PyFloat_AsString(char*, PyFloatObject *v); 
+ 
+/* _PyFloat_{Pack,Unpack}{4,8} 
+ * 
+ * The struct and pickle (at least) modules need an efficient platform- 
+ * independent way to store floating-point values as byte strings. 
+ * The Pack routines produce a string from a C double, and the Unpack 
+ * routines produce a C double from such a string.  The suffix (4 or 8) 
+ * specifies the number of bytes in the string. 
+ * 
+ * On platforms that appear to use (see _PyFloat_Init()) IEEE-754 formats 
+ * these functions work by copying bits.  On other platforms, the formats the 
+ * 4- byte format is identical to the IEEE-754 single precision format, and 
+ * the 8-byte format to the IEEE-754 double precision format, although the 
+ * packing of INFs and NaNs (if such things exist on the platform) isn't 
+ * handled correctly, and attempting to unpack a string containing an IEEE 
+ * INF or NaN will raise an exception. 
+ * 
+ * On non-IEEE platforms with more precision, or larger dynamic range, than 
+ * 754 supports, not all values can be packed; on non-IEEE platforms with less 
+ * precision, or smaller dynamic range, not all values can be unpacked.  What 
+ * happens in such cases is partly accidental (alas). 
+ */ 
+ 
+/* The pack routines write 4 or 8 bytes, starting at p.  le is a bool 
+ * argument, true if you want the string in little-endian format (exponent 
+ * last, at p+3 or p+7), false if you want big-endian format (exponent 
+ * first, at p). 
+ * Return value:  0 if all is OK, -1 if error (and an exception is 
+ * set, most likely OverflowError). 
+ * There are two problems on non-IEEE platforms: 
+ * 1):  What this does is undefined if x is a NaN or infinity. 
+ * 2):  -0.0 and +0.0 produce the same string. 
+ */ 
+PyAPI_FUNC(int) _PyFloat_Pack4(double x, unsigned char *p, int le); 
+PyAPI_FUNC(int) _PyFloat_Pack8(double x, unsigned char *p, int le); 
+ 
+/* Used to get the important decimal digits of a double */ 
+PyAPI_FUNC(int) _PyFloat_Digits(char *buf, double v, int *signum); 
+PyAPI_FUNC(void) _PyFloat_DigitsInit(void); 
+ 
+/* The unpack routines read 4 or 8 bytes, starting at p.  le is a bool 
+ * argument, true if the string is in little-endian format (exponent 
+ * last, at p+3 or p+7), false if big-endian (exponent first, at p). 
+ * Return value:  The unpacked double.  On error, this is -1.0 and 
+ * PyErr_Occurred() is true (and an exception is set, most likely 
+ * OverflowError).  Note that on a non-IEEE platform this will refuse 
+ * to unpack a string that represents a NaN or infinity. 
+ */ 
+PyAPI_FUNC(double) _PyFloat_Unpack4(const unsigned char *p, int le); 
+PyAPI_FUNC(double) _PyFloat_Unpack8(const unsigned char *p, int le); 
+ 
+/* free list api */ 
+PyAPI_FUNC(int) PyFloat_ClearFreeList(void); 
+ 
+/* Format the object based on the format_spec, as defined in PEP 3101 
+   (Advanced String Formatting). */ 
+PyAPI_FUNC(PyObject *) _PyFloat_FormatAdvanced(PyObject *obj, 
+					       char *format_spec, 
+					       Py_ssize_t format_spec_len); 
+ 
+/* Round a C double x to the closest multiple of 10**-ndigits.  Returns a 
+   Python float on success, or NULL (with an appropriate exception set) on 
+   failure.  Used in builtin_round in bltinmodule.c. */ 
+PyAPI_FUNC(PyObject *) _Py_double_round(double x, int ndigits); 
+ 
+ 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_FLOATOBJECT_H */ 
diff --git a/contrib/tools/python/src/Include/frameobject.h b/contrib/tools/python/src/Include/frameobject.h
index 34603794c6..245f5d50fb 100644
--- a/contrib/tools/python/src/Include/frameobject.h
+++ b/contrib/tools/python/src/Include/frameobject.h
@@ -1,89 +1,89 @@
-
-/* Frame object interface */
-
-#ifndef Py_FRAMEOBJECT_H
-#define Py_FRAMEOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
-    int b_type;			/* what kind of block this is */
-    int b_handler;		/* where to jump to find handler */
-    int b_level;		/* value stack level to pop to */
-} PyTryBlock;
-
-typedef struct _frame {
-    PyObject_VAR_HEAD
-    struct _frame *f_back;	/* previous frame, or NULL */
-    PyCodeObject *f_code;	/* code segment */
-    PyObject *f_builtins;	/* builtin symbol table (PyDictObject) */
-    PyObject *f_globals;	/* global symbol table (PyDictObject) */
-    PyObject *f_locals;		/* local symbol table (any mapping) */
-    PyObject **f_valuestack;	/* points after the last local */
-    /* Next free slot in f_valuestack.  Frame creation sets to f_valuestack.
-       Frame evaluation usually NULLs it, but a frame that yields sets it
-       to the current stack top. */
-    PyObject **f_stacktop;
-    PyObject *f_trace;		/* Trace function */
-
-    /* If an exception is raised in this frame, the next three are used to
-     * record the exception info (if any) originally in the thread state.  See
-     * comments before set_exc_info() -- it's not obvious.
-     * Invariant:  if _type is NULL, then so are _value and _traceback.
-     * Desired invariant:  all three are NULL, or all three are non-NULL.  That
-     * one isn't currently true, but "should be".
-     */
-    PyObject *f_exc_type, *f_exc_value, *f_exc_traceback;
-
-    PyThreadState *f_tstate;
-    int f_lasti;		/* Last instruction if called */
-    /* Call PyFrame_GetLineNumber() instead of reading this field
-       directly.  As of 2.3 f_lineno is only valid when tracing is
-       active (i.e. when f_trace is set).  At other times we use
-       PyCode_Addr2Line to calculate the line from the current
-       bytecode index. */
-    int f_lineno;		/* Current line number */
-    int f_iblock;		/* index in f_blockstack */
-    PyTryBlock f_blockstack[CO_MAXBLOCKS]; /* for try and loop blocks */
-    PyObject *f_localsplus[1];	/* locals+stack, dynamically sized */
-} PyFrameObject;
-
-
-/* Standard object interface */
-
-PyAPI_DATA(PyTypeObject) PyFrame_Type;
-
+ 
+/* Frame object interface */ 
+ 
+#ifndef Py_FRAMEOBJECT_H 
+#define Py_FRAMEOBJECT_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+typedef struct { 
+    int b_type;			/* what kind of block this is */ 
+    int b_handler;		/* where to jump to find handler */ 
+    int b_level;		/* value stack level to pop to */ 
+} PyTryBlock; 
+ 
+typedef struct _frame { 
+    PyObject_VAR_HEAD 
+    struct _frame *f_back;	/* previous frame, or NULL */ 
+    PyCodeObject *f_code;	/* code segment */ 
+    PyObject *f_builtins;	/* builtin symbol table (PyDictObject) */ 
+    PyObject *f_globals;	/* global symbol table (PyDictObject) */ 
+    PyObject *f_locals;		/* local symbol table (any mapping) */ 
+    PyObject **f_valuestack;	/* points after the last local */ 
+    /* Next free slot in f_valuestack.  Frame creation sets to f_valuestack. 
+       Frame evaluation usually NULLs it, but a frame that yields sets it 
+       to the current stack top. */ 
+    PyObject **f_stacktop; 
+    PyObject *f_trace;		/* Trace function */ 
+ 
+    /* If an exception is raised in this frame, the next three are used to 
+     * record the exception info (if any) originally in the thread state.  See 
+     * comments before set_exc_info() -- it's not obvious. 
+     * Invariant:  if _type is NULL, then so are _value and _traceback. 
+     * Desired invariant:  all three are NULL, or all three are non-NULL.  That 
+     * one isn't currently true, but "should be". 
+     */ 
+    PyObject *f_exc_type, *f_exc_value, *f_exc_traceback; 
+ 
+    PyThreadState *f_tstate; 
+    int f_lasti;		/* Last instruction if called */ 
+    /* Call PyFrame_GetLineNumber() instead of reading this field 
+       directly.  As of 2.3 f_lineno is only valid when tracing is 
+       active (i.e. when f_trace is set).  At other times we use 
+       PyCode_Addr2Line to calculate the line from the current 
+       bytecode index. */ 
+    int f_lineno;		/* Current line number */ 
+    int f_iblock;		/* index in f_blockstack */ 
+    PyTryBlock f_blockstack[CO_MAXBLOCKS]; /* for try and loop blocks */ 
+    PyObject *f_localsplus[1];	/* locals+stack, dynamically sized */ 
+} PyFrameObject; 
+ 
+ 
+/* Standard object interface */ 
+ 
+PyAPI_DATA(PyTypeObject) PyFrame_Type; 
+ 
 #define PyFrame_Check(op) (Py_TYPE(op) == &PyFrame_Type)
-#define PyFrame_IsRestricted(f) \
+#define PyFrame_IsRestricted(f) \ 
 	((f)->f_tstate && (f)->f_builtins != (f)->f_tstate->interp->builtins)
-
-PyAPI_FUNC(PyFrameObject *) PyFrame_New(PyThreadState *, PyCodeObject *,
-                                       PyObject *, PyObject *);
-
-
-/* The rest of the interface is specific for frame objects */
-
-/* Block management functions */
-
-PyAPI_FUNC(void) PyFrame_BlockSetup(PyFrameObject *, int, int, int);
-PyAPI_FUNC(PyTryBlock *) PyFrame_BlockPop(PyFrameObject *);
-
-/* Extend the value stack */
-
-PyAPI_FUNC(PyObject **) PyFrame_ExtendStack(PyFrameObject *, int, int);
-
-/* Conversions between "fast locals" and locals in dictionary */
-
-PyAPI_FUNC(void) PyFrame_LocalsToFast(PyFrameObject *, int);
-PyAPI_FUNC(void) PyFrame_FastToLocals(PyFrameObject *);
-
-PyAPI_FUNC(int) PyFrame_ClearFreeList(void);
-
-/* Return the line of code the frame is currently executing. */
-PyAPI_FUNC(int) PyFrame_GetLineNumber(PyFrameObject *);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_FRAMEOBJECT_H */
+ 
+PyAPI_FUNC(PyFrameObject *) PyFrame_New(PyThreadState *, PyCodeObject *, 
+                                       PyObject *, PyObject *); 
+ 
+ 
+/* The rest of the interface is specific for frame objects */ 
+ 
+/* Block management functions */ 
+ 
+PyAPI_FUNC(void) PyFrame_BlockSetup(PyFrameObject *, int, int, int); 
+PyAPI_FUNC(PyTryBlock *) PyFrame_BlockPop(PyFrameObject *); 
+ 
+/* Extend the value stack */ 
+ 
+PyAPI_FUNC(PyObject **) PyFrame_ExtendStack(PyFrameObject *, int, int); 
+ 
+/* Conversions between "fast locals" and locals in dictionary */ 
+ 
+PyAPI_FUNC(void) PyFrame_LocalsToFast(PyFrameObject *, int); 
+PyAPI_FUNC(void) PyFrame_FastToLocals(PyFrameObject *); 
+ 
+PyAPI_FUNC(int) PyFrame_ClearFreeList(void); 
+ 
+/* Return the line of code the frame is currently executing. */ 
+PyAPI_FUNC(int) PyFrame_GetLineNumber(PyFrameObject *); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_FRAMEOBJECT_H */ 
diff --git a/contrib/tools/python/src/Include/funcobject.h b/contrib/tools/python/src/Include/funcobject.h
index eb19f4c389..41c8d5e5aa 100644
--- a/contrib/tools/python/src/Include/funcobject.h
+++ b/contrib/tools/python/src/Include/funcobject.h
@@ -1,76 +1,76 @@
-
-/* Function object interface */
-
-#ifndef Py_FUNCOBJECT_H
-#define Py_FUNCOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Function objects and code objects should not be confused with each other:
- *
- * Function objects are created by the execution of the 'def' statement.
- * They reference a code object in their func_code attribute, which is a
- * purely syntactic object, i.e. nothing more than a compiled version of some
- * source code lines.  There is one code object per source code "fragment",
- * but each code object can be referenced by zero or many function objects
- * depending only on how many times the 'def' statement in the source was
- * executed so far.
- */
-
-typedef struct {
-    PyObject_HEAD
-    PyObject *func_code;	/* A code object */
-    PyObject *func_globals;	/* A dictionary (other mappings won't do) */
-    PyObject *func_defaults;	/* NULL or a tuple */
-    PyObject *func_closure;	/* NULL or a tuple of cell objects */
-    PyObject *func_doc;		/* The __doc__ attribute, can be anything */
-    PyObject *func_name;	/* The __name__ attribute, a string object */
-    PyObject *func_dict;	/* The __dict__ attribute, a dict or NULL */
-    PyObject *func_weakreflist;	/* List of weak references */
-    PyObject *func_module;	/* The __module__ attribute, can be anything */
-
-    /* Invariant:
-     *     func_closure contains the bindings for func_code->co_freevars, so
-     *     PyTuple_Size(func_closure) == PyCode_GetNumFree(func_code)
-     *     (func_closure may be NULL if PyCode_GetNumFree(func_code) == 0).
-     */
-} PyFunctionObject;
-
-PyAPI_DATA(PyTypeObject) PyFunction_Type;
-
-#define PyFunction_Check(op) (Py_TYPE(op) == &PyFunction_Type)
-
-PyAPI_FUNC(PyObject *) PyFunction_New(PyObject *, PyObject *);
-PyAPI_FUNC(PyObject *) PyFunction_GetCode(PyObject *);
-PyAPI_FUNC(PyObject *) PyFunction_GetGlobals(PyObject *);
-PyAPI_FUNC(PyObject *) PyFunction_GetModule(PyObject *);
-PyAPI_FUNC(PyObject *) PyFunction_GetDefaults(PyObject *);
-PyAPI_FUNC(int) PyFunction_SetDefaults(PyObject *, PyObject *);
-PyAPI_FUNC(PyObject *) PyFunction_GetClosure(PyObject *);
-PyAPI_FUNC(int) PyFunction_SetClosure(PyObject *, PyObject *);
-
-/* Macros for direct access to these values. Type checks are *not*
-   done, so use with care. */
-#define PyFunction_GET_CODE(func) \
-        (((PyFunctionObject *)func) -> func_code)
-#define PyFunction_GET_GLOBALS(func) \
-	(((PyFunctionObject *)func) -> func_globals)
-#define PyFunction_GET_MODULE(func) \
-	(((PyFunctionObject *)func) -> func_module)
-#define PyFunction_GET_DEFAULTS(func) \
-	(((PyFunctionObject *)func) -> func_defaults)
-#define PyFunction_GET_CLOSURE(func) \
-	(((PyFunctionObject *)func) -> func_closure)
-
-/* The classmethod and staticmethod types lives here, too */
-PyAPI_DATA(PyTypeObject) PyClassMethod_Type;
-PyAPI_DATA(PyTypeObject) PyStaticMethod_Type;
-
-PyAPI_FUNC(PyObject *) PyClassMethod_New(PyObject *);
-PyAPI_FUNC(PyObject *) PyStaticMethod_New(PyObject *);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_FUNCOBJECT_H */
+ 
+/* Function object interface */ 
+ 
+#ifndef Py_FUNCOBJECT_H 
+#define Py_FUNCOBJECT_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+/* Function objects and code objects should not be confused with each other: 
+ * 
+ * Function objects are created by the execution of the 'def' statement. 
+ * They reference a code object in their func_code attribute, which is a 
+ * purely syntactic object, i.e. nothing more than a compiled version of some 
+ * source code lines.  There is one code object per source code "fragment", 
+ * but each code object can be referenced by zero or many function objects 
+ * depending only on how many times the 'def' statement in the source was 
+ * executed so far. 
+ */ 
+ 
+typedef struct { 
+    PyObject_HEAD 
+    PyObject *func_code;	/* A code object */ 
+    PyObject *func_globals;	/* A dictionary (other mappings won't do) */ 
+    PyObject *func_defaults;	/* NULL or a tuple */ 
+    PyObject *func_closure;	/* NULL or a tuple of cell objects */ 
+    PyObject *func_doc;		/* The __doc__ attribute, can be anything */ 
+    PyObject *func_name;	/* The __name__ attribute, a string object */ 
+    PyObject *func_dict;	/* The __dict__ attribute, a dict or NULL */ 
+    PyObject *func_weakreflist;	/* List of weak references */ 
+    PyObject *func_module;	/* The __module__ attribute, can be anything */ 
+ 
+    /* Invariant: 
+     *     func_closure contains the bindings for func_code->co_freevars, so 
+     *     PyTuple_Size(func_closure) == PyCode_GetNumFree(func_code) 
+     *     (func_closure may be NULL if PyCode_GetNumFree(func_code) == 0). 
+     */ 
+} PyFunctionObject; 
+ 
+PyAPI_DATA(PyTypeObject) PyFunction_Type; 
+ 
+#define PyFunction_Check(op) (Py_TYPE(op) == &PyFunction_Type) 
+ 
+PyAPI_FUNC(PyObject *) PyFunction_New(PyObject *, PyObject *); 
+PyAPI_FUNC(PyObject *) PyFunction_GetCode(PyObject *); 
+PyAPI_FUNC(PyObject *) PyFunction_GetGlobals(PyObject *); 
+PyAPI_FUNC(PyObject *) PyFunction_GetModule(PyObject *); 
+PyAPI_FUNC(PyObject *) PyFunction_GetDefaults(PyObject *); 
+PyAPI_FUNC(int) PyFunction_SetDefaults(PyObject *, PyObject *); 
+PyAPI_FUNC(PyObject *) PyFunction_GetClosure(PyObject *); 
+PyAPI_FUNC(int) PyFunction_SetClosure(PyObject *, PyObject *); 
+ 
+/* Macros for direct access to these values. Type checks are *not* 
+   done, so use with care. */ 
+#define PyFunction_GET_CODE(func) \ 
+        (((PyFunctionObject *)func) -> func_code) 
+#define PyFunction_GET_GLOBALS(func) \ 
+	(((PyFunctionObject *)func) -> func_globals) 
+#define PyFunction_GET_MODULE(func) \ 
+	(((PyFunctionObject *)func) -> func_module) 
+#define PyFunction_GET_DEFAULTS(func) \ 
+	(((PyFunctionObject *)func) -> func_defaults) 
+#define PyFunction_GET_CLOSURE(func) \ 
+	(((PyFunctionObject *)func) -> func_closure) 
+ 
+/* The classmethod and staticmethod types lives here, too */ 
+PyAPI_DATA(PyTypeObject) PyClassMethod_Type; 
+PyAPI_DATA(PyTypeObject) PyStaticMethod_Type; 
+ 
+PyAPI_FUNC(PyObject *) PyClassMethod_New(PyObject *); 
+PyAPI_FUNC(PyObject *) PyStaticMethod_New(PyObject *); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_FUNCOBJECT_H */ 
diff --git a/contrib/tools/python/src/Include/genobject.h b/contrib/tools/python/src/Include/genobject.h
index 135561b701..dfaf48ea2e 100644
--- a/contrib/tools/python/src/Include/genobject.h
+++ b/contrib/tools/python/src/Include/genobject.h
@@ -1,40 +1,40 @@
-
-/* Generator object interface */
-
-#ifndef Py_GENOBJECT_H
-#define Py_GENOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct _frame; /* Avoid including frameobject.h */
-
-typedef struct {
-	PyObject_HEAD
-	/* The gi_ prefix is intended to remind of generator-iterator. */
-
-	/* Note: gi_frame can be NULL if the generator is "finished" */
-	struct _frame *gi_frame;
-
-	/* True if generator is being executed. */
-	int gi_running;
-    
-	/* The code object backing the generator */
-	PyObject *gi_code;
-
-	/* List of weak reference. */
-	PyObject *gi_weakreflist;
-} PyGenObject;
-
-PyAPI_DATA(PyTypeObject) PyGen_Type;
-
-#define PyGen_Check(op) PyObject_TypeCheck(op, &PyGen_Type)
-#define PyGen_CheckExact(op) (Py_TYPE(op) == &PyGen_Type)
-
-PyAPI_FUNC(PyObject *) PyGen_New(struct _frame *);
-PyAPI_FUNC(int) PyGen_NeedsFinalizing(PyGenObject *);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_GENOBJECT_H */
+ 
+/* Generator object interface */ 
+ 
+#ifndef Py_GENOBJECT_H 
+#define Py_GENOBJECT_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+struct _frame; /* Avoid including frameobject.h */ 
+ 
+typedef struct { 
+	PyObject_HEAD 
+	/* The gi_ prefix is intended to remind of generator-iterator. */ 
+ 
+	/* Note: gi_frame can be NULL if the generator is "finished" */ 
+	struct _frame *gi_frame; 
+ 
+	/* True if generator is being executed. */ 
+	int gi_running; 
+     
+	/* The code object backing the generator */ 
+	PyObject *gi_code; 
+ 
+	/* List of weak reference. */ 
+	PyObject *gi_weakreflist; 
+} PyGenObject; 
+ 
+PyAPI_DATA(PyTypeObject) PyGen_Type; 
+ 
+#define PyGen_Check(op) PyObject_TypeCheck(op, &PyGen_Type) 
+#define PyGen_CheckExact(op) (Py_TYPE(op) == &PyGen_Type) 
+ 
+PyAPI_FUNC(PyObject *) PyGen_New(struct _frame *); 
+PyAPI_FUNC(int) PyGen_NeedsFinalizing(PyGenObject *); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_GENOBJECT_H */ 
diff --git a/contrib/tools/python/src/Include/graminit.h b/contrib/tools/python/src/Include/graminit.h
index 40d531e8a1..2ecc56193d 100644
--- a/contrib/tools/python/src/Include/graminit.h
+++ b/contrib/tools/python/src/Include/graminit.h
@@ -1,87 +1,87 @@
-/* Generated by Parser/pgen */
-
-#define single_input 256
-#define file_input 257
-#define eval_input 258
-#define decorator 259
-#define decorators 260
-#define decorated 261
-#define funcdef 262
-#define parameters 263
-#define varargslist 264
-#define fpdef 265
-#define fplist 266
-#define stmt 267
-#define simple_stmt 268
-#define small_stmt 269
-#define expr_stmt 270
-#define augassign 271
-#define print_stmt 272
-#define del_stmt 273
-#define pass_stmt 274
-#define flow_stmt 275
-#define break_stmt 276
-#define continue_stmt 277
-#define return_stmt 278
-#define yield_stmt 279
-#define raise_stmt 280
-#define import_stmt 281
-#define import_name 282
-#define import_from 283
-#define import_as_name 284
-#define dotted_as_name 285
-#define import_as_names 286
-#define dotted_as_names 287
-#define dotted_name 288
-#define global_stmt 289
-#define exec_stmt 290
-#define assert_stmt 291
-#define compound_stmt 292
-#define if_stmt 293
-#define while_stmt 294
-#define for_stmt 295
-#define try_stmt 296
-#define with_stmt 297
-#define with_item 298
-#define except_clause 299
-#define suite 300
-#define testlist_safe 301
-#define old_test 302
-#define old_lambdef 303
-#define test 304
-#define or_test 305
-#define and_test 306
-#define not_test 307
-#define comparison 308
-#define comp_op 309
-#define expr 310
-#define xor_expr 311
-#define and_expr 312
-#define shift_expr 313
-#define arith_expr 314
-#define term 315
-#define factor 316
-#define power 317
-#define atom 318
-#define listmaker 319
-#define testlist_comp 320
-#define lambdef 321
-#define trailer 322
-#define subscriptlist 323
-#define subscript 324
-#define sliceop 325
-#define exprlist 326
-#define testlist 327
-#define dictorsetmaker 328
-#define classdef 329
-#define arglist 330
-#define argument 331
-#define list_iter 332
-#define list_for 333
-#define list_if 334
-#define comp_iter 335
-#define comp_for 336
-#define comp_if 337
-#define testlist1 338
-#define encoding_decl 339
-#define yield_expr 340
+/* Generated by Parser/pgen */ 
+ 
+#define single_input 256 
+#define file_input 257 
+#define eval_input 258 
+#define decorator 259 
+#define decorators 260 
+#define decorated 261 
+#define funcdef 262 
+#define parameters 263 
+#define varargslist 264 
+#define fpdef 265 
+#define fplist 266 
+#define stmt 267 
+#define simple_stmt 268 
+#define small_stmt 269 
+#define expr_stmt 270 
+#define augassign 271 
+#define print_stmt 272 
+#define del_stmt 273 
+#define pass_stmt 274 
+#define flow_stmt 275 
+#define break_stmt 276 
+#define continue_stmt 277 
+#define return_stmt 278 
+#define yield_stmt 279 
+#define raise_stmt 280 
+#define import_stmt 281 
+#define import_name 282 
+#define import_from 283 
+#define import_as_name 284 
+#define dotted_as_name 285 
+#define import_as_names 286 
+#define dotted_as_names 287 
+#define dotted_name 288 
+#define global_stmt 289 
+#define exec_stmt 290 
+#define assert_stmt 291 
+#define compound_stmt 292 
+#define if_stmt 293 
+#define while_stmt 294 
+#define for_stmt 295 
+#define try_stmt 296 
+#define with_stmt 297 
+#define with_item 298 
+#define except_clause 299 
+#define suite 300 
+#define testlist_safe 301 
+#define old_test 302 
+#define old_lambdef 303 
+#define test 304 
+#define or_test 305 
+#define and_test 306 
+#define not_test 307 
+#define comparison 308 
+#define comp_op 309 
+#define expr 310 
+#define xor_expr 311 
+#define and_expr 312 
+#define shift_expr 313 
+#define arith_expr 314 
+#define term 315 
+#define factor 316 
+#define power 317 
+#define atom 318 
+#define listmaker 319 
+#define testlist_comp 320 
+#define lambdef 321 
+#define trailer 322 
+#define subscriptlist 323 
+#define subscript 324 
+#define sliceop 325 
+#define exprlist 326 
+#define testlist 327 
+#define dictorsetmaker 328 
+#define classdef 329 
+#define arglist 330 
+#define argument 331 
+#define list_iter 332 
+#define list_for 333 
+#define list_if 334 
+#define comp_iter 335 
+#define comp_for 336 
+#define comp_if 337 
+#define testlist1 338 
+#define encoding_decl 339 
+#define yield_expr 340 
diff --git a/contrib/tools/python/src/Include/grammar.h b/contrib/tools/python/src/Include/grammar.h
index decf2e6126..b257da4f42 100644
--- a/contrib/tools/python/src/Include/grammar.h
+++ b/contrib/tools/python/src/Include/grammar.h
@@ -1,94 +1,94 @@
-
-/* Grammar interface */
-
-#ifndef Py_GRAMMAR_H
-#define Py_GRAMMAR_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "bitset.h" /* Sigh... */
-
-/* A label of an arc */
-
-typedef struct {
-    int		 lb_type;
-    char	*lb_str;
-} label;
-
-#define EMPTY 0		/* Label number 0 is by definition the empty label */
-
-/* A list of labels */
-
-typedef struct {
-    int		 ll_nlabels;
-    label	*ll_label;
-} labellist;
-
-/* An arc from one state to another */
-
-typedef struct {
-    short	a_lbl;		/* Label of this arc */
-    short	a_arrow;	/* State where this arc goes to */
-} arc;
-
-/* A state in a DFA */
-
-typedef struct {
-    int		 s_narcs;
-    arc		*s_arc;		/* Array of arcs */
-	
-    /* Optional accelerators */
-    int		 s_lower;	/* Lowest label index */
-    int		 s_upper;	/* Highest label index */
-    int		*s_accel;	/* Accelerator */
-    int		 s_accept;	/* Nonzero for accepting state */
-} state;
-
-/* A DFA */
-
-typedef struct {
-    int		 d_type;	/* Non-terminal this represents */
-    char	*d_name;	/* For printing */
-    int		 d_initial;	/* Initial state */
-    int		 d_nstates;
-    state	*d_state;	/* Array of states */
-    bitset	 d_first;
-} dfa;
-
-/* A grammar */
-
-typedef struct {
-    int		 g_ndfas;
-    dfa		*g_dfa;		/* Array of DFAs */
-    labellist	 g_ll;
-    int		 g_start;	/* Start symbol of the grammar */
-    int		 g_accel;	/* Set if accelerators present */
-} grammar;
-
-/* FUNCTIONS */
-
-grammar *newgrammar(int start);
+ 
+/* Grammar interface */ 
+ 
+#ifndef Py_GRAMMAR_H 
+#define Py_GRAMMAR_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+#include "bitset.h" /* Sigh... */ 
+ 
+/* A label of an arc */ 
+ 
+typedef struct { 
+    int		 lb_type; 
+    char	*lb_str; 
+} label; 
+ 
+#define EMPTY 0		/* Label number 0 is by definition the empty label */ 
+ 
+/* A list of labels */ 
+ 
+typedef struct { 
+    int		 ll_nlabels; 
+    label	*ll_label; 
+} labellist; 
+ 
+/* An arc from one state to another */ 
+ 
+typedef struct { 
+    short	a_lbl;		/* Label of this arc */ 
+    short	a_arrow;	/* State where this arc goes to */ 
+} arc; 
+ 
+/* A state in a DFA */ 
+ 
+typedef struct { 
+    int		 s_narcs; 
+    arc		*s_arc;		/* Array of arcs */ 
+	 
+    /* Optional accelerators */ 
+    int		 s_lower;	/* Lowest label index */ 
+    int		 s_upper;	/* Highest label index */ 
+    int		*s_accel;	/* Accelerator */ 
+    int		 s_accept;	/* Nonzero for accepting state */ 
+} state; 
+ 
+/* A DFA */ 
+ 
+typedef struct { 
+    int		 d_type;	/* Non-terminal this represents */ 
+    char	*d_name;	/* For printing */ 
+    int		 d_initial;	/* Initial state */ 
+    int		 d_nstates; 
+    state	*d_state;	/* Array of states */ 
+    bitset	 d_first; 
+} dfa; 
+ 
+/* A grammar */ 
+ 
+typedef struct { 
+    int		 g_ndfas; 
+    dfa		*g_dfa;		/* Array of DFAs */ 
+    labellist	 g_ll; 
+    int		 g_start;	/* Start symbol of the grammar */ 
+    int		 g_accel;	/* Set if accelerators present */ 
+} grammar; 
+ 
+/* FUNCTIONS */ 
+ 
+grammar *newgrammar(int start); 
 void freegrammar(grammar *g);
-dfa *adddfa(grammar *g, int type, char *name);
-int addstate(dfa *d);
-void addarc(dfa *d, int from, int to, int lbl);
-dfa *PyGrammar_FindDFA(grammar *g, int type);
-
-int addlabel(labellist *ll, int type, char *str);
-int findlabel(labellist *ll, int type, char *str);
-char *PyGrammar_LabelRepr(label *lb);
-void translatelabels(grammar *g);
-
-void addfirstsets(grammar *g);
-
-void PyGrammar_AddAccelerators(grammar *g);
-void PyGrammar_RemoveAccelerators(grammar *);
-
-void printgrammar(grammar *g, FILE *fp);
-void printnonterminals(grammar *g, FILE *fp);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_GRAMMAR_H */
+dfa *adddfa(grammar *g, int type, char *name); 
+int addstate(dfa *d); 
+void addarc(dfa *d, int from, int to, int lbl); 
+dfa *PyGrammar_FindDFA(grammar *g, int type); 
+ 
+int addlabel(labellist *ll, int type, char *str); 
+int findlabel(labellist *ll, int type, char *str); 
+char *PyGrammar_LabelRepr(label *lb); 
+void translatelabels(grammar *g); 
+ 
+void addfirstsets(grammar *g); 
+ 
+void PyGrammar_AddAccelerators(grammar *g); 
+void PyGrammar_RemoveAccelerators(grammar *); 
+ 
+void printgrammar(grammar *g, FILE *fp); 
+void printnonterminals(grammar *g, FILE *fp); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_GRAMMAR_H */ 
diff --git a/contrib/tools/python/src/Include/import.h b/contrib/tools/python/src/Include/import.h
index 89f51b55d5..d12764e99d 100644
--- a/contrib/tools/python/src/Include/import.h
+++ b/contrib/tools/python/src/Include/import.h
@@ -1,71 +1,71 @@
-
-/* Module definition and import interface */
-
-#ifndef Py_IMPORT_H
-#define Py_IMPORT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_FUNC(long) PyImport_GetMagicNumber(void);
-PyAPI_FUNC(PyObject *) PyImport_ExecCodeModule(char *name, PyObject *co);
-PyAPI_FUNC(PyObject *) PyImport_ExecCodeModuleEx(
-	char *name, PyObject *co, char *pathname);
-PyAPI_FUNC(PyObject *) PyImport_GetModuleDict(void);
-PyAPI_FUNC(PyObject *) PyImport_AddModule(const char *name);
-PyAPI_FUNC(PyObject *) PyImport_ImportModule(const char *name);
-PyAPI_FUNC(PyObject *) PyImport_ImportModuleNoBlock(const char *);
-PyAPI_FUNC(PyObject *) PyImport_ImportModuleLevel(char *name,
-	PyObject *globals, PyObject *locals, PyObject *fromlist, int level);
-
-#define PyImport_ImportModuleEx(n, g, l, f) \
-	PyImport_ImportModuleLevel(n, g, l, f, -1)
-
-PyAPI_FUNC(PyObject *) PyImport_GetImporter(PyObject *path);
-PyAPI_FUNC(PyObject *) PyImport_Import(PyObject *name);
-PyAPI_FUNC(PyObject *) PyImport_ReloadModule(PyObject *m);
-PyAPI_FUNC(void) PyImport_Cleanup(void);
-PyAPI_FUNC(int) PyImport_ImportFrozenModule(char *);
-
-#ifdef WITH_THREAD
-PyAPI_FUNC(void) _PyImport_AcquireLock(void);
-PyAPI_FUNC(int) _PyImport_ReleaseLock(void);
-#else
-#define _PyImport_AcquireLock()
-#define _PyImport_ReleaseLock() 1
-#endif
-
-PyAPI_FUNC(struct filedescr *) _PyImport_FindModule(
-	const char *, PyObject *, char *, size_t, FILE **, PyObject **);
-PyAPI_FUNC(int) _PyImport_IsScript(struct filedescr *);
-PyAPI_FUNC(void) _PyImport_ReInitLock(void);
-
+ 
+/* Module definition and import interface */ 
+ 
+#ifndef Py_IMPORT_H 
+#define Py_IMPORT_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+PyAPI_FUNC(long) PyImport_GetMagicNumber(void); 
+PyAPI_FUNC(PyObject *) PyImport_ExecCodeModule(char *name, PyObject *co); 
+PyAPI_FUNC(PyObject *) PyImport_ExecCodeModuleEx( 
+	char *name, PyObject *co, char *pathname); 
+PyAPI_FUNC(PyObject *) PyImport_GetModuleDict(void); 
+PyAPI_FUNC(PyObject *) PyImport_AddModule(const char *name); 
+PyAPI_FUNC(PyObject *) PyImport_ImportModule(const char *name); 
+PyAPI_FUNC(PyObject *) PyImport_ImportModuleNoBlock(const char *); 
+PyAPI_FUNC(PyObject *) PyImport_ImportModuleLevel(char *name, 
+	PyObject *globals, PyObject *locals, PyObject *fromlist, int level); 
+ 
+#define PyImport_ImportModuleEx(n, g, l, f) \ 
+	PyImport_ImportModuleLevel(n, g, l, f, -1) 
+ 
+PyAPI_FUNC(PyObject *) PyImport_GetImporter(PyObject *path); 
+PyAPI_FUNC(PyObject *) PyImport_Import(PyObject *name); 
+PyAPI_FUNC(PyObject *) PyImport_ReloadModule(PyObject *m); 
+PyAPI_FUNC(void) PyImport_Cleanup(void); 
+PyAPI_FUNC(int) PyImport_ImportFrozenModule(char *); 
+ 
+#ifdef WITH_THREAD 
+PyAPI_FUNC(void) _PyImport_AcquireLock(void); 
+PyAPI_FUNC(int) _PyImport_ReleaseLock(void); 
+#else 
+#define _PyImport_AcquireLock() 
+#define _PyImport_ReleaseLock() 1 
+#endif 
+ 
+PyAPI_FUNC(struct filedescr *) _PyImport_FindModule( 
+	const char *, PyObject *, char *, size_t, FILE **, PyObject **); 
+PyAPI_FUNC(int) _PyImport_IsScript(struct filedescr *); 
+PyAPI_FUNC(void) _PyImport_ReInitLock(void); 
+ 
 PyAPI_FUNC(PyObject *) _PyImport_FindExtension(char *, char *);
 PyAPI_FUNC(PyObject *) _PyImport_FixupExtension(char *, char *);
-
-struct _inittab {
-    char *name;
-    void (*initfunc)(void);
-};
-
-PyAPI_DATA(PyTypeObject) PyNullImporter_Type;
-PyAPI_DATA(struct _inittab *) PyImport_Inittab;
-
-PyAPI_FUNC(int) PyImport_AppendInittab(const char *name, void (*initfunc)(void));
-PyAPI_FUNC(int) PyImport_ExtendInittab(struct _inittab *newtab);
-
-struct _frozen {
-    char *name;
-    unsigned char *code;
-    int size;
-};
-
-/* Embedding apps may change this pointer to point to their favorite
-   collection of frozen modules: */
-
-PyAPI_DATA(struct _frozen *) PyImport_FrozenModules;
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_IMPORT_H */
+ 
+struct _inittab { 
+    char *name; 
+    void (*initfunc)(void); 
+}; 
+ 
+PyAPI_DATA(PyTypeObject) PyNullImporter_Type; 
+PyAPI_DATA(struct _inittab *) PyImport_Inittab; 
+ 
+PyAPI_FUNC(int) PyImport_AppendInittab(const char *name, void (*initfunc)(void)); 
+PyAPI_FUNC(int) PyImport_ExtendInittab(struct _inittab *newtab); 
+ 
+struct _frozen { 
+    char *name; 
+    unsigned char *code; 
+    int size; 
+}; 
+ 
+/* Embedding apps may change this pointer to point to their favorite 
+   collection of frozen modules: */ 
+ 
+PyAPI_DATA(struct _frozen *) PyImport_FrozenModules; 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_IMPORT_H */ 
diff --git a/contrib/tools/python/src/Include/intobject.h b/contrib/tools/python/src/Include/intobject.h
index d1985748b3..8deb691918 100644
--- a/contrib/tools/python/src/Include/intobject.h
+++ b/contrib/tools/python/src/Include/intobject.h
@@ -1,84 +1,84 @@
-
-/* Integer object interface */
-
-/*
-PyIntObject represents a (long) integer.  This is an immutable object;
-an integer cannot change its value after creation.
-
-There are functions to create new integer objects, to test an object
-for integer-ness, and to get the integer value.  The latter functions
-returns -1 and sets errno to EBADF if the object is not an PyIntObject.
-None of the functions should be applied to nil objects.
-
-The type PyIntObject is (unfortunately) exposed here so we can declare
-_Py_TrueStruct and _Py_ZeroStruct in boolobject.h; don't use this.
-*/
-
-#ifndef Py_INTOBJECT_H
-#define Py_INTOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
-    PyObject_HEAD
-    long ob_ival;
-} PyIntObject;
-
-PyAPI_DATA(PyTypeObject) PyInt_Type;
-
-#define PyInt_Check(op) \
+ 
+/* Integer object interface */ 
+ 
+/* 
+PyIntObject represents a (long) integer.  This is an immutable object; 
+an integer cannot change its value after creation. 
+ 
+There are functions to create new integer objects, to test an object 
+for integer-ness, and to get the integer value.  The latter functions 
+returns -1 and sets errno to EBADF if the object is not an PyIntObject. 
+None of the functions should be applied to nil objects. 
+ 
+The type PyIntObject is (unfortunately) exposed here so we can declare 
+_Py_TrueStruct and _Py_ZeroStruct in boolobject.h; don't use this. 
+*/ 
+ 
+#ifndef Py_INTOBJECT_H 
+#define Py_INTOBJECT_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+typedef struct { 
+    PyObject_HEAD 
+    long ob_ival; 
+} PyIntObject; 
+ 
+PyAPI_DATA(PyTypeObject) PyInt_Type; 
+ 
+#define PyInt_Check(op) \ 
 		 PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_INT_SUBCLASS)
 #define PyInt_CheckExact(op) (Py_TYPE(op) == &PyInt_Type)
-
+ 
 #define _PyAnyInt_Check(op) (PyInt_Check(op) || PyLong_Check(op))
 #define _PyAnyInt_CheckExact(op) (PyInt_CheckExact(op) || PyLong_CheckExact(op))
 
-PyAPI_FUNC(PyObject *) PyInt_FromString(char*, char**, int);
-#ifdef Py_USING_UNICODE
-PyAPI_FUNC(PyObject *) PyInt_FromUnicode(Py_UNICODE*, Py_ssize_t, int);
-#endif
-PyAPI_FUNC(PyObject *) PyInt_FromLong(long);
-PyAPI_FUNC(PyObject *) PyInt_FromSize_t(size_t);
-PyAPI_FUNC(PyObject *) PyInt_FromSsize_t(Py_ssize_t);
-PyAPI_FUNC(long) PyInt_AsLong(PyObject *);
-PyAPI_FUNC(Py_ssize_t) PyInt_AsSsize_t(PyObject *);
+PyAPI_FUNC(PyObject *) PyInt_FromString(char*, char**, int); 
+#ifdef Py_USING_UNICODE 
+PyAPI_FUNC(PyObject *) PyInt_FromUnicode(Py_UNICODE*, Py_ssize_t, int); 
+#endif 
+PyAPI_FUNC(PyObject *) PyInt_FromLong(long); 
+PyAPI_FUNC(PyObject *) PyInt_FromSize_t(size_t); 
+PyAPI_FUNC(PyObject *) PyInt_FromSsize_t(Py_ssize_t); 
+PyAPI_FUNC(long) PyInt_AsLong(PyObject *); 
+PyAPI_FUNC(Py_ssize_t) PyInt_AsSsize_t(PyObject *); 
 PyAPI_FUNC(int) _PyInt_AsInt(PyObject *);
-PyAPI_FUNC(unsigned long) PyInt_AsUnsignedLongMask(PyObject *);
-#ifdef HAVE_LONG_LONG
-PyAPI_FUNC(unsigned PY_LONG_LONG) PyInt_AsUnsignedLongLongMask(PyObject *);
-#endif
-
-PyAPI_FUNC(long) PyInt_GetMax(void);
-
-/* Macro, trading safety for speed */
-#define PyInt_AS_LONG(op) (((PyIntObject *)(op))->ob_ival)
-
-/* These aren't really part of the Int object, but they're handy; the protos
- * are necessary for systems that need the magic of PyAPI_FUNC and that want
- * to have stropmodule as a dynamically loaded module instead of building it
- * into the main Python shared library/DLL.  Guido thinks I'm weird for
- * building it this way.  :-)  [cjh]
- */
-PyAPI_FUNC(unsigned long) PyOS_strtoul(char *, char **, int);
-PyAPI_FUNC(long) PyOS_strtol(char *, char **, int);
-
-/* free list api */
-PyAPI_FUNC(int) PyInt_ClearFreeList(void);
-
-/* Convert an integer to the given base.  Returns a string.
-   If base is 2, 8 or 16, add the proper prefix '0b', '0o' or '0x'.
-   If newstyle is zero, then use the pre-2.6 behavior of octal having
-   a leading "0" */
-PyAPI_FUNC(PyObject*) _PyInt_Format(PyIntObject* v, int base, int newstyle);
-
-/* Format the object based on the format_spec, as defined in PEP 3101
-   (Advanced String Formatting). */
-PyAPI_FUNC(PyObject *) _PyInt_FormatAdvanced(PyObject *obj,
-					     char *format_spec,
-					     Py_ssize_t format_spec_len);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_INTOBJECT_H */
+PyAPI_FUNC(unsigned long) PyInt_AsUnsignedLongMask(PyObject *); 
+#ifdef HAVE_LONG_LONG 
+PyAPI_FUNC(unsigned PY_LONG_LONG) PyInt_AsUnsignedLongLongMask(PyObject *); 
+#endif 
+ 
+PyAPI_FUNC(long) PyInt_GetMax(void); 
+ 
+/* Macro, trading safety for speed */ 
+#define PyInt_AS_LONG(op) (((PyIntObject *)(op))->ob_ival) 
+ 
+/* These aren't really part of the Int object, but they're handy; the protos 
+ * are necessary for systems that need the magic of PyAPI_FUNC and that want 
+ * to have stropmodule as a dynamically loaded module instead of building it 
+ * into the main Python shared library/DLL.  Guido thinks I'm weird for 
+ * building it this way.  :-)  [cjh] 
+ */ 
+PyAPI_FUNC(unsigned long) PyOS_strtoul(char *, char **, int); 
+PyAPI_FUNC(long) PyOS_strtol(char *, char **, int); 
+ 
+/* free list api */ 
+PyAPI_FUNC(int) PyInt_ClearFreeList(void); 
+ 
+/* Convert an integer to the given base.  Returns a string. 
+   If base is 2, 8 or 16, add the proper prefix '0b', '0o' or '0x'. 
+   If newstyle is zero, then use the pre-2.6 behavior of octal having 
+   a leading "0" */ 
+PyAPI_FUNC(PyObject*) _PyInt_Format(PyIntObject* v, int base, int newstyle); 
+ 
+/* Format the object based on the format_spec, as defined in PEP 3101 
+   (Advanced String Formatting). */ 
+PyAPI_FUNC(PyObject *) _PyInt_FormatAdvanced(PyObject *obj, 
+					     char *format_spec, 
+					     Py_ssize_t format_spec_len); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_INTOBJECT_H */ 
diff --git a/contrib/tools/python/src/Include/intrcheck.h b/contrib/tools/python/src/Include/intrcheck.h
index 3b67ed0d5a..b81b5235d0 100644
--- a/contrib/tools/python/src/Include/intrcheck.h
+++ b/contrib/tools/python/src/Include/intrcheck.h
@@ -1,15 +1,15 @@
-
-#ifndef Py_INTRCHECK_H
-#define Py_INTRCHECK_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_FUNC(int) PyOS_InterruptOccurred(void);
-PyAPI_FUNC(void) PyOS_InitInterrupts(void);
-PyAPI_FUNC(void) PyOS_AfterFork(void);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_INTRCHECK_H */
+ 
+#ifndef Py_INTRCHECK_H 
+#define Py_INTRCHECK_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+PyAPI_FUNC(int) PyOS_InterruptOccurred(void); 
+PyAPI_FUNC(void) PyOS_InitInterrupts(void); 
+PyAPI_FUNC(void) PyOS_AfterFork(void); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_INTRCHECK_H */ 
diff --git a/contrib/tools/python/src/Include/iterobject.h b/contrib/tools/python/src/Include/iterobject.h
index 4bd19c2909..45105592f3 100644
--- a/contrib/tools/python/src/Include/iterobject.h
+++ b/contrib/tools/python/src/Include/iterobject.h
@@ -1,23 +1,23 @@
-#ifndef Py_ITEROBJECT_H
-#define Py_ITEROBJECT_H
-/* Iterators (the basic kind, over a sequence) */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_DATA(PyTypeObject) PySeqIter_Type;
-
-#define PySeqIter_Check(op) (Py_TYPE(op) == &PySeqIter_Type)
-
-PyAPI_FUNC(PyObject *) PySeqIter_New(PyObject *);
-
-PyAPI_DATA(PyTypeObject) PyCallIter_Type;
-
-#define PyCallIter_Check(op) (Py_TYPE(op) == &PyCallIter_Type)
-
-PyAPI_FUNC(PyObject *) PyCallIter_New(PyObject *, PyObject *);
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_ITEROBJECT_H */
-
+#ifndef Py_ITEROBJECT_H 
+#define Py_ITEROBJECT_H 
+/* Iterators (the basic kind, over a sequence) */ 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+PyAPI_DATA(PyTypeObject) PySeqIter_Type; 
+ 
+#define PySeqIter_Check(op) (Py_TYPE(op) == &PySeqIter_Type) 
+ 
+PyAPI_FUNC(PyObject *) PySeqIter_New(PyObject *); 
+ 
+PyAPI_DATA(PyTypeObject) PyCallIter_Type; 
+ 
+#define PyCallIter_Check(op) (Py_TYPE(op) == &PyCallIter_Type) 
+ 
+PyAPI_FUNC(PyObject *) PyCallIter_New(PyObject *, PyObject *); 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_ITEROBJECT_H */ 
+ 
diff --git a/contrib/tools/python/src/Include/listobject.h b/contrib/tools/python/src/Include/listobject.h
index f19b1c5e56..f59d87f94b 100644
--- a/contrib/tools/python/src/Include/listobject.h
+++ b/contrib/tools/python/src/Include/listobject.h
@@ -1,68 +1,68 @@
-
-/* List object interface */
-
-/*
+ 
+/* List object interface */ 
+ 
+/* 
 Another generally useful object type is a list of object pointers.
-This is a mutable type: the list items can be changed, and items can be
-added or removed.  Out-of-range indices or non-list objects are ignored.
-
-*** WARNING *** PyList_SetItem does not increment the new item's reference
-count, but does decrement the reference count of the item it replaces,
-if not nil.  It does *decrement* the reference count if it is *not*
-inserted in the list.  Similarly, PyList_GetItem does not increment the
-returned item's reference count.
-*/
-
-#ifndef Py_LISTOBJECT_H
-#define Py_LISTOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
-    PyObject_VAR_HEAD
-    /* Vector of pointers to list elements.  list[0] is ob_item[0], etc. */
-    PyObject **ob_item;
-
-    /* ob_item contains space for 'allocated' elements.  The number
-     * currently in use is ob_size.
-     * Invariants:
-     *     0 <= ob_size <= allocated
-     *     len(list) == ob_size
-     *     ob_item == NULL implies ob_size == allocated == 0
-     * list.sort() temporarily sets allocated to -1 to detect mutations.
-     *
-     * Items must normally not be NULL, except during construction when
-     * the list is not yet visible outside the function that builds it.
-     */
-    Py_ssize_t allocated;
-} PyListObject;
-
-PyAPI_DATA(PyTypeObject) PyList_Type;
-
-#define PyList_Check(op) \
+This is a mutable type: the list items can be changed, and items can be 
+added or removed.  Out-of-range indices or non-list objects are ignored. 
+ 
+*** WARNING *** PyList_SetItem does not increment the new item's reference 
+count, but does decrement the reference count of the item it replaces, 
+if not nil.  It does *decrement* the reference count if it is *not* 
+inserted in the list.  Similarly, PyList_GetItem does not increment the 
+returned item's reference count. 
+*/ 
+ 
+#ifndef Py_LISTOBJECT_H 
+#define Py_LISTOBJECT_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+typedef struct { 
+    PyObject_VAR_HEAD 
+    /* Vector of pointers to list elements.  list[0] is ob_item[0], etc. */ 
+    PyObject **ob_item; 
+ 
+    /* ob_item contains space for 'allocated' elements.  The number 
+     * currently in use is ob_size. 
+     * Invariants: 
+     *     0 <= ob_size <= allocated 
+     *     len(list) == ob_size 
+     *     ob_item == NULL implies ob_size == allocated == 0 
+     * list.sort() temporarily sets allocated to -1 to detect mutations. 
+     * 
+     * Items must normally not be NULL, except during construction when 
+     * the list is not yet visible outside the function that builds it. 
+     */ 
+    Py_ssize_t allocated; 
+} PyListObject; 
+ 
+PyAPI_DATA(PyTypeObject) PyList_Type; 
+ 
+#define PyList_Check(op) \ 
     PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_LIST_SUBCLASS)
-#define PyList_CheckExact(op) (Py_TYPE(op) == &PyList_Type)
-
-PyAPI_FUNC(PyObject *) PyList_New(Py_ssize_t size);
-PyAPI_FUNC(Py_ssize_t) PyList_Size(PyObject *);
-PyAPI_FUNC(PyObject *) PyList_GetItem(PyObject *, Py_ssize_t);
-PyAPI_FUNC(int) PyList_SetItem(PyObject *, Py_ssize_t, PyObject *);
-PyAPI_FUNC(int) PyList_Insert(PyObject *, Py_ssize_t, PyObject *);
-PyAPI_FUNC(int) PyList_Append(PyObject *, PyObject *);
-PyAPI_FUNC(PyObject *) PyList_GetSlice(PyObject *, Py_ssize_t, Py_ssize_t);
-PyAPI_FUNC(int) PyList_SetSlice(PyObject *, Py_ssize_t, Py_ssize_t, PyObject *);
-PyAPI_FUNC(int) PyList_Sort(PyObject *);
-PyAPI_FUNC(int) PyList_Reverse(PyObject *);
-PyAPI_FUNC(PyObject *) PyList_AsTuple(PyObject *);
-PyAPI_FUNC(PyObject *) _PyList_Extend(PyListObject *, PyObject *);
-
-/* Macro, trading safety for speed */
-#define PyList_GET_ITEM(op, i) (((PyListObject *)(op))->ob_item[i])
-#define PyList_SET_ITEM(op, i, v) (((PyListObject *)(op))->ob_item[i] = (v))
-#define PyList_GET_SIZE(op)    Py_SIZE(op)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_LISTOBJECT_H */
+#define PyList_CheckExact(op) (Py_TYPE(op) == &PyList_Type) 
+ 
+PyAPI_FUNC(PyObject *) PyList_New(Py_ssize_t size); 
+PyAPI_FUNC(Py_ssize_t) PyList_Size(PyObject *); 
+PyAPI_FUNC(PyObject *) PyList_GetItem(PyObject *, Py_ssize_t); 
+PyAPI_FUNC(int) PyList_SetItem(PyObject *, Py_ssize_t, PyObject *); 
+PyAPI_FUNC(int) PyList_Insert(PyObject *, Py_ssize_t, PyObject *); 
+PyAPI_FUNC(int) PyList_Append(PyObject *, PyObject *); 
+PyAPI_FUNC(PyObject *) PyList_GetSlice(PyObject *, Py_ssize_t, Py_ssize_t); 
+PyAPI_FUNC(int) PyList_SetSlice(PyObject *, Py_ssize_t, Py_ssize_t, PyObject *); 
+PyAPI_FUNC(int) PyList_Sort(PyObject *); 
+PyAPI_FUNC(int) PyList_Reverse(PyObject *); 
+PyAPI_FUNC(PyObject *) PyList_AsTuple(PyObject *); 
+PyAPI_FUNC(PyObject *) _PyList_Extend(PyListObject *, PyObject *); 
+ 
+/* Macro, trading safety for speed */ 
+#define PyList_GET_ITEM(op, i) (((PyListObject *)(op))->ob_item[i]) 
+#define PyList_SET_ITEM(op, i, v) (((PyListObject *)(op))->ob_item[i] = (v)) 
+#define PyList_GET_SIZE(op)    Py_SIZE(op) 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_LISTOBJECT_H */ 
diff --git a/contrib/tools/python/src/Include/longintrepr.h b/contrib/tools/python/src/Include/longintrepr.h
index 6425c30f39..e9b96da0f2 100644
--- a/contrib/tools/python/src/Include/longintrepr.h
+++ b/contrib/tools/python/src/Include/longintrepr.h
@@ -1,103 +1,103 @@
-#ifndef Py_LONGINTREPR_H
-#define Py_LONGINTREPR_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* This is published for the benefit of "friend" marshal.c only. */
-
-/* Parameters of the long integer representation.  There are two different
-   sets of parameters: one set for 30-bit digits, stored in an unsigned 32-bit
-   integer type, and one set for 15-bit digits with each digit stored in an
-   unsigned short.  The value of PYLONG_BITS_IN_DIGIT, defined either at
-   configure time or in pyport.h, is used to decide which digit size to use.
-
-   Type 'digit' should be able to hold 2*PyLong_BASE-1, and type 'twodigits'
-   should be an unsigned integer type able to hold all integers up to
-   PyLong_BASE*PyLong_BASE-1.  x_sub assumes that 'digit' is an unsigned type,
-   and that overflow is handled by taking the result modulo 2**N for some N >
-   PyLong_SHIFT.  The majority of the code doesn't care about the precise
-   value of PyLong_SHIFT, but there are some notable exceptions:
-
-   - long_pow() requires that PyLong_SHIFT be divisible by 5
-
-   - PyLong_{As,From}ByteArray require that PyLong_SHIFT be at least 8
-
-   - long_hash() requires that PyLong_SHIFT is *strictly* less than the number
-     of bits in an unsigned long, as do the PyLong <-> long (or unsigned long)
-     conversion functions
-
-   - the long <-> size_t/Py_ssize_t conversion functions expect that
-     PyLong_SHIFT is strictly less than the number of bits in a size_t
-
-   - the marshal code currently expects that PyLong_SHIFT is a multiple of 15
-
-  The values 15 and 30 should fit all of the above requirements, on any
-  platform.
-*/
-
-#if PYLONG_BITS_IN_DIGIT == 30
-#if !(defined HAVE_UINT64_T && defined HAVE_UINT32_T &&          \
-      defined HAVE_INT64_T && defined HAVE_INT32_T)
-#error "30-bit long digits requested, but the necessary types are not available on this platform"
-#endif
-typedef PY_UINT32_T digit;
-typedef PY_INT32_T sdigit; /* signed variant of digit */
-typedef PY_UINT64_T twodigits;
-typedef PY_INT64_T stwodigits; /* signed variant of twodigits */
-#define PyLong_SHIFT	30
-#define _PyLong_DECIMAL_SHIFT	9 /* max(e such that 10**e fits in a digit) */
-#define _PyLong_DECIMAL_BASE	((digit)1000000000) /* 10 ** DECIMAL_SHIFT */
-#elif PYLONG_BITS_IN_DIGIT == 15
-typedef unsigned short digit;
-typedef short sdigit; /* signed variant of digit */
-typedef unsigned long twodigits;
-typedef long stwodigits; /* signed variant of twodigits */
-#define PyLong_SHIFT	15
-#define _PyLong_DECIMAL_SHIFT	4 /* max(e such that 10**e fits in a digit) */
-#define _PyLong_DECIMAL_BASE	((digit)10000) /* 10 ** DECIMAL_SHIFT */
-#else
-#error "PYLONG_BITS_IN_DIGIT should be 15 or 30"
-#endif
-#define PyLong_BASE	((digit)1 << PyLong_SHIFT)
-#define PyLong_MASK	((digit)(PyLong_BASE - 1))
-
-/* b/w compatibility with Python 2.5 */
-#define SHIFT	PyLong_SHIFT
-#define BASE	PyLong_BASE
-#define MASK	PyLong_MASK
-
-#if PyLong_SHIFT % 5 != 0
-#error "longobject.c requires that PyLong_SHIFT be divisible by 5"
-#endif
-
-/* Long integer representation.
-   The absolute value of a number is equal to
-   	SUM(for i=0 through abs(ob_size)-1) ob_digit[i] * 2**(SHIFT*i)
-   Negative numbers are represented with ob_size < 0;
-   zero is represented by ob_size == 0.
-   In a normalized number, ob_digit[abs(ob_size)-1] (the most significant
-   digit) is never zero.  Also, in all cases, for all valid i,
-   	0 <= ob_digit[i] <= MASK.
-   The allocation function takes care of allocating extra memory
-   so that ob_digit[0] ... ob_digit[abs(ob_size)-1] are actually available.
-
-   CAUTION:  Generic code manipulating subtypes of PyVarObject has to
-   aware that longs abuse  ob_size's sign bit.
-*/
-
-struct _longobject {
-	PyObject_VAR_HEAD
-	digit ob_digit[1];
-};
-
-PyAPI_FUNC(PyLongObject *) _PyLong_New(Py_ssize_t);
-
-/* Return a copy of src. */
-PyAPI_FUNC(PyObject *) _PyLong_Copy(PyLongObject *src);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_LONGINTREPR_H */
+#ifndef Py_LONGINTREPR_H 
+#define Py_LONGINTREPR_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+ 
+/* This is published for the benefit of "friend" marshal.c only. */ 
+ 
+/* Parameters of the long integer representation.  There are two different 
+   sets of parameters: one set for 30-bit digits, stored in an unsigned 32-bit 
+   integer type, and one set for 15-bit digits with each digit stored in an 
+   unsigned short.  The value of PYLONG_BITS_IN_DIGIT, defined either at 
+   configure time or in pyport.h, is used to decide which digit size to use. 
+ 
+   Type 'digit' should be able to hold 2*PyLong_BASE-1, and type 'twodigits' 
+   should be an unsigned integer type able to hold all integers up to 
+   PyLong_BASE*PyLong_BASE-1.  x_sub assumes that 'digit' is an unsigned type, 
+   and that overflow is handled by taking the result modulo 2**N for some N > 
+   PyLong_SHIFT.  The majority of the code doesn't care about the precise 
+   value of PyLong_SHIFT, but there are some notable exceptions: 
+ 
+   - long_pow() requires that PyLong_SHIFT be divisible by 5 
+ 
+   - PyLong_{As,From}ByteArray require that PyLong_SHIFT be at least 8 
+ 
+   - long_hash() requires that PyLong_SHIFT is *strictly* less than the number 
+     of bits in an unsigned long, as do the PyLong <-> long (or unsigned long) 
+     conversion functions 
+ 
+   - the long <-> size_t/Py_ssize_t conversion functions expect that 
+     PyLong_SHIFT is strictly less than the number of bits in a size_t 
+ 
+   - the marshal code currently expects that PyLong_SHIFT is a multiple of 15 
+ 
+  The values 15 and 30 should fit all of the above requirements, on any 
+  platform. 
+*/ 
+ 
+#if PYLONG_BITS_IN_DIGIT == 30 
+#if !(defined HAVE_UINT64_T && defined HAVE_UINT32_T &&          \ 
+      defined HAVE_INT64_T && defined HAVE_INT32_T) 
+#error "30-bit long digits requested, but the necessary types are not available on this platform" 
+#endif 
+typedef PY_UINT32_T digit; 
+typedef PY_INT32_T sdigit; /* signed variant of digit */ 
+typedef PY_UINT64_T twodigits; 
+typedef PY_INT64_T stwodigits; /* signed variant of twodigits */ 
+#define PyLong_SHIFT	30 
+#define _PyLong_DECIMAL_SHIFT	9 /* max(e such that 10**e fits in a digit) */ 
+#define _PyLong_DECIMAL_BASE	((digit)1000000000) /* 10 ** DECIMAL_SHIFT */ 
+#elif PYLONG_BITS_IN_DIGIT == 15 
+typedef unsigned short digit; 
+typedef short sdigit; /* signed variant of digit */ 
+typedef unsigned long twodigits; 
+typedef long stwodigits; /* signed variant of twodigits */ 
+#define PyLong_SHIFT	15 
+#define _PyLong_DECIMAL_SHIFT	4 /* max(e such that 10**e fits in a digit) */ 
+#define _PyLong_DECIMAL_BASE	((digit)10000) /* 10 ** DECIMAL_SHIFT */ 
+#else 
+#error "PYLONG_BITS_IN_DIGIT should be 15 or 30" 
+#endif 
+#define PyLong_BASE	((digit)1 << PyLong_SHIFT) 
+#define PyLong_MASK	((digit)(PyLong_BASE - 1)) 
+ 
+/* b/w compatibility with Python 2.5 */ 
+#define SHIFT	PyLong_SHIFT 
+#define BASE	PyLong_BASE 
+#define MASK	PyLong_MASK 
+ 
+#if PyLong_SHIFT % 5 != 0 
+#error "longobject.c requires that PyLong_SHIFT be divisible by 5" 
+#endif 
+ 
+/* Long integer representation. 
+   The absolute value of a number is equal to 
+   	SUM(for i=0 through abs(ob_size)-1) ob_digit[i] * 2**(SHIFT*i) 
+   Negative numbers are represented with ob_size < 0; 
+   zero is represented by ob_size == 0. 
+   In a normalized number, ob_digit[abs(ob_size)-1] (the most significant 
+   digit) is never zero.  Also, in all cases, for all valid i, 
+   	0 <= ob_digit[i] <= MASK. 
+   The allocation function takes care of allocating extra memory 
+   so that ob_digit[0] ... ob_digit[abs(ob_size)-1] are actually available. 
+ 
+   CAUTION:  Generic code manipulating subtypes of PyVarObject has to 
+   aware that longs abuse  ob_size's sign bit. 
+*/ 
+ 
+struct _longobject { 
+	PyObject_VAR_HEAD 
+	digit ob_digit[1]; 
+}; 
+ 
+PyAPI_FUNC(PyLongObject *) _PyLong_New(Py_ssize_t); 
+ 
+/* Return a copy of src. */ 
+PyAPI_FUNC(PyObject *) _PyLong_Copy(PyLongObject *src); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_LONGINTREPR_H */ 
diff --git a/contrib/tools/python/src/Include/longobject.h b/contrib/tools/python/src/Include/longobject.h
index 4e33ff2bb1..75c4c9275d 100644
--- a/contrib/tools/python/src/Include/longobject.h
+++ b/contrib/tools/python/src/Include/longobject.h
@@ -1,135 +1,135 @@
-#ifndef Py_LONGOBJECT_H
-#define Py_LONGOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Long (arbitrary precision) integer object interface */
-
-typedef struct _longobject PyLongObject; /* Revealed in longintrepr.h */
-
-PyAPI_DATA(PyTypeObject) PyLong_Type;
-
-#define PyLong_Check(op) \
-		PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_LONG_SUBCLASS)
-#define PyLong_CheckExact(op) (Py_TYPE(op) == &PyLong_Type)
-
-PyAPI_FUNC(PyObject *) PyLong_FromLong(long);
-PyAPI_FUNC(PyObject *) PyLong_FromUnsignedLong(unsigned long);
-PyAPI_FUNC(PyObject *) PyLong_FromDouble(double);
-PyAPI_FUNC(PyObject *) PyLong_FromSize_t(size_t);
-PyAPI_FUNC(PyObject *) PyLong_FromSsize_t(Py_ssize_t);
-PyAPI_FUNC(long) PyLong_AsLong(PyObject *);
-PyAPI_FUNC(long) PyLong_AsLongAndOverflow(PyObject *, int *);
-PyAPI_FUNC(unsigned long) PyLong_AsUnsignedLong(PyObject *);
-PyAPI_FUNC(unsigned long) PyLong_AsUnsignedLongMask(PyObject *);
-PyAPI_FUNC(Py_ssize_t) PyLong_AsSsize_t(PyObject *);
+#ifndef Py_LONGOBJECT_H 
+#define Py_LONGOBJECT_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+ 
+/* Long (arbitrary precision) integer object interface */ 
+ 
+typedef struct _longobject PyLongObject; /* Revealed in longintrepr.h */ 
+ 
+PyAPI_DATA(PyTypeObject) PyLong_Type; 
+ 
+#define PyLong_Check(op) \ 
+		PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_LONG_SUBCLASS) 
+#define PyLong_CheckExact(op) (Py_TYPE(op) == &PyLong_Type) 
+ 
+PyAPI_FUNC(PyObject *) PyLong_FromLong(long); 
+PyAPI_FUNC(PyObject *) PyLong_FromUnsignedLong(unsigned long); 
+PyAPI_FUNC(PyObject *) PyLong_FromDouble(double); 
+PyAPI_FUNC(PyObject *) PyLong_FromSize_t(size_t); 
+PyAPI_FUNC(PyObject *) PyLong_FromSsize_t(Py_ssize_t); 
+PyAPI_FUNC(long) PyLong_AsLong(PyObject *); 
+PyAPI_FUNC(long) PyLong_AsLongAndOverflow(PyObject *, int *); 
+PyAPI_FUNC(unsigned long) PyLong_AsUnsignedLong(PyObject *); 
+PyAPI_FUNC(unsigned long) PyLong_AsUnsignedLongMask(PyObject *); 
+PyAPI_FUNC(Py_ssize_t) PyLong_AsSsize_t(PyObject *); 
 PyAPI_FUNC(int) _PyLong_AsInt(PyObject *);
-PyAPI_FUNC(PyObject *) PyLong_GetInfo(void);
-
-/* For use by intobject.c only */
-#define _PyLong_AsSsize_t PyLong_AsSsize_t
-#define _PyLong_FromSize_t PyLong_FromSize_t
-#define _PyLong_FromSsize_t PyLong_FromSsize_t
-PyAPI_DATA(int) _PyLong_DigitValue[256];
-
-/* _PyLong_Frexp returns a double x and an exponent e such that the
-   true value is approximately equal to x * 2**e.  e is >= 0.  x is
-   0.0 if and only if the input is 0 (in which case, e and x are both
-   zeroes); otherwise, 0.5 <= abs(x) < 1.0.  On overflow, which is
-   possible if the number of bits doesn't fit into a Py_ssize_t, sets
-   OverflowError and returns -1.0 for x, 0 for e. */
-PyAPI_FUNC(double) _PyLong_Frexp(PyLongObject *a, Py_ssize_t *e);
-
-PyAPI_FUNC(double) PyLong_AsDouble(PyObject *);
-PyAPI_FUNC(PyObject *) PyLong_FromVoidPtr(void *);
-PyAPI_FUNC(void *) PyLong_AsVoidPtr(PyObject *);
-
-#ifdef HAVE_LONG_LONG
-PyAPI_FUNC(PyObject *) PyLong_FromLongLong(PY_LONG_LONG);
-PyAPI_FUNC(PyObject *) PyLong_FromUnsignedLongLong(unsigned PY_LONG_LONG);
-PyAPI_FUNC(PY_LONG_LONG) PyLong_AsLongLong(PyObject *);
-PyAPI_FUNC(unsigned PY_LONG_LONG) PyLong_AsUnsignedLongLong(PyObject *);
-PyAPI_FUNC(unsigned PY_LONG_LONG) PyLong_AsUnsignedLongLongMask(PyObject *);
-PyAPI_FUNC(PY_LONG_LONG) PyLong_AsLongLongAndOverflow(PyObject *, int *);
-#endif /* HAVE_LONG_LONG */
-
-PyAPI_FUNC(PyObject *) PyLong_FromString(char *, char **, int);
-#ifdef Py_USING_UNICODE
-PyAPI_FUNC(PyObject *) PyLong_FromUnicode(Py_UNICODE*, Py_ssize_t, int);
-#endif
-
-/* _PyLong_Sign.  Return 0 if v is 0, -1 if v < 0, +1 if v > 0.
-   v must not be NULL, and must be a normalized long.
-   There are no error cases.
-*/
-PyAPI_FUNC(int) _PyLong_Sign(PyObject *v);
-
-
-/* _PyLong_NumBits.  Return the number of bits needed to represent the
-   absolute value of a long.  For example, this returns 1 for 1 and -1, 2
-   for 2 and -2, and 2 for 3 and -3.  It returns 0 for 0.
-   v must not be NULL, and must be a normalized long.
-   (size_t)-1 is returned and OverflowError set if the true result doesn't
-   fit in a size_t.
-*/
-PyAPI_FUNC(size_t) _PyLong_NumBits(PyObject *v);
-
-/* _PyLong_FromByteArray:  View the n unsigned bytes as a binary integer in
-   base 256, and return a Python long with the same numeric value.
-   If n is 0, the integer is 0.  Else:
-   If little_endian is 1/true, bytes[n-1] is the MSB and bytes[0] the LSB;
-   else (little_endian is 0/false) bytes[0] is the MSB and bytes[n-1] the
-   LSB.
-   If is_signed is 0/false, view the bytes as a non-negative integer.
-   If is_signed is 1/true, view the bytes as a 2's-complement integer,
-   non-negative if bit 0x80 of the MSB is clear, negative if set.
-   Error returns:
-   + Return NULL with the appropriate exception set if there's not
-     enough memory to create the Python long.
-*/
-PyAPI_FUNC(PyObject *) _PyLong_FromByteArray(
-	const unsigned char* bytes, size_t n,
-	int little_endian, int is_signed);
-
-/* _PyLong_AsByteArray: Convert the least-significant 8*n bits of long
-   v to a base-256 integer, stored in array bytes.  Normally return 0,
-   return -1 on error.
-   If little_endian is 1/true, store the MSB at bytes[n-1] and the LSB at
-   bytes[0]; else (little_endian is 0/false) store the MSB at bytes[0] and
-   the LSB at bytes[n-1].
-   If is_signed is 0/false, it's an error if v < 0; else (v >= 0) n bytes
-   are filled and there's nothing special about bit 0x80 of the MSB.
-   If is_signed is 1/true, bytes is filled with the 2's-complement
-   representation of v's value.  Bit 0x80 of the MSB is the sign bit.
-   Error returns (-1):
-   + is_signed is 0 and v < 0.  TypeError is set in this case, and bytes
-     isn't altered.
-   + n isn't big enough to hold the full mathematical value of v.  For
-     example, if is_signed is 0 and there are more digits in the v than
-     fit in n; or if is_signed is 1, v < 0, and n is just 1 bit shy of
-     being large enough to hold a sign bit.  OverflowError is set in this
+PyAPI_FUNC(PyObject *) PyLong_GetInfo(void); 
+ 
+/* For use by intobject.c only */ 
+#define _PyLong_AsSsize_t PyLong_AsSsize_t 
+#define _PyLong_FromSize_t PyLong_FromSize_t 
+#define _PyLong_FromSsize_t PyLong_FromSsize_t 
+PyAPI_DATA(int) _PyLong_DigitValue[256]; 
+ 
+/* _PyLong_Frexp returns a double x and an exponent e such that the 
+   true value is approximately equal to x * 2**e.  e is >= 0.  x is 
+   0.0 if and only if the input is 0 (in which case, e and x are both 
+   zeroes); otherwise, 0.5 <= abs(x) < 1.0.  On overflow, which is 
+   possible if the number of bits doesn't fit into a Py_ssize_t, sets 
+   OverflowError and returns -1.0 for x, 0 for e. */ 
+PyAPI_FUNC(double) _PyLong_Frexp(PyLongObject *a, Py_ssize_t *e); 
+ 
+PyAPI_FUNC(double) PyLong_AsDouble(PyObject *); 
+PyAPI_FUNC(PyObject *) PyLong_FromVoidPtr(void *); 
+PyAPI_FUNC(void *) PyLong_AsVoidPtr(PyObject *); 
+ 
+#ifdef HAVE_LONG_LONG 
+PyAPI_FUNC(PyObject *) PyLong_FromLongLong(PY_LONG_LONG); 
+PyAPI_FUNC(PyObject *) PyLong_FromUnsignedLongLong(unsigned PY_LONG_LONG); 
+PyAPI_FUNC(PY_LONG_LONG) PyLong_AsLongLong(PyObject *); 
+PyAPI_FUNC(unsigned PY_LONG_LONG) PyLong_AsUnsignedLongLong(PyObject *); 
+PyAPI_FUNC(unsigned PY_LONG_LONG) PyLong_AsUnsignedLongLongMask(PyObject *); 
+PyAPI_FUNC(PY_LONG_LONG) PyLong_AsLongLongAndOverflow(PyObject *, int *); 
+#endif /* HAVE_LONG_LONG */ 
+ 
+PyAPI_FUNC(PyObject *) PyLong_FromString(char *, char **, int); 
+#ifdef Py_USING_UNICODE 
+PyAPI_FUNC(PyObject *) PyLong_FromUnicode(Py_UNICODE*, Py_ssize_t, int); 
+#endif 
+ 
+/* _PyLong_Sign.  Return 0 if v is 0, -1 if v < 0, +1 if v > 0. 
+   v must not be NULL, and must be a normalized long. 
+   There are no error cases. 
+*/ 
+PyAPI_FUNC(int) _PyLong_Sign(PyObject *v); 
+ 
+ 
+/* _PyLong_NumBits.  Return the number of bits needed to represent the 
+   absolute value of a long.  For example, this returns 1 for 1 and -1, 2 
+   for 2 and -2, and 2 for 3 and -3.  It returns 0 for 0. 
+   v must not be NULL, and must be a normalized long. 
+   (size_t)-1 is returned and OverflowError set if the true result doesn't 
+   fit in a size_t. 
+*/ 
+PyAPI_FUNC(size_t) _PyLong_NumBits(PyObject *v); 
+ 
+/* _PyLong_FromByteArray:  View the n unsigned bytes as a binary integer in 
+   base 256, and return a Python long with the same numeric value. 
+   If n is 0, the integer is 0.  Else: 
+   If little_endian is 1/true, bytes[n-1] is the MSB and bytes[0] the LSB; 
+   else (little_endian is 0/false) bytes[0] is the MSB and bytes[n-1] the 
+   LSB. 
+   If is_signed is 0/false, view the bytes as a non-negative integer. 
+   If is_signed is 1/true, view the bytes as a 2's-complement integer, 
+   non-negative if bit 0x80 of the MSB is clear, negative if set. 
+   Error returns: 
+   + Return NULL with the appropriate exception set if there's not 
+     enough memory to create the Python long. 
+*/ 
+PyAPI_FUNC(PyObject *) _PyLong_FromByteArray( 
+	const unsigned char* bytes, size_t n, 
+	int little_endian, int is_signed); 
+ 
+/* _PyLong_AsByteArray: Convert the least-significant 8*n bits of long 
+   v to a base-256 integer, stored in array bytes.  Normally return 0, 
+   return -1 on error. 
+   If little_endian is 1/true, store the MSB at bytes[n-1] and the LSB at 
+   bytes[0]; else (little_endian is 0/false) store the MSB at bytes[0] and 
+   the LSB at bytes[n-1]. 
+   If is_signed is 0/false, it's an error if v < 0; else (v >= 0) n bytes 
+   are filled and there's nothing special about bit 0x80 of the MSB. 
+   If is_signed is 1/true, bytes is filled with the 2's-complement 
+   representation of v's value.  Bit 0x80 of the MSB is the sign bit. 
+   Error returns (-1): 
+   + is_signed is 0 and v < 0.  TypeError is set in this case, and bytes 
+     isn't altered. 
+   + n isn't big enough to hold the full mathematical value of v.  For 
+     example, if is_signed is 0 and there are more digits in the v than 
+     fit in n; or if is_signed is 1, v < 0, and n is just 1 bit shy of 
+     being large enough to hold a sign bit.  OverflowError is set in this 
      case, but bytes holds the least-significant n bytes of the true value.
-*/
-PyAPI_FUNC(int) _PyLong_AsByteArray(PyLongObject* v,
-	unsigned char* bytes, size_t n,
-	int little_endian, int is_signed);
-
-/* _PyLong_Format: Convert the long to a string object with given base,
-   appending a base prefix of 0[box] if base is 2, 8 or 16.
-   Add a trailing "L" if addL is non-zero.
-   If newstyle is zero, then use the pre-2.6 behavior of octal having
-   a leading "0", instead of the prefix "0o" */
-PyAPI_FUNC(PyObject *) _PyLong_Format(PyObject *aa, int base, int addL, int newstyle);
-
-/* Format the object based on the format_spec, as defined in PEP 3101
-   (Advanced String Formatting). */
-PyAPI_FUNC(PyObject *) _PyLong_FormatAdvanced(PyObject *obj,
-					      char *format_spec,
-					      Py_ssize_t format_spec_len);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_LONGOBJECT_H */
+*/ 
+PyAPI_FUNC(int) _PyLong_AsByteArray(PyLongObject* v, 
+	unsigned char* bytes, size_t n, 
+	int little_endian, int is_signed); 
+ 
+/* _PyLong_Format: Convert the long to a string object with given base, 
+   appending a base prefix of 0[box] if base is 2, 8 or 16. 
+   Add a trailing "L" if addL is non-zero. 
+   If newstyle is zero, then use the pre-2.6 behavior of octal having 
+   a leading "0", instead of the prefix "0o" */ 
+PyAPI_FUNC(PyObject *) _PyLong_Format(PyObject *aa, int base, int addL, int newstyle); 
+ 
+/* Format the object based on the format_spec, as defined in PEP 3101 
+   (Advanced String Formatting). */ 
+PyAPI_FUNC(PyObject *) _PyLong_FormatAdvanced(PyObject *obj, 
+					      char *format_spec, 
+					      Py_ssize_t format_spec_len); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_LONGOBJECT_H */ 
diff --git a/contrib/tools/python/src/Include/marshal.h b/contrib/tools/python/src/Include/marshal.h
index 411fdca367..3a87433c63 100644
--- a/contrib/tools/python/src/Include/marshal.h
+++ b/contrib/tools/python/src/Include/marshal.h
@@ -1,25 +1,25 @@
-
-/* Interface for marshal.c */
-
-#ifndef Py_MARSHAL_H
-#define Py_MARSHAL_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define Py_MARSHAL_VERSION 2
-
-PyAPI_FUNC(void) PyMarshal_WriteLongToFile(long, FILE *, int);
-PyAPI_FUNC(void) PyMarshal_WriteObjectToFile(PyObject *, FILE *, int);
-PyAPI_FUNC(PyObject *) PyMarshal_WriteObjectToString(PyObject *, int);
-
-PyAPI_FUNC(long) PyMarshal_ReadLongFromFile(FILE *);
-PyAPI_FUNC(int) PyMarshal_ReadShortFromFile(FILE *);
-PyAPI_FUNC(PyObject *) PyMarshal_ReadObjectFromFile(FILE *);
-PyAPI_FUNC(PyObject *) PyMarshal_ReadLastObjectFromFile(FILE *);
-PyAPI_FUNC(PyObject *) PyMarshal_ReadObjectFromString(char *, Py_ssize_t);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_MARSHAL_H */
+ 
+/* Interface for marshal.c */ 
+ 
+#ifndef Py_MARSHAL_H 
+#define Py_MARSHAL_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+#define Py_MARSHAL_VERSION 2 
+ 
+PyAPI_FUNC(void) PyMarshal_WriteLongToFile(long, FILE *, int); 
+PyAPI_FUNC(void) PyMarshal_WriteObjectToFile(PyObject *, FILE *, int); 
+PyAPI_FUNC(PyObject *) PyMarshal_WriteObjectToString(PyObject *, int); 
+ 
+PyAPI_FUNC(long) PyMarshal_ReadLongFromFile(FILE *); 
+PyAPI_FUNC(int) PyMarshal_ReadShortFromFile(FILE *); 
+PyAPI_FUNC(PyObject *) PyMarshal_ReadObjectFromFile(FILE *); 
+PyAPI_FUNC(PyObject *) PyMarshal_ReadLastObjectFromFile(FILE *); 
+PyAPI_FUNC(PyObject *) PyMarshal_ReadObjectFromString(char *, Py_ssize_t); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_MARSHAL_H */ 
diff --git a/contrib/tools/python/src/Include/memoryobject.h b/contrib/tools/python/src/Include/memoryobject.h
index e6a5c4506b..b9f0eb3355 100644
--- a/contrib/tools/python/src/Include/memoryobject.h
+++ b/contrib/tools/python/src/Include/memoryobject.h
@@ -1,74 +1,74 @@
-/* Memory view object. In Python this is available as "memoryview". */
-
-#ifndef Py_MEMORYOBJECT_H
-#define Py_MEMORYOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_DATA(PyTypeObject) PyMemoryView_Type;
-
-#define PyMemoryView_Check(op) (Py_TYPE(op) == &PyMemoryView_Type)
-
-/* Get a pointer to the underlying Py_buffer of a memoryview object. */
-#define PyMemoryView_GET_BUFFER(op) (&((PyMemoryViewObject *)(op))->view)
-/* Get a pointer to the PyObject from which originates a memoryview object. */
-#define PyMemoryView_GET_BASE(op) (((PyMemoryViewObject *)(op))->view.obj)
-
-
-PyAPI_FUNC(PyObject *) PyMemoryView_GetContiguous(PyObject *base, 
-						  int buffertype, 
-						  char fort);
-
-    /* Return a contiguous chunk of memory representing the buffer
-       from an object in a memory view object.  If a copy is made then the
-       base object for the memory view will be a *new* bytes object. 
-       
-       Otherwise, the base-object will be the object itself and no 
-       data-copying will be done. 
-
-       The buffertype argument can be PyBUF_READ, PyBUF_WRITE,
-       PyBUF_SHADOW to determine whether the returned buffer
-       should be READONLY, WRITABLE, or set to update the
-       original buffer if a copy must be made.  If buffertype is
-       PyBUF_WRITE and the buffer is not contiguous an error will
-       be raised.  In this circumstance, the user can use
+/* Memory view object. In Python this is available as "memoryview". */ 
+ 
+#ifndef Py_MEMORYOBJECT_H 
+#define Py_MEMORYOBJECT_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+PyAPI_DATA(PyTypeObject) PyMemoryView_Type; 
+ 
+#define PyMemoryView_Check(op) (Py_TYPE(op) == &PyMemoryView_Type) 
+ 
+/* Get a pointer to the underlying Py_buffer of a memoryview object. */ 
+#define PyMemoryView_GET_BUFFER(op) (&((PyMemoryViewObject *)(op))->view) 
+/* Get a pointer to the PyObject from which originates a memoryview object. */ 
+#define PyMemoryView_GET_BASE(op) (((PyMemoryViewObject *)(op))->view.obj) 
+ 
+ 
+PyAPI_FUNC(PyObject *) PyMemoryView_GetContiguous(PyObject *base,  
+						  int buffertype,  
+						  char fort); 
+ 
+    /* Return a contiguous chunk of memory representing the buffer 
+       from an object in a memory view object.  If a copy is made then the 
+       base object for the memory view will be a *new* bytes object.  
+        
+       Otherwise, the base-object will be the object itself and no  
+       data-copying will be done.  
+ 
+       The buffertype argument can be PyBUF_READ, PyBUF_WRITE, 
+       PyBUF_SHADOW to determine whether the returned buffer 
+       should be READONLY, WRITABLE, or set to update the 
+       original buffer if a copy must be made.  If buffertype is 
+       PyBUF_WRITE and the buffer is not contiguous an error will 
+       be raised.  In this circumstance, the user can use 
        PyBUF_SHADOW to ensure that a writable temporary
-       contiguous buffer is returned.  The contents of this
-       contiguous buffer will be copied back into the original
-       object after the memoryview object is deleted as long as
-       the original object is writable and allows setting an
-       exclusive write lock. If this is not allowed by the
-       original object, then a BufferError is raised.
-       
-       If the object is multi-dimensional and if fortran is 'F',
-       the first dimension of the underlying array will vary the
-       fastest in the buffer.  If fortran is 'C', then the last
-       dimension will vary the fastest (C-style contiguous).  If
-       fortran is 'A', then it does not matter and you will get
-       whatever the object decides is more efficient.  
-
-       A new reference is returned that must be DECREF'd when finished.
-    */
-
-PyAPI_FUNC(PyObject *) PyMemoryView_FromObject(PyObject *base);
-
-PyAPI_FUNC(PyObject *) PyMemoryView_FromBuffer(Py_buffer *info);
-    /* create new if bufptr is NULL 
-        will be a new bytesobject in base */
-
-
-/* The struct is declared here so that macros can work, but it shouldn't
-   be considered public. Don't access those fields directly, use the macros
-   and functions instead! */
-typedef struct {
-    PyObject_HEAD
-    PyObject *base;
-    Py_buffer view;
-} PyMemoryViewObject;
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_MEMORYOBJECT_H */
+       contiguous buffer is returned.  The contents of this 
+       contiguous buffer will be copied back into the original 
+       object after the memoryview object is deleted as long as 
+       the original object is writable and allows setting an 
+       exclusive write lock. If this is not allowed by the 
+       original object, then a BufferError is raised. 
+        
+       If the object is multi-dimensional and if fortran is 'F', 
+       the first dimension of the underlying array will vary the 
+       fastest in the buffer.  If fortran is 'C', then the last 
+       dimension will vary the fastest (C-style contiguous).  If 
+       fortran is 'A', then it does not matter and you will get 
+       whatever the object decides is more efficient.   
+ 
+       A new reference is returned that must be DECREF'd when finished. 
+    */ 
+ 
+PyAPI_FUNC(PyObject *) PyMemoryView_FromObject(PyObject *base); 
+ 
+PyAPI_FUNC(PyObject *) PyMemoryView_FromBuffer(Py_buffer *info); 
+    /* create new if bufptr is NULL  
+        will be a new bytesobject in base */ 
+ 
+ 
+/* The struct is declared here so that macros can work, but it shouldn't 
+   be considered public. Don't access those fields directly, use the macros 
+   and functions instead! */ 
+typedef struct { 
+    PyObject_HEAD 
+    PyObject *base; 
+    Py_buffer view; 
+} PyMemoryViewObject; 
+ 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_MEMORYOBJECT_H */ 
diff --git a/contrib/tools/python/src/Include/metagrammar.h b/contrib/tools/python/src/Include/metagrammar.h
index 15c8ef8f3f..a7a8a1d974 100644
--- a/contrib/tools/python/src/Include/metagrammar.h
+++ b/contrib/tools/python/src/Include/metagrammar.h
@@ -1,18 +1,18 @@
-#ifndef Py_METAGRAMMAR_H
-#define Py_METAGRAMMAR_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#define MSTART 256
-#define RULE 257
-#define RHS 258
-#define ALT 259
-#define ITEM 260
-#define ATOM 261
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_METAGRAMMAR_H */
+#ifndef Py_METAGRAMMAR_H 
+#define Py_METAGRAMMAR_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+ 
+#define MSTART 256 
+#define RULE 257 
+#define RHS 258 
+#define ALT 259 
+#define ITEM 260 
+#define ATOM 261 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_METAGRAMMAR_H */ 
diff --git a/contrib/tools/python/src/Include/methodobject.h b/contrib/tools/python/src/Include/methodobject.h
index 6e160b6390..a167146ab5 100644
--- a/contrib/tools/python/src/Include/methodobject.h
+++ b/contrib/tools/python/src/Include/methodobject.h
@@ -1,93 +1,93 @@
-
-/* Method object interface */
-
-#ifndef Py_METHODOBJECT_H
-#define Py_METHODOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* This is about the type 'builtin_function_or_method',
-   not Python methods in user-defined classes.  See classobject.h
-   for the latter. */
-
-PyAPI_DATA(PyTypeObject) PyCFunction_Type;
-
-#define PyCFunction_Check(op) (Py_TYPE(op) == &PyCFunction_Type)
-
-typedef PyObject *(*PyCFunction)(PyObject *, PyObject *);
-typedef PyObject *(*PyCFunctionWithKeywords)(PyObject *, PyObject *,
-					     PyObject *);
-typedef PyObject *(*PyNoArgsFunction)(PyObject *);
-
-PyAPI_FUNC(PyCFunction) PyCFunction_GetFunction(PyObject *);
-PyAPI_FUNC(PyObject *) PyCFunction_GetSelf(PyObject *);
-PyAPI_FUNC(int) PyCFunction_GetFlags(PyObject *);
-
-/* Macros for direct access to these values. Type checks are *not*
-   done, so use with care. */
-#define PyCFunction_GET_FUNCTION(func) \
-        (((PyCFunctionObject *)func) -> m_ml -> ml_meth)
-#define PyCFunction_GET_SELF(func) \
-	(((PyCFunctionObject *)func) -> m_self)
-#define PyCFunction_GET_FLAGS(func) \
-	(((PyCFunctionObject *)func) -> m_ml -> ml_flags)
-PyAPI_FUNC(PyObject *) PyCFunction_Call(PyObject *, PyObject *, PyObject *);
-
-struct PyMethodDef {
-    const char	*ml_name;	/* The name of the built-in function/method */
-    PyCFunction  ml_meth;	/* The C function that implements it */
-    int		 ml_flags;	/* Combination of METH_xxx flags, which mostly
-				   describe the args expected by the C func */
-    const char	*ml_doc;	/* The __doc__ attribute, or NULL */
-};
-typedef struct PyMethodDef PyMethodDef;
-
-PyAPI_FUNC(PyObject *) Py_FindMethod(PyMethodDef[], PyObject *, const char *);
-
-#define PyCFunction_New(ML, SELF) PyCFunction_NewEx((ML), (SELF), NULL)
-PyAPI_FUNC(PyObject *) PyCFunction_NewEx(PyMethodDef *, PyObject *, 
-					 PyObject *);
-
-/* Flag passed to newmethodobject */
-#define METH_OLDARGS  0x0000
-#define METH_VARARGS  0x0001
-#define METH_KEYWORDS 0x0002
-/* METH_NOARGS and METH_O must not be combined with the flags above. */
-#define METH_NOARGS   0x0004
-#define METH_O        0x0008
-
-/* METH_CLASS and METH_STATIC are a little different; these control
-   the construction of methods for a class.  These cannot be used for
-   functions in modules. */
-#define METH_CLASS    0x0010
-#define METH_STATIC   0x0020
-
-/* METH_COEXIST allows a method to be entered eventhough a slot has
-   already filled the entry.  When defined, the flag allows a separate
-   method, "__contains__" for example, to coexist with a defined 
-   slot like sq_contains. */
-
-#define METH_COEXIST   0x0040
-
-typedef struct PyMethodChain {
-    PyMethodDef *methods;		/* Methods of this type */
-    struct PyMethodChain *link;	/* NULL or base type */
-} PyMethodChain;
-
-PyAPI_FUNC(PyObject *) Py_FindMethodInChain(PyMethodChain *, PyObject *,
-                                            const char *);
-
-typedef struct {
-    PyObject_HEAD
-    PyMethodDef *m_ml; /* Description of the C function to call */
-    PyObject    *m_self; /* Passed as 'self' arg to the C func, can be NULL */
-    PyObject    *m_module; /* The __module__ attribute, can be anything */
-} PyCFunctionObject;
-
-PyAPI_FUNC(int) PyCFunction_ClearFreeList(void);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_METHODOBJECT_H */
+ 
+/* Method object interface */ 
+ 
+#ifndef Py_METHODOBJECT_H 
+#define Py_METHODOBJECT_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+/* This is about the type 'builtin_function_or_method', 
+   not Python methods in user-defined classes.  See classobject.h 
+   for the latter. */ 
+ 
+PyAPI_DATA(PyTypeObject) PyCFunction_Type; 
+ 
+#define PyCFunction_Check(op) (Py_TYPE(op) == &PyCFunction_Type) 
+ 
+typedef PyObject *(*PyCFunction)(PyObject *, PyObject *); 
+typedef PyObject *(*PyCFunctionWithKeywords)(PyObject *, PyObject *, 
+					     PyObject *); 
+typedef PyObject *(*PyNoArgsFunction)(PyObject *); 
+ 
+PyAPI_FUNC(PyCFunction) PyCFunction_GetFunction(PyObject *); 
+PyAPI_FUNC(PyObject *) PyCFunction_GetSelf(PyObject *); 
+PyAPI_FUNC(int) PyCFunction_GetFlags(PyObject *); 
+ 
+/* Macros for direct access to these values. Type checks are *not* 
+   done, so use with care. */ 
+#define PyCFunction_GET_FUNCTION(func) \ 
+        (((PyCFunctionObject *)func) -> m_ml -> ml_meth) 
+#define PyCFunction_GET_SELF(func) \ 
+	(((PyCFunctionObject *)func) -> m_self) 
+#define PyCFunction_GET_FLAGS(func) \ 
+	(((PyCFunctionObject *)func) -> m_ml -> ml_flags) 
+PyAPI_FUNC(PyObject *) PyCFunction_Call(PyObject *, PyObject *, PyObject *); 
+ 
+struct PyMethodDef { 
+    const char	*ml_name;	/* The name of the built-in function/method */ 
+    PyCFunction  ml_meth;	/* The C function that implements it */ 
+    int		 ml_flags;	/* Combination of METH_xxx flags, which mostly 
+				   describe the args expected by the C func */ 
+    const char	*ml_doc;	/* The __doc__ attribute, or NULL */ 
+}; 
+typedef struct PyMethodDef PyMethodDef; 
+ 
+PyAPI_FUNC(PyObject *) Py_FindMethod(PyMethodDef[], PyObject *, const char *); 
+ 
+#define PyCFunction_New(ML, SELF) PyCFunction_NewEx((ML), (SELF), NULL) 
+PyAPI_FUNC(PyObject *) PyCFunction_NewEx(PyMethodDef *, PyObject *,  
+					 PyObject *); 
+ 
+/* Flag passed to newmethodobject */ 
+#define METH_OLDARGS  0x0000 
+#define METH_VARARGS  0x0001 
+#define METH_KEYWORDS 0x0002 
+/* METH_NOARGS and METH_O must not be combined with the flags above. */ 
+#define METH_NOARGS   0x0004 
+#define METH_O        0x0008 
+ 
+/* METH_CLASS and METH_STATIC are a little different; these control 
+   the construction of methods for a class.  These cannot be used for 
+   functions in modules. */ 
+#define METH_CLASS    0x0010 
+#define METH_STATIC   0x0020 
+ 
+/* METH_COEXIST allows a method to be entered eventhough a slot has 
+   already filled the entry.  When defined, the flag allows a separate 
+   method, "__contains__" for example, to coexist with a defined  
+   slot like sq_contains. */ 
+ 
+#define METH_COEXIST   0x0040 
+ 
+typedef struct PyMethodChain { 
+    PyMethodDef *methods;		/* Methods of this type */ 
+    struct PyMethodChain *link;	/* NULL or base type */ 
+} PyMethodChain; 
+ 
+PyAPI_FUNC(PyObject *) Py_FindMethodInChain(PyMethodChain *, PyObject *, 
+                                            const char *); 
+ 
+typedef struct { 
+    PyObject_HEAD 
+    PyMethodDef *m_ml; /* Description of the C function to call */ 
+    PyObject    *m_self; /* Passed as 'self' arg to the C func, can be NULL */ 
+    PyObject    *m_module; /* The __module__ attribute, can be anything */ 
+} PyCFunctionObject; 
+ 
+PyAPI_FUNC(int) PyCFunction_ClearFreeList(void); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_METHODOBJECT_H */ 
diff --git a/contrib/tools/python/src/Include/modsupport.h b/contrib/tools/python/src/Include/modsupport.h
index d4dddef0b5..799720f122 100644
--- a/contrib/tools/python/src/Include/modsupport.h
+++ b/contrib/tools/python/src/Include/modsupport.h
@@ -1,134 +1,134 @@
-
-#ifndef Py_MODSUPPORT_H
-#define Py_MODSUPPORT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Module support interface */
-
-#include <stdarg.h>
-
-/* If PY_SSIZE_T_CLEAN is defined, each functions treats #-specifier
-   to mean Py_ssize_t */
-#ifdef PY_SSIZE_T_CLEAN
-#define PyArg_Parse			_PyArg_Parse_SizeT
-#define PyArg_ParseTuple		_PyArg_ParseTuple_SizeT
-#define PyArg_ParseTupleAndKeywords	_PyArg_ParseTupleAndKeywords_SizeT
-#define PyArg_VaParse			_PyArg_VaParse_SizeT
-#define PyArg_VaParseTupleAndKeywords	_PyArg_VaParseTupleAndKeywords_SizeT
-#define Py_BuildValue			_Py_BuildValue_SizeT
-#define Py_VaBuildValue			_Py_VaBuildValue_SizeT
-#else
-PyAPI_FUNC(PyObject *) _Py_VaBuildValue_SizeT(const char *, va_list);
-#endif
-
-PyAPI_FUNC(int) PyArg_Parse(PyObject *, const char *, ...);
-PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...) Py_FORMAT_PARSETUPLE(PyArg_ParseTuple, 2, 3);
-PyAPI_FUNC(int) PyArg_ParseTupleAndKeywords(PyObject *, PyObject *,
-                                                  const char *, char **, ...);
-PyAPI_FUNC(int) PyArg_UnpackTuple(PyObject *, const char *, Py_ssize_t, Py_ssize_t, ...);
-PyAPI_FUNC(PyObject *) Py_BuildValue(const char *, ...);
-PyAPI_FUNC(PyObject *) _Py_BuildValue_SizeT(const char *, ...);
-PyAPI_FUNC(int) _PyArg_NoKeywords(const char *funcname, PyObject *kw);
-
-PyAPI_FUNC(int) PyArg_VaParse(PyObject *, const char *, va_list);
-PyAPI_FUNC(int) PyArg_VaParseTupleAndKeywords(PyObject *, PyObject *,
-                                                  const char *, char **, va_list);
-PyAPI_FUNC(PyObject *) Py_VaBuildValue(const char *, va_list);
-
-PyAPI_FUNC(int) PyModule_AddObject(PyObject *, const char *, PyObject *);
-PyAPI_FUNC(int) PyModule_AddIntConstant(PyObject *, const char *, long);
-PyAPI_FUNC(int) PyModule_AddStringConstant(PyObject *, const char *, const char *);
-#define PyModule_AddIntMacro(m, c) PyModule_AddIntConstant(m, #c, c)
-#define PyModule_AddStringMacro(m, c) PyModule_AddStringConstant(m, #c, c)
-
-#define PYTHON_API_VERSION 1013
-#define PYTHON_API_STRING "1013"
-/* The API version is maintained (independently from the Python version)
-   so we can detect mismatches between the interpreter and dynamically
-   loaded modules.  These are diagnosed by an error message but
-   the module is still loaded (because the mismatch can only be tested
-   after loading the module).  The error message is intended to
-   explain the core dump a few seconds later.
-
-   The symbol PYTHON_API_STRING defines the same value as a string
-   literal.  *** PLEASE MAKE SURE THE DEFINITIONS MATCH. ***
-
-   Please add a line or two to the top of this log for each API
-   version change:
-
-   22-Feb-2006  MvL	1013	PEP 353 - long indices for sequence lengths
-
-   19-Aug-2002  GvR	1012	Changes to string object struct for
-   				interning changes, saving 3 bytes.
-
-   17-Jul-2001	GvR	1011	Descr-branch, just to be on the safe side
-
-   25-Jan-2001  FLD     1010    Parameters added to PyCode_New() and
-                                PyFrame_New(); Python 2.1a2
-
-   14-Mar-2000  GvR     1009    Unicode API added
-
-   3-Jan-1999	GvR	1007	Decided to change back!  (Don't reuse 1008!)
-
-   3-Dec-1998	GvR	1008	Python 1.5.2b1
-
-   18-Jan-1997	GvR	1007	string interning and other speedups
-
-   11-Oct-1996	GvR	renamed Py_Ellipses to Py_Ellipsis :-(
-
-   30-Jul-1996	GvR	Slice and ellipses syntax added
-
-   23-Jul-1996	GvR	For 1.4 -- better safe than sorry this time :-)
-
-   7-Nov-1995	GvR	Keyword arguments (should've been done at 1.3 :-( )
-
-   10-Jan-1995	GvR	Renamed globals to new naming scheme
-
-   9-Jan-1995	GvR	Initial version (incompatible with older API)
-*/
-
-#ifdef MS_WINDOWS
-/* Special defines for Windows versions used to live here.  Things
-   have changed, and the "Version" is now in a global string variable.
-   Reason for this is that this for easier branding of a "custom DLL"
-   without actually needing a recompile.  */
-#endif /* MS_WINDOWS */
-
-#if SIZEOF_SIZE_T != SIZEOF_INT
-/* On a 64-bit system, rename the Py_InitModule4 so that 2.4
-   modules cannot get loaded into a 2.5 interpreter */
-#define Py_InitModule4 Py_InitModule4_64
-#endif
-
-#ifdef Py_TRACE_REFS
- /* When we are tracing reference counts, rename Py_InitModule4 so
-    modules compiled with incompatible settings will generate a
-    link-time error. */
- #if SIZEOF_SIZE_T != SIZEOF_INT
- #undef Py_InitModule4
- #define Py_InitModule4 Py_InitModule4TraceRefs_64
- #else
- #define Py_InitModule4 Py_InitModule4TraceRefs
- #endif
-#endif
-
-PyAPI_FUNC(PyObject *) Py_InitModule4(const char *name, PyMethodDef *methods,
-                                      const char *doc, PyObject *self,
-                                      int apiver);
-
-#define Py_InitModule(name, methods) \
-	Py_InitModule4(name, methods, (char *)NULL, (PyObject *)NULL, \
-		       PYTHON_API_VERSION)
-
-#define Py_InitModule3(name, methods, doc) \
-	Py_InitModule4(name, methods, doc, (PyObject *)NULL, \
-		       PYTHON_API_VERSION)
-
-PyAPI_DATA(char *) _Py_PackageContext;
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_MODSUPPORT_H */
+ 
+#ifndef Py_MODSUPPORT_H 
+#define Py_MODSUPPORT_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+/* Module support interface */ 
+ 
+#include <stdarg.h> 
+ 
+/* If PY_SSIZE_T_CLEAN is defined, each functions treats #-specifier 
+   to mean Py_ssize_t */ 
+#ifdef PY_SSIZE_T_CLEAN 
+#define PyArg_Parse			_PyArg_Parse_SizeT 
+#define PyArg_ParseTuple		_PyArg_ParseTuple_SizeT 
+#define PyArg_ParseTupleAndKeywords	_PyArg_ParseTupleAndKeywords_SizeT 
+#define PyArg_VaParse			_PyArg_VaParse_SizeT 
+#define PyArg_VaParseTupleAndKeywords	_PyArg_VaParseTupleAndKeywords_SizeT 
+#define Py_BuildValue			_Py_BuildValue_SizeT 
+#define Py_VaBuildValue			_Py_VaBuildValue_SizeT 
+#else 
+PyAPI_FUNC(PyObject *) _Py_VaBuildValue_SizeT(const char *, va_list); 
+#endif 
+ 
+PyAPI_FUNC(int) PyArg_Parse(PyObject *, const char *, ...); 
+PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...) Py_FORMAT_PARSETUPLE(PyArg_ParseTuple, 2, 3); 
+PyAPI_FUNC(int) PyArg_ParseTupleAndKeywords(PyObject *, PyObject *, 
+                                                  const char *, char **, ...); 
+PyAPI_FUNC(int) PyArg_UnpackTuple(PyObject *, const char *, Py_ssize_t, Py_ssize_t, ...); 
+PyAPI_FUNC(PyObject *) Py_BuildValue(const char *, ...); 
+PyAPI_FUNC(PyObject *) _Py_BuildValue_SizeT(const char *, ...); 
+PyAPI_FUNC(int) _PyArg_NoKeywords(const char *funcname, PyObject *kw); 
+ 
+PyAPI_FUNC(int) PyArg_VaParse(PyObject *, const char *, va_list); 
+PyAPI_FUNC(int) PyArg_VaParseTupleAndKeywords(PyObject *, PyObject *, 
+                                                  const char *, char **, va_list); 
+PyAPI_FUNC(PyObject *) Py_VaBuildValue(const char *, va_list); 
+ 
+PyAPI_FUNC(int) PyModule_AddObject(PyObject *, const char *, PyObject *); 
+PyAPI_FUNC(int) PyModule_AddIntConstant(PyObject *, const char *, long); 
+PyAPI_FUNC(int) PyModule_AddStringConstant(PyObject *, const char *, const char *); 
+#define PyModule_AddIntMacro(m, c) PyModule_AddIntConstant(m, #c, c) 
+#define PyModule_AddStringMacro(m, c) PyModule_AddStringConstant(m, #c, c) 
+ 
+#define PYTHON_API_VERSION 1013 
+#define PYTHON_API_STRING "1013" 
+/* The API version is maintained (independently from the Python version) 
+   so we can detect mismatches between the interpreter and dynamically 
+   loaded modules.  These are diagnosed by an error message but 
+   the module is still loaded (because the mismatch can only be tested 
+   after loading the module).  The error message is intended to 
+   explain the core dump a few seconds later. 
+ 
+   The symbol PYTHON_API_STRING defines the same value as a string 
+   literal.  *** PLEASE MAKE SURE THE DEFINITIONS MATCH. *** 
+ 
+   Please add a line or two to the top of this log for each API 
+   version change: 
+ 
+   22-Feb-2006  MvL	1013	PEP 353 - long indices for sequence lengths 
+ 
+   19-Aug-2002  GvR	1012	Changes to string object struct for 
+   				interning changes, saving 3 bytes. 
+ 
+   17-Jul-2001	GvR	1011	Descr-branch, just to be on the safe side 
+ 
+   25-Jan-2001  FLD     1010    Parameters added to PyCode_New() and 
+                                PyFrame_New(); Python 2.1a2 
+ 
+   14-Mar-2000  GvR     1009    Unicode API added 
+ 
+   3-Jan-1999	GvR	1007	Decided to change back!  (Don't reuse 1008!) 
+ 
+   3-Dec-1998	GvR	1008	Python 1.5.2b1 
+ 
+   18-Jan-1997	GvR	1007	string interning and other speedups 
+ 
+   11-Oct-1996	GvR	renamed Py_Ellipses to Py_Ellipsis :-( 
+ 
+   30-Jul-1996	GvR	Slice and ellipses syntax added 
+ 
+   23-Jul-1996	GvR	For 1.4 -- better safe than sorry this time :-) 
+ 
+   7-Nov-1995	GvR	Keyword arguments (should've been done at 1.3 :-( ) 
+ 
+   10-Jan-1995	GvR	Renamed globals to new naming scheme 
+ 
+   9-Jan-1995	GvR	Initial version (incompatible with older API) 
+*/ 
+ 
+#ifdef MS_WINDOWS 
+/* Special defines for Windows versions used to live here.  Things 
+   have changed, and the "Version" is now in a global string variable. 
+   Reason for this is that this for easier branding of a "custom DLL" 
+   without actually needing a recompile.  */ 
+#endif /* MS_WINDOWS */ 
+ 
+#if SIZEOF_SIZE_T != SIZEOF_INT 
+/* On a 64-bit system, rename the Py_InitModule4 so that 2.4 
+   modules cannot get loaded into a 2.5 interpreter */ 
+#define Py_InitModule4 Py_InitModule4_64 
+#endif 
+ 
+#ifdef Py_TRACE_REFS 
+ /* When we are tracing reference counts, rename Py_InitModule4 so 
+    modules compiled with incompatible settings will generate a 
+    link-time error. */ 
+ #if SIZEOF_SIZE_T != SIZEOF_INT 
+ #undef Py_InitModule4 
+ #define Py_InitModule4 Py_InitModule4TraceRefs_64 
+ #else 
+ #define Py_InitModule4 Py_InitModule4TraceRefs 
+ #endif 
+#endif 
+ 
+PyAPI_FUNC(PyObject *) Py_InitModule4(const char *name, PyMethodDef *methods, 
+                                      const char *doc, PyObject *self, 
+                                      int apiver); 
+ 
+#define Py_InitModule(name, methods) \ 
+	Py_InitModule4(name, methods, (char *)NULL, (PyObject *)NULL, \ 
+		       PYTHON_API_VERSION) 
+ 
+#define Py_InitModule3(name, methods, doc) \ 
+	Py_InitModule4(name, methods, doc, (PyObject *)NULL, \ 
+		       PYTHON_API_VERSION) 
+ 
+PyAPI_DATA(char *) _Py_PackageContext; 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_MODSUPPORT_H */ 
diff --git a/contrib/tools/python/src/Include/moduleobject.h b/contrib/tools/python/src/Include/moduleobject.h
index b387f5bfd4..ab6808328c 100644
--- a/contrib/tools/python/src/Include/moduleobject.h
+++ b/contrib/tools/python/src/Include/moduleobject.h
@@ -1,24 +1,24 @@
-
-/* Module object interface */
-
-#ifndef Py_MODULEOBJECT_H
-#define Py_MODULEOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_DATA(PyTypeObject) PyModule_Type;
-
-#define PyModule_Check(op) PyObject_TypeCheck(op, &PyModule_Type)
-#define PyModule_CheckExact(op) (Py_TYPE(op) == &PyModule_Type)
-
-PyAPI_FUNC(PyObject *) PyModule_New(const char *);
-PyAPI_FUNC(PyObject *) PyModule_GetDict(PyObject *);
-PyAPI_FUNC(char *) PyModule_GetName(PyObject *);
-PyAPI_FUNC(char *) PyModule_GetFilename(PyObject *);
-PyAPI_FUNC(void) _PyModule_Clear(PyObject *);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_MODULEOBJECT_H */
+ 
+/* Module object interface */ 
+ 
+#ifndef Py_MODULEOBJECT_H 
+#define Py_MODULEOBJECT_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+PyAPI_DATA(PyTypeObject) PyModule_Type; 
+ 
+#define PyModule_Check(op) PyObject_TypeCheck(op, &PyModule_Type) 
+#define PyModule_CheckExact(op) (Py_TYPE(op) == &PyModule_Type) 
+ 
+PyAPI_FUNC(PyObject *) PyModule_New(const char *); 
+PyAPI_FUNC(PyObject *) PyModule_GetDict(PyObject *); 
+PyAPI_FUNC(char *) PyModule_GetName(PyObject *); 
+PyAPI_FUNC(char *) PyModule_GetFilename(PyObject *); 
+PyAPI_FUNC(void) _PyModule_Clear(PyObject *); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_MODULEOBJECT_H */ 
diff --git a/contrib/tools/python/src/Include/node.h b/contrib/tools/python/src/Include/node.h
index 517c3dc43e..bae3080a81 100644
--- a/contrib/tools/python/src/Include/node.h
+++ b/contrib/tools/python/src/Include/node.h
@@ -1,41 +1,41 @@
-
-/* Parse tree node interface */
-
-#ifndef Py_NODE_H
-#define Py_NODE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct _node {
-    short		n_type;
-    char		*n_str;
-    int			n_lineno;
-    int			n_col_offset;
-    int			n_nchildren;
-    struct _node	*n_child;
-} node;
-
-PyAPI_FUNC(node *) PyNode_New(int type);
-PyAPI_FUNC(int) PyNode_AddChild(node *n, int type,
-                                      char *str, int lineno, int col_offset);
-PyAPI_FUNC(void) PyNode_Free(node *n);
+ 
+/* Parse tree node interface */ 
+ 
+#ifndef Py_NODE_H 
+#define Py_NODE_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+typedef struct _node { 
+    short		n_type; 
+    char		*n_str; 
+    int			n_lineno; 
+    int			n_col_offset; 
+    int			n_nchildren; 
+    struct _node	*n_child; 
+} node; 
+ 
+PyAPI_FUNC(node *) PyNode_New(int type); 
+PyAPI_FUNC(int) PyNode_AddChild(node *n, int type, 
+                                      char *str, int lineno, int col_offset); 
+PyAPI_FUNC(void) PyNode_Free(node *n); 
 PyAPI_FUNC(Py_ssize_t) _PyNode_SizeOf(node *n);
-
-/* Node access functions */
-#define NCH(n)		((n)->n_nchildren)
-	
-#define CHILD(n, i)	(&(n)->n_child[i])
-#define RCHILD(n, i)	(CHILD(n, NCH(n) + i))
-#define TYPE(n)		((n)->n_type)
-#define STR(n)		((n)->n_str)
-
-/* Assert that the type of a node is what we expect */
-#define REQ(n, type) assert(TYPE(n) == (type))
-
-PyAPI_FUNC(void) PyNode_ListTree(node *);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_NODE_H */
+ 
+/* Node access functions */ 
+#define NCH(n)		((n)->n_nchildren) 
+	 
+#define CHILD(n, i)	(&(n)->n_child[i]) 
+#define RCHILD(n, i)	(CHILD(n, NCH(n) + i)) 
+#define TYPE(n)		((n)->n_type) 
+#define STR(n)		((n)->n_str) 
+ 
+/* Assert that the type of a node is what we expect */ 
+#define REQ(n, type) assert(TYPE(n) == (type)) 
+ 
+PyAPI_FUNC(void) PyNode_ListTree(node *); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_NODE_H */ 
diff --git a/contrib/tools/python/src/Include/object.h b/contrib/tools/python/src/Include/object.h
index 807b24188a..1b6b956d21 100644
--- a/contrib/tools/python/src/Include/object.h
+++ b/contrib/tools/python/src/Include/object.h
@@ -1,829 +1,829 @@
-#ifndef Py_OBJECT_H
-#define Py_OBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Object and type object interface */
-
-/*
-Objects are structures allocated on the heap.  Special rules apply to
-the use of objects to ensure they are properly garbage-collected.
-Objects are never allocated statically or on the stack; they must be
-accessed through special macros and functions only.  (Type objects are
-exceptions to the first rule; the standard types are represented by
-statically initialized type objects, although work on type/class unification
-for Python 2.2 made it possible to have heap-allocated type objects too).
-
-An object has a 'reference count' that is increased or decreased when a
-pointer to the object is copied or deleted; when the reference count
-reaches zero there are no references to the object left and it can be
-removed from the heap.
-
-An object has a 'type' that determines what it represents and what kind
-of data it contains.  An object's type is fixed when it is created.
-Types themselves are represented as objects; an object contains a
-pointer to the corresponding type object.  The type itself has a type
-pointer pointing to the object representing the type 'type', which
-contains a pointer to itself!).
-
-Objects do not float around in memory; once allocated an object keeps
-the same size and address.  Objects that must hold variable-size data
-can contain pointers to variable-size parts of the object.  Not all
-objects of the same type have the same size; but the size cannot change
-after allocation.  (These restrictions are made so a reference to an
-object can be simply a pointer -- moving an object would require
-updating all the pointers, and changing an object's size would require
-moving it if there was another object right next to it.)
-
-Objects are always accessed through pointers of the type 'PyObject *'.
-The type 'PyObject' is a structure that only contains the reference count
-and the type pointer.  The actual memory allocated for an object
-contains other data that can only be accessed after casting the pointer
-to a pointer to a longer structure type.  This longer type must start
-with the reference count and type fields; the macro PyObject_HEAD should be
-used for this (to accommodate for future changes).  The implementation
-of a particular object type can cast the object pointer to the proper
-type and back.
-
-A standard interface exists for objects that contain an array of items
-whose size is determined when the object is allocated.
-*/
-
-/* Py_DEBUG implies Py_TRACE_REFS. */
-#if defined(Py_DEBUG) && !defined(Py_TRACE_REFS)
-#define Py_TRACE_REFS
-#endif
-
-/* Py_TRACE_REFS implies Py_REF_DEBUG. */
-#if defined(Py_TRACE_REFS) && !defined(Py_REF_DEBUG)
-#define Py_REF_DEBUG
-#endif
-
-#ifdef Py_TRACE_REFS
-/* Define pointers to support a doubly-linked list of all live heap objects. */
-#define _PyObject_HEAD_EXTRA            \
-    struct _object *_ob_next;           \
-    struct _object *_ob_prev;
-
-#define _PyObject_EXTRA_INIT 0, 0,
-
-#else
-#define _PyObject_HEAD_EXTRA
-#define _PyObject_EXTRA_INIT
-#endif
-
-/* PyObject_HEAD defines the initial segment of every PyObject. */
-#define PyObject_HEAD                   \
-    _PyObject_HEAD_EXTRA                \
-    Py_ssize_t ob_refcnt;               \
-    struct _typeobject *ob_type;
-
-#define PyObject_HEAD_INIT(type)        \
-    _PyObject_EXTRA_INIT                \
-    1, type,
-
-#define PyVarObject_HEAD_INIT(type, size)       \
-    PyObject_HEAD_INIT(type) size,
-
-/* PyObject_VAR_HEAD defines the initial segment of all variable-size
- * container objects.  These end with a declaration of an array with 1
- * element, but enough space is malloc'ed so that the array actually
- * has room for ob_size elements.  Note that ob_size is an element count,
- * not necessarily a byte count.
- */
-#define PyObject_VAR_HEAD               \
-    PyObject_HEAD                       \
-    Py_ssize_t ob_size; /* Number of items in variable part */
-#define Py_INVALID_SIZE (Py_ssize_t)-1
-
-/* Nothing is actually declared to be a PyObject, but every pointer to
- * a Python object can be cast to a PyObject*.  This is inheritance built
- * by hand.  Similarly every pointer to a variable-size Python object can,
- * in addition, be cast to PyVarObject*.
- */
-typedef struct _object {
-    PyObject_HEAD
-} PyObject;
-
-typedef struct {
-    PyObject_VAR_HEAD
-} PyVarObject;
-
-#define Py_REFCNT(ob)           (((PyObject*)(ob))->ob_refcnt)
-#define Py_TYPE(ob)             (((PyObject*)(ob))->ob_type)
-#define Py_SIZE(ob)             (((PyVarObject*)(ob))->ob_size)
-
-/*
-Type objects contain a string containing the type name (to help somewhat
-in debugging), the allocation parameters (see PyObject_New() and
-PyObject_NewVar()),
-and methods for accessing objects of the type.  Methods are optional, a
-nil pointer meaning that particular kind of access is not available for
-this type.  The Py_DECREF() macro uses the tp_dealloc method without
-checking for a nil pointer; it should always be implemented except if
-the implementation can guarantee that the reference count will never
-reach zero (e.g., for statically allocated type objects).
-
-NB: the methods for certain type groups are now contained in separate
-method blocks.
-*/
-
-typedef PyObject * (*unaryfunc)(PyObject *);
-typedef PyObject * (*binaryfunc)(PyObject *, PyObject *);
-typedef PyObject * (*ternaryfunc)(PyObject *, PyObject *, PyObject *);
-typedef int (*inquiry)(PyObject *);
-typedef Py_ssize_t (*lenfunc)(PyObject *);
-typedef int (*coercion)(PyObject **, PyObject **);
-typedef PyObject *(*intargfunc)(PyObject *, int) Py_DEPRECATED(2.5);
-typedef PyObject *(*intintargfunc)(PyObject *, int, int) Py_DEPRECATED(2.5);
-typedef PyObject *(*ssizeargfunc)(PyObject *, Py_ssize_t);
-typedef PyObject *(*ssizessizeargfunc)(PyObject *, Py_ssize_t, Py_ssize_t);
-typedef int(*intobjargproc)(PyObject *, int, PyObject *);
-typedef int(*intintobjargproc)(PyObject *, int, int, PyObject *);
-typedef int(*ssizeobjargproc)(PyObject *, Py_ssize_t, PyObject *);
-typedef int(*ssizessizeobjargproc)(PyObject *, Py_ssize_t, Py_ssize_t, PyObject *);
-typedef int(*objobjargproc)(PyObject *, PyObject *, PyObject *);
-
-
-
-/* int-based buffer interface */
-typedef int (*getreadbufferproc)(PyObject *, int, void **);
-typedef int (*getwritebufferproc)(PyObject *, int, void **);
-typedef int (*getsegcountproc)(PyObject *, int *);
-typedef int (*getcharbufferproc)(PyObject *, int, char **);
-/* ssize_t-based buffer interface */
-typedef Py_ssize_t (*readbufferproc)(PyObject *, Py_ssize_t, void **);
-typedef Py_ssize_t (*writebufferproc)(PyObject *, Py_ssize_t, void **);
-typedef Py_ssize_t (*segcountproc)(PyObject *, Py_ssize_t *);
-typedef Py_ssize_t (*charbufferproc)(PyObject *, Py_ssize_t, char **);
-
-
-/* Py3k buffer interface */
-typedef struct bufferinfo {
-    void *buf;
-    PyObject *obj;        /* owned reference */
-    Py_ssize_t len;
-    Py_ssize_t itemsize;  /* This is Py_ssize_t so it can be
-                             pointed to by strides in simple case.*/
-    int readonly;
-    int ndim;
-    char *format;
-    Py_ssize_t *shape;
-    Py_ssize_t *strides;
-    Py_ssize_t *suboffsets;
-    Py_ssize_t smalltable[2];  /* static store for shape and strides of
-                                  mono-dimensional buffers. */
-    void *internal;
-} Py_buffer;
-
-typedef int (*getbufferproc)(PyObject *, Py_buffer *, int);
-typedef void (*releasebufferproc)(PyObject *, Py_buffer *);
-
-    /* Flags for getting buffers */
-#define PyBUF_SIMPLE 0
-#define PyBUF_WRITABLE 0x0001
-/*  we used to include an E, backwards compatible alias  */
-#define PyBUF_WRITEABLE PyBUF_WRITABLE
-#define PyBUF_FORMAT 0x0004
-#define PyBUF_ND 0x0008
-#define PyBUF_STRIDES (0x0010 | PyBUF_ND)
-#define PyBUF_C_CONTIGUOUS (0x0020 | PyBUF_STRIDES)
-#define PyBUF_F_CONTIGUOUS (0x0040 | PyBUF_STRIDES)
-#define PyBUF_ANY_CONTIGUOUS (0x0080 | PyBUF_STRIDES)
-#define PyBUF_INDIRECT (0x0100 | PyBUF_STRIDES)
-
-#define PyBUF_CONTIG (PyBUF_ND | PyBUF_WRITABLE)
-#define PyBUF_CONTIG_RO (PyBUF_ND)
-
-#define PyBUF_STRIDED (PyBUF_STRIDES | PyBUF_WRITABLE)
-#define PyBUF_STRIDED_RO (PyBUF_STRIDES)
-
-#define PyBUF_RECORDS (PyBUF_STRIDES | PyBUF_WRITABLE | PyBUF_FORMAT)
-#define PyBUF_RECORDS_RO (PyBUF_STRIDES | PyBUF_FORMAT)
-
-#define PyBUF_FULL (PyBUF_INDIRECT | PyBUF_WRITABLE | PyBUF_FORMAT)
-#define PyBUF_FULL_RO (PyBUF_INDIRECT | PyBUF_FORMAT)
-
-
-#define PyBUF_READ  0x100
-#define PyBUF_WRITE 0x200
-#define PyBUF_SHADOW 0x400
-/* end Py3k buffer interface */
-
-typedef int (*objobjproc)(PyObject *, PyObject *);
-typedef int (*visitproc)(PyObject *, void *);
-typedef int (*traverseproc)(PyObject *, visitproc, void *);
-
-typedef struct {
-    /* For numbers without flag bit Py_TPFLAGS_CHECKTYPES set, all
-       arguments are guaranteed to be of the object's type (modulo
-       coercion hacks -- i.e. if the type's coercion function
-       returns other types, then these are allowed as well).  Numbers that
-       have the Py_TPFLAGS_CHECKTYPES flag bit set should check *both*
-       arguments for proper type and implement the necessary conversions
-       in the slot functions themselves. */
-
-    binaryfunc nb_add;
-    binaryfunc nb_subtract;
-    binaryfunc nb_multiply;
-    binaryfunc nb_divide;
-    binaryfunc nb_remainder;
-    binaryfunc nb_divmod;
-    ternaryfunc nb_power;
-    unaryfunc nb_negative;
-    unaryfunc nb_positive;
-    unaryfunc nb_absolute;
-    inquiry nb_nonzero;
-    unaryfunc nb_invert;
-    binaryfunc nb_lshift;
-    binaryfunc nb_rshift;
-    binaryfunc nb_and;
-    binaryfunc nb_xor;
-    binaryfunc nb_or;
-    coercion nb_coerce;
-    unaryfunc nb_int;
-    unaryfunc nb_long;
-    unaryfunc nb_float;
-    unaryfunc nb_oct;
-    unaryfunc nb_hex;
-    /* Added in release 2.0 */
-    binaryfunc nb_inplace_add;
-    binaryfunc nb_inplace_subtract;
-    binaryfunc nb_inplace_multiply;
-    binaryfunc nb_inplace_divide;
-    binaryfunc nb_inplace_remainder;
-    ternaryfunc nb_inplace_power;
-    binaryfunc nb_inplace_lshift;
-    binaryfunc nb_inplace_rshift;
-    binaryfunc nb_inplace_and;
-    binaryfunc nb_inplace_xor;
-    binaryfunc nb_inplace_or;
-
-    /* Added in release 2.2 */
-    /* The following require the Py_TPFLAGS_HAVE_CLASS flag */
-    binaryfunc nb_floor_divide;
-    binaryfunc nb_true_divide;
-    binaryfunc nb_inplace_floor_divide;
-    binaryfunc nb_inplace_true_divide;
-
-    /* Added in release 2.5 */
-    unaryfunc nb_index;
-} PyNumberMethods;
-
-typedef struct {
-    lenfunc sq_length;
-    binaryfunc sq_concat;
-    ssizeargfunc sq_repeat;
-    ssizeargfunc sq_item;
-    ssizessizeargfunc sq_slice;
-    ssizeobjargproc sq_ass_item;
-    ssizessizeobjargproc sq_ass_slice;
-    objobjproc sq_contains;
-    /* Added in release 2.0 */
-    binaryfunc sq_inplace_concat;
-    ssizeargfunc sq_inplace_repeat;
-} PySequenceMethods;
-
-typedef struct {
-    lenfunc mp_length;
-    binaryfunc mp_subscript;
-    objobjargproc mp_ass_subscript;
-} PyMappingMethods;
-
-typedef struct {
-    readbufferproc bf_getreadbuffer;
-    writebufferproc bf_getwritebuffer;
-    segcountproc bf_getsegcount;
-    charbufferproc bf_getcharbuffer;
-    getbufferproc bf_getbuffer;
-    releasebufferproc bf_releasebuffer;
-} PyBufferProcs;
-
-
-typedef void (*freefunc)(void *);
-typedef void (*destructor)(PyObject *);
-typedef int (*printfunc)(PyObject *, FILE *, int);
-typedef PyObject *(*getattrfunc)(PyObject *, char *);
-typedef PyObject *(*getattrofunc)(PyObject *, PyObject *);
-typedef int (*setattrfunc)(PyObject *, char *, PyObject *);
-typedef int (*setattrofunc)(PyObject *, PyObject *, PyObject *);
-typedef int (*cmpfunc)(PyObject *, PyObject *);
-typedef PyObject *(*reprfunc)(PyObject *);
-typedef long (*hashfunc)(PyObject *);
-typedef PyObject *(*richcmpfunc) (PyObject *, PyObject *, int);
-typedef PyObject *(*getiterfunc) (PyObject *);
-typedef PyObject *(*iternextfunc) (PyObject *);
-typedef PyObject *(*descrgetfunc) (PyObject *, PyObject *, PyObject *);
-typedef int (*descrsetfunc) (PyObject *, PyObject *, PyObject *);
-typedef int (*initproc)(PyObject *, PyObject *, PyObject *);
-typedef PyObject *(*newfunc)(struct _typeobject *, PyObject *, PyObject *);
-typedef PyObject *(*allocfunc)(struct _typeobject *, Py_ssize_t);
-
-typedef struct _typeobject {
-    PyObject_VAR_HEAD
-    const char *tp_name; /* For printing, in format "<module>.<name>" */
-    Py_ssize_t tp_basicsize, tp_itemsize; /* For allocation */
-
-    /* Methods to implement standard operations */
-
-    destructor tp_dealloc;
-    printfunc tp_print;
-    getattrfunc tp_getattr;
-    setattrfunc tp_setattr;
-    cmpfunc tp_compare;
-    reprfunc tp_repr;
-
-    /* Method suites for standard classes */
-
-    PyNumberMethods *tp_as_number;
-    PySequenceMethods *tp_as_sequence;
-    PyMappingMethods *tp_as_mapping;
-
-    /* More standard operations (here for binary compatibility) */
-
-    hashfunc tp_hash;
-    ternaryfunc tp_call;
-    reprfunc tp_str;
-    getattrofunc tp_getattro;
-    setattrofunc tp_setattro;
-
-    /* Functions to access object as input/output buffer */
-    PyBufferProcs *tp_as_buffer;
-
-    /* Flags to define presence of optional/expanded features */
-    long tp_flags;
-
-    const char *tp_doc; /* Documentation string */
-
-    /* Assigned meaning in release 2.0 */
-    /* call function for all accessible objects */
-    traverseproc tp_traverse;
-
-    /* delete references to contained objects */
-    inquiry tp_clear;
-
-    /* Assigned meaning in release 2.1 */
-    /* rich comparisons */
-    richcmpfunc tp_richcompare;
-
-    /* weak reference enabler */
-    Py_ssize_t tp_weaklistoffset;
-
-    /* Added in release 2.2 */
-    /* Iterators */
-    getiterfunc tp_iter;
-    iternextfunc tp_iternext;
-
-    /* Attribute descriptor and subclassing stuff */
-    struct PyMethodDef *tp_methods;
-    struct PyMemberDef *tp_members;
-    struct PyGetSetDef *tp_getset;
-    struct _typeobject *tp_base;
-    PyObject *tp_dict;
-    descrgetfunc tp_descr_get;
-    descrsetfunc tp_descr_set;
-    Py_ssize_t tp_dictoffset;
-    initproc tp_init;
-    allocfunc tp_alloc;
-    newfunc tp_new;
-    freefunc tp_free; /* Low-level free-memory routine */
-    inquiry tp_is_gc; /* For PyObject_IS_GC */
-    PyObject *tp_bases;
-    PyObject *tp_mro; /* method resolution order */
-    PyObject *tp_cache;
-    PyObject *tp_subclasses;
-    PyObject *tp_weaklist;
-    destructor tp_del;
-
-    /* Type attribute cache version tag. Added in version 2.6 */
-    unsigned int tp_version_tag;
-
-#ifdef COUNT_ALLOCS
-    /* these must be last and never explicitly initialized */
-    Py_ssize_t tp_allocs;
-    Py_ssize_t tp_frees;
-    Py_ssize_t tp_maxalloc;
-    struct _typeobject *tp_prev;
-    struct _typeobject *tp_next;
-#endif
-} PyTypeObject;
-
-
-/* The *real* layout of a type object when allocated on the heap */
-typedef struct _heaptypeobject {
-    /* Note: there's a dependency on the order of these members
-       in slotptr() in typeobject.c . */
-    PyTypeObject ht_type;
-    PyNumberMethods as_number;
-    PyMappingMethods as_mapping;
-    PySequenceMethods as_sequence; /* as_sequence comes after as_mapping,
-                                      so that the mapping wins when both
-                                      the mapping and the sequence define
-                                      a given operator (e.g. __getitem__).
-                                      see add_operators() in typeobject.c . */
-    PyBufferProcs as_buffer;
-    PyObject *ht_name, *ht_slots;
-    /* here are optional user slots, followed by the members. */
-} PyHeapTypeObject;
-
-/* access macro to the members which are floating "behind" the object */
-#define PyHeapType_GET_MEMBERS(etype) \
-    ((PyMemberDef *)(((char *)etype) + Py_TYPE(etype)->tp_basicsize))
-
-
-/* Generic type check */
-PyAPI_FUNC(int) PyType_IsSubtype(PyTypeObject *, PyTypeObject *);
-#define PyObject_TypeCheck(ob, tp) \
-    (Py_TYPE(ob) == (tp) || PyType_IsSubtype(Py_TYPE(ob), (tp)))
-
-PyAPI_DATA(PyTypeObject) PyType_Type; /* built-in 'type' */
-PyAPI_DATA(PyTypeObject) PyBaseObject_Type; /* built-in 'object' */
-PyAPI_DATA(PyTypeObject) PySuper_Type; /* built-in 'super' */
-
-#define PyType_Check(op) \
-    PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_TYPE_SUBCLASS)
-#define PyType_CheckExact(op) (Py_TYPE(op) == &PyType_Type)
-
-PyAPI_FUNC(int) PyType_Ready(PyTypeObject *);
-PyAPI_FUNC(PyObject *) PyType_GenericAlloc(PyTypeObject *, Py_ssize_t);
-PyAPI_FUNC(PyObject *) PyType_GenericNew(PyTypeObject *,
-                                               PyObject *, PyObject *);
-PyAPI_FUNC(PyObject *) _PyType_Lookup(PyTypeObject *, PyObject *);
-PyAPI_FUNC(PyObject *) _PyObject_LookupSpecial(PyObject *, char *, PyObject **);
-PyAPI_FUNC(unsigned int) PyType_ClearCache(void);
-PyAPI_FUNC(void) PyType_Modified(PyTypeObject *);
-
-/* Generic operations on objects */
-PyAPI_FUNC(int) PyObject_Print(PyObject *, FILE *, int);
-PyAPI_FUNC(void) _PyObject_Dump(PyObject *);
-PyAPI_FUNC(PyObject *) PyObject_Repr(PyObject *);
-PyAPI_FUNC(PyObject *) _PyObject_Str(PyObject *);
-PyAPI_FUNC(PyObject *) PyObject_Str(PyObject *);
-#define PyObject_Bytes PyObject_Str
-#ifdef Py_USING_UNICODE
-PyAPI_FUNC(PyObject *) PyObject_Unicode(PyObject *);
-#endif
-PyAPI_FUNC(int) PyObject_Compare(PyObject *, PyObject *);
-PyAPI_FUNC(PyObject *) PyObject_RichCompare(PyObject *, PyObject *, int);
-PyAPI_FUNC(int) PyObject_RichCompareBool(PyObject *, PyObject *, int);
-PyAPI_FUNC(PyObject *) PyObject_GetAttrString(PyObject *, const char *);
-PyAPI_FUNC(int) PyObject_SetAttrString(PyObject *, const char *, PyObject *);
-PyAPI_FUNC(int) PyObject_HasAttrString(PyObject *, const char *);
-PyAPI_FUNC(PyObject *) PyObject_GetAttr(PyObject *, PyObject *);
-PyAPI_FUNC(int) PyObject_SetAttr(PyObject *, PyObject *, PyObject *);
-PyAPI_FUNC(int) PyObject_HasAttr(PyObject *, PyObject *);
-PyAPI_FUNC(PyObject **) _PyObject_GetDictPtr(PyObject *);
-PyAPI_FUNC(PyObject *) PyObject_SelfIter(PyObject *);
-PyAPI_FUNC(PyObject *) _PyObject_NextNotImplemented(PyObject *);
-PyAPI_FUNC(PyObject *) PyObject_GenericGetAttr(PyObject *, PyObject *);
-PyAPI_FUNC(int) PyObject_GenericSetAttr(PyObject *,
-                                              PyObject *, PyObject *);
-PyAPI_FUNC(long) PyObject_Hash(PyObject *);
-PyAPI_FUNC(long) PyObject_HashNotImplemented(PyObject *);
-PyAPI_FUNC(int) PyObject_IsTrue(PyObject *);
-PyAPI_FUNC(int) PyObject_Not(PyObject *);
-PyAPI_FUNC(int) PyCallable_Check(PyObject *);
-PyAPI_FUNC(int) PyNumber_Coerce(PyObject **, PyObject **);
-PyAPI_FUNC(int) PyNumber_CoerceEx(PyObject **, PyObject **);
-
-PyAPI_FUNC(void) PyObject_ClearWeakRefs(PyObject *);
-
-/* A slot function whose address we need to compare */
-extern int _PyObject_SlotCompare(PyObject *, PyObject *);
-/* Same as PyObject_Generic{Get,Set}Attr, but passing the attributes
-   dict as the last parameter. */
-PyAPI_FUNC(PyObject *)
-_PyObject_GenericGetAttrWithDict(PyObject *, PyObject *, PyObject *);
-PyAPI_FUNC(int)
-_PyObject_GenericSetAttrWithDict(PyObject *, PyObject *,
-                                 PyObject *, PyObject *);
-
-
-/* PyObject_Dir(obj) acts like Python __builtin__.dir(obj), returning a
-   list of strings.  PyObject_Dir(NULL) is like __builtin__.dir(),
-   returning the names of the current locals.  In this case, if there are
-   no current locals, NULL is returned, and PyErr_Occurred() is false.
-*/
-PyAPI_FUNC(PyObject *) PyObject_Dir(PyObject *);
-
-
-/* Helpers for printing recursive container types */
-PyAPI_FUNC(int) Py_ReprEnter(PyObject *);
-PyAPI_FUNC(void) Py_ReprLeave(PyObject *);
-
-/* Helpers for hash functions */
-PyAPI_FUNC(long) _Py_HashDouble(double);
-PyAPI_FUNC(long) _Py_HashPointer(void*);
-
-typedef struct {
-    long prefix;
-    long suffix;
-} _Py_HashSecret_t;
-PyAPI_DATA(_Py_HashSecret_t) _Py_HashSecret;
-
-#ifdef Py_DEBUG
-PyAPI_DATA(int) _Py_HashSecret_Initialized;
-#endif
-
+#ifndef Py_OBJECT_H 
+#define Py_OBJECT_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+ 
+/* Object and type object interface */ 
+ 
+/* 
+Objects are structures allocated on the heap.  Special rules apply to 
+the use of objects to ensure they are properly garbage-collected. 
+Objects are never allocated statically or on the stack; they must be 
+accessed through special macros and functions only.  (Type objects are 
+exceptions to the first rule; the standard types are represented by 
+statically initialized type objects, although work on type/class unification 
+for Python 2.2 made it possible to have heap-allocated type objects too). 
+ 
+An object has a 'reference count' that is increased or decreased when a 
+pointer to the object is copied or deleted; when the reference count 
+reaches zero there are no references to the object left and it can be 
+removed from the heap. 
+ 
+An object has a 'type' that determines what it represents and what kind 
+of data it contains.  An object's type is fixed when it is created. 
+Types themselves are represented as objects; an object contains a 
+pointer to the corresponding type object.  The type itself has a type 
+pointer pointing to the object representing the type 'type', which 
+contains a pointer to itself!). 
+ 
+Objects do not float around in memory; once allocated an object keeps 
+the same size and address.  Objects that must hold variable-size data 
+can contain pointers to variable-size parts of the object.  Not all 
+objects of the same type have the same size; but the size cannot change 
+after allocation.  (These restrictions are made so a reference to an 
+object can be simply a pointer -- moving an object would require 
+updating all the pointers, and changing an object's size would require 
+moving it if there was another object right next to it.) 
+ 
+Objects are always accessed through pointers of the type 'PyObject *'. 
+The type 'PyObject' is a structure that only contains the reference count 
+and the type pointer.  The actual memory allocated for an object 
+contains other data that can only be accessed after casting the pointer 
+to a pointer to a longer structure type.  This longer type must start 
+with the reference count and type fields; the macro PyObject_HEAD should be 
+used for this (to accommodate for future changes).  The implementation 
+of a particular object type can cast the object pointer to the proper 
+type and back. 
+ 
+A standard interface exists for objects that contain an array of items 
+whose size is determined when the object is allocated. 
+*/ 
+ 
+/* Py_DEBUG implies Py_TRACE_REFS. */ 
+#if defined(Py_DEBUG) && !defined(Py_TRACE_REFS) 
+#define Py_TRACE_REFS 
+#endif 
+ 
+/* Py_TRACE_REFS implies Py_REF_DEBUG. */ 
+#if defined(Py_TRACE_REFS) && !defined(Py_REF_DEBUG) 
+#define Py_REF_DEBUG 
+#endif 
+ 
+#ifdef Py_TRACE_REFS 
+/* Define pointers to support a doubly-linked list of all live heap objects. */ 
+#define _PyObject_HEAD_EXTRA            \ 
+    struct _object *_ob_next;           \ 
+    struct _object *_ob_prev; 
+ 
+#define _PyObject_EXTRA_INIT 0, 0, 
+ 
+#else 
+#define _PyObject_HEAD_EXTRA 
+#define _PyObject_EXTRA_INIT 
+#endif 
+ 
+/* PyObject_HEAD defines the initial segment of every PyObject. */ 
+#define PyObject_HEAD                   \ 
+    _PyObject_HEAD_EXTRA                \ 
+    Py_ssize_t ob_refcnt;               \ 
+    struct _typeobject *ob_type; 
+ 
+#define PyObject_HEAD_INIT(type)        \ 
+    _PyObject_EXTRA_INIT                \ 
+    1, type, 
+ 
+#define PyVarObject_HEAD_INIT(type, size)       \ 
+    PyObject_HEAD_INIT(type) size, 
+ 
+/* PyObject_VAR_HEAD defines the initial segment of all variable-size 
+ * container objects.  These end with a declaration of an array with 1 
+ * element, but enough space is malloc'ed so that the array actually 
+ * has room for ob_size elements.  Note that ob_size is an element count, 
+ * not necessarily a byte count. 
+ */ 
+#define PyObject_VAR_HEAD               \ 
+    PyObject_HEAD                       \ 
+    Py_ssize_t ob_size; /* Number of items in variable part */ 
+#define Py_INVALID_SIZE (Py_ssize_t)-1 
+ 
+/* Nothing is actually declared to be a PyObject, but every pointer to 
+ * a Python object can be cast to a PyObject*.  This is inheritance built 
+ * by hand.  Similarly every pointer to a variable-size Python object can, 
+ * in addition, be cast to PyVarObject*. 
+ */ 
+typedef struct _object { 
+    PyObject_HEAD 
+} PyObject; 
+ 
+typedef struct { 
+    PyObject_VAR_HEAD 
+} PyVarObject; 
+ 
+#define Py_REFCNT(ob)           (((PyObject*)(ob))->ob_refcnt) 
+#define Py_TYPE(ob)             (((PyObject*)(ob))->ob_type) 
+#define Py_SIZE(ob)             (((PyVarObject*)(ob))->ob_size) 
+ 
+/* 
+Type objects contain a string containing the type name (to help somewhat 
+in debugging), the allocation parameters (see PyObject_New() and 
+PyObject_NewVar()), 
+and methods for accessing objects of the type.  Methods are optional, a 
+nil pointer meaning that particular kind of access is not available for 
+this type.  The Py_DECREF() macro uses the tp_dealloc method without 
+checking for a nil pointer; it should always be implemented except if 
+the implementation can guarantee that the reference count will never 
+reach zero (e.g., for statically allocated type objects). 
+ 
+NB: the methods for certain type groups are now contained in separate 
+method blocks. 
+*/ 
+ 
+typedef PyObject * (*unaryfunc)(PyObject *); 
+typedef PyObject * (*binaryfunc)(PyObject *, PyObject *); 
+typedef PyObject * (*ternaryfunc)(PyObject *, PyObject *, PyObject *); 
+typedef int (*inquiry)(PyObject *); 
+typedef Py_ssize_t (*lenfunc)(PyObject *); 
+typedef int (*coercion)(PyObject **, PyObject **); 
+typedef PyObject *(*intargfunc)(PyObject *, int) Py_DEPRECATED(2.5); 
+typedef PyObject *(*intintargfunc)(PyObject *, int, int) Py_DEPRECATED(2.5); 
+typedef PyObject *(*ssizeargfunc)(PyObject *, Py_ssize_t); 
+typedef PyObject *(*ssizessizeargfunc)(PyObject *, Py_ssize_t, Py_ssize_t); 
+typedef int(*intobjargproc)(PyObject *, int, PyObject *); 
+typedef int(*intintobjargproc)(PyObject *, int, int, PyObject *); 
+typedef int(*ssizeobjargproc)(PyObject *, Py_ssize_t, PyObject *); 
+typedef int(*ssizessizeobjargproc)(PyObject *, Py_ssize_t, Py_ssize_t, PyObject *); 
+typedef int(*objobjargproc)(PyObject *, PyObject *, PyObject *); 
+ 
+ 
+ 
+/* int-based buffer interface */ 
+typedef int (*getreadbufferproc)(PyObject *, int, void **); 
+typedef int (*getwritebufferproc)(PyObject *, int, void **); 
+typedef int (*getsegcountproc)(PyObject *, int *); 
+typedef int (*getcharbufferproc)(PyObject *, int, char **); 
+/* ssize_t-based buffer interface */ 
+typedef Py_ssize_t (*readbufferproc)(PyObject *, Py_ssize_t, void **); 
+typedef Py_ssize_t (*writebufferproc)(PyObject *, Py_ssize_t, void **); 
+typedef Py_ssize_t (*segcountproc)(PyObject *, Py_ssize_t *); 
+typedef Py_ssize_t (*charbufferproc)(PyObject *, Py_ssize_t, char **); 
+ 
+ 
+/* Py3k buffer interface */ 
+typedef struct bufferinfo { 
+    void *buf; 
+    PyObject *obj;        /* owned reference */ 
+    Py_ssize_t len; 
+    Py_ssize_t itemsize;  /* This is Py_ssize_t so it can be 
+                             pointed to by strides in simple case.*/ 
+    int readonly; 
+    int ndim; 
+    char *format; 
+    Py_ssize_t *shape; 
+    Py_ssize_t *strides; 
+    Py_ssize_t *suboffsets; 
+    Py_ssize_t smalltable[2];  /* static store for shape and strides of 
+                                  mono-dimensional buffers. */ 
+    void *internal; 
+} Py_buffer; 
+ 
+typedef int (*getbufferproc)(PyObject *, Py_buffer *, int); 
+typedef void (*releasebufferproc)(PyObject *, Py_buffer *); 
+ 
+    /* Flags for getting buffers */ 
+#define PyBUF_SIMPLE 0 
+#define PyBUF_WRITABLE 0x0001 
+/*  we used to include an E, backwards compatible alias  */ 
+#define PyBUF_WRITEABLE PyBUF_WRITABLE 
+#define PyBUF_FORMAT 0x0004 
+#define PyBUF_ND 0x0008 
+#define PyBUF_STRIDES (0x0010 | PyBUF_ND) 
+#define PyBUF_C_CONTIGUOUS (0x0020 | PyBUF_STRIDES) 
+#define PyBUF_F_CONTIGUOUS (0x0040 | PyBUF_STRIDES) 
+#define PyBUF_ANY_CONTIGUOUS (0x0080 | PyBUF_STRIDES) 
+#define PyBUF_INDIRECT (0x0100 | PyBUF_STRIDES) 
+ 
+#define PyBUF_CONTIG (PyBUF_ND | PyBUF_WRITABLE) 
+#define PyBUF_CONTIG_RO (PyBUF_ND) 
+ 
+#define PyBUF_STRIDED (PyBUF_STRIDES | PyBUF_WRITABLE) 
+#define PyBUF_STRIDED_RO (PyBUF_STRIDES) 
+ 
+#define PyBUF_RECORDS (PyBUF_STRIDES | PyBUF_WRITABLE | PyBUF_FORMAT) 
+#define PyBUF_RECORDS_RO (PyBUF_STRIDES | PyBUF_FORMAT) 
+ 
+#define PyBUF_FULL (PyBUF_INDIRECT | PyBUF_WRITABLE | PyBUF_FORMAT) 
+#define PyBUF_FULL_RO (PyBUF_INDIRECT | PyBUF_FORMAT) 
+ 
+ 
+#define PyBUF_READ  0x100 
+#define PyBUF_WRITE 0x200 
+#define PyBUF_SHADOW 0x400 
+/* end Py3k buffer interface */ 
+ 
+typedef int (*objobjproc)(PyObject *, PyObject *); 
+typedef int (*visitproc)(PyObject *, void *); 
+typedef int (*traverseproc)(PyObject *, visitproc, void *); 
+ 
+typedef struct { 
+    /* For numbers without flag bit Py_TPFLAGS_CHECKTYPES set, all 
+       arguments are guaranteed to be of the object's type (modulo 
+       coercion hacks -- i.e. if the type's coercion function 
+       returns other types, then these are allowed as well).  Numbers that 
+       have the Py_TPFLAGS_CHECKTYPES flag bit set should check *both* 
+       arguments for proper type and implement the necessary conversions 
+       in the slot functions themselves. */ 
+ 
+    binaryfunc nb_add; 
+    binaryfunc nb_subtract; 
+    binaryfunc nb_multiply; 
+    binaryfunc nb_divide; 
+    binaryfunc nb_remainder; 
+    binaryfunc nb_divmod; 
+    ternaryfunc nb_power; 
+    unaryfunc nb_negative; 
+    unaryfunc nb_positive; 
+    unaryfunc nb_absolute; 
+    inquiry nb_nonzero; 
+    unaryfunc nb_invert; 
+    binaryfunc nb_lshift; 
+    binaryfunc nb_rshift; 
+    binaryfunc nb_and; 
+    binaryfunc nb_xor; 
+    binaryfunc nb_or; 
+    coercion nb_coerce; 
+    unaryfunc nb_int; 
+    unaryfunc nb_long; 
+    unaryfunc nb_float; 
+    unaryfunc nb_oct; 
+    unaryfunc nb_hex; 
+    /* Added in release 2.0 */ 
+    binaryfunc nb_inplace_add; 
+    binaryfunc nb_inplace_subtract; 
+    binaryfunc nb_inplace_multiply; 
+    binaryfunc nb_inplace_divide; 
+    binaryfunc nb_inplace_remainder; 
+    ternaryfunc nb_inplace_power; 
+    binaryfunc nb_inplace_lshift; 
+    binaryfunc nb_inplace_rshift; 
+    binaryfunc nb_inplace_and; 
+    binaryfunc nb_inplace_xor; 
+    binaryfunc nb_inplace_or; 
+ 
+    /* Added in release 2.2 */ 
+    /* The following require the Py_TPFLAGS_HAVE_CLASS flag */ 
+    binaryfunc nb_floor_divide; 
+    binaryfunc nb_true_divide; 
+    binaryfunc nb_inplace_floor_divide; 
+    binaryfunc nb_inplace_true_divide; 
+ 
+    /* Added in release 2.5 */ 
+    unaryfunc nb_index; 
+} PyNumberMethods; 
+ 
+typedef struct { 
+    lenfunc sq_length; 
+    binaryfunc sq_concat; 
+    ssizeargfunc sq_repeat; 
+    ssizeargfunc sq_item; 
+    ssizessizeargfunc sq_slice; 
+    ssizeobjargproc sq_ass_item; 
+    ssizessizeobjargproc sq_ass_slice; 
+    objobjproc sq_contains; 
+    /* Added in release 2.0 */ 
+    binaryfunc sq_inplace_concat; 
+    ssizeargfunc sq_inplace_repeat; 
+} PySequenceMethods; 
+ 
+typedef struct { 
+    lenfunc mp_length; 
+    binaryfunc mp_subscript; 
+    objobjargproc mp_ass_subscript; 
+} PyMappingMethods; 
+ 
+typedef struct { 
+    readbufferproc bf_getreadbuffer; 
+    writebufferproc bf_getwritebuffer; 
+    segcountproc bf_getsegcount; 
+    charbufferproc bf_getcharbuffer; 
+    getbufferproc bf_getbuffer; 
+    releasebufferproc bf_releasebuffer; 
+} PyBufferProcs; 
+ 
+ 
+typedef void (*freefunc)(void *); 
+typedef void (*destructor)(PyObject *); 
+typedef int (*printfunc)(PyObject *, FILE *, int); 
+typedef PyObject *(*getattrfunc)(PyObject *, char *); 
+typedef PyObject *(*getattrofunc)(PyObject *, PyObject *); 
+typedef int (*setattrfunc)(PyObject *, char *, PyObject *); 
+typedef int (*setattrofunc)(PyObject *, PyObject *, PyObject *); 
+typedef int (*cmpfunc)(PyObject *, PyObject *); 
+typedef PyObject *(*reprfunc)(PyObject *); 
+typedef long (*hashfunc)(PyObject *); 
+typedef PyObject *(*richcmpfunc) (PyObject *, PyObject *, int); 
+typedef PyObject *(*getiterfunc) (PyObject *); 
+typedef PyObject *(*iternextfunc) (PyObject *); 
+typedef PyObject *(*descrgetfunc) (PyObject *, PyObject *, PyObject *); 
+typedef int (*descrsetfunc) (PyObject *, PyObject *, PyObject *); 
+typedef int (*initproc)(PyObject *, PyObject *, PyObject *); 
+typedef PyObject *(*newfunc)(struct _typeobject *, PyObject *, PyObject *); 
+typedef PyObject *(*allocfunc)(struct _typeobject *, Py_ssize_t); 
+ 
+typedef struct _typeobject { 
+    PyObject_VAR_HEAD 
+    const char *tp_name; /* For printing, in format "<module>.<name>" */ 
+    Py_ssize_t tp_basicsize, tp_itemsize; /* For allocation */ 
+ 
+    /* Methods to implement standard operations */ 
+ 
+    destructor tp_dealloc; 
+    printfunc tp_print; 
+    getattrfunc tp_getattr; 
+    setattrfunc tp_setattr; 
+    cmpfunc tp_compare; 
+    reprfunc tp_repr; 
+ 
+    /* Method suites for standard classes */ 
+ 
+    PyNumberMethods *tp_as_number; 
+    PySequenceMethods *tp_as_sequence; 
+    PyMappingMethods *tp_as_mapping; 
+ 
+    /* More standard operations (here for binary compatibility) */ 
+ 
+    hashfunc tp_hash; 
+    ternaryfunc tp_call; 
+    reprfunc tp_str; 
+    getattrofunc tp_getattro; 
+    setattrofunc tp_setattro; 
+ 
+    /* Functions to access object as input/output buffer */ 
+    PyBufferProcs *tp_as_buffer; 
+ 
+    /* Flags to define presence of optional/expanded features */ 
+    long tp_flags; 
+ 
+    const char *tp_doc; /* Documentation string */ 
+ 
+    /* Assigned meaning in release 2.0 */ 
+    /* call function for all accessible objects */ 
+    traverseproc tp_traverse; 
+ 
+    /* delete references to contained objects */ 
+    inquiry tp_clear; 
+ 
+    /* Assigned meaning in release 2.1 */ 
+    /* rich comparisons */ 
+    richcmpfunc tp_richcompare; 
+ 
+    /* weak reference enabler */ 
+    Py_ssize_t tp_weaklistoffset; 
+ 
+    /* Added in release 2.2 */ 
+    /* Iterators */ 
+    getiterfunc tp_iter; 
+    iternextfunc tp_iternext; 
+ 
+    /* Attribute descriptor and subclassing stuff */ 
+    struct PyMethodDef *tp_methods; 
+    struct PyMemberDef *tp_members; 
+    struct PyGetSetDef *tp_getset; 
+    struct _typeobject *tp_base; 
+    PyObject *tp_dict; 
+    descrgetfunc tp_descr_get; 
+    descrsetfunc tp_descr_set; 
+    Py_ssize_t tp_dictoffset; 
+    initproc tp_init; 
+    allocfunc tp_alloc; 
+    newfunc tp_new; 
+    freefunc tp_free; /* Low-level free-memory routine */ 
+    inquiry tp_is_gc; /* For PyObject_IS_GC */ 
+    PyObject *tp_bases; 
+    PyObject *tp_mro; /* method resolution order */ 
+    PyObject *tp_cache; 
+    PyObject *tp_subclasses; 
+    PyObject *tp_weaklist; 
+    destructor tp_del; 
+ 
+    /* Type attribute cache version tag. Added in version 2.6 */ 
+    unsigned int tp_version_tag; 
+ 
+#ifdef COUNT_ALLOCS 
+    /* these must be last and never explicitly initialized */ 
+    Py_ssize_t tp_allocs; 
+    Py_ssize_t tp_frees; 
+    Py_ssize_t tp_maxalloc; 
+    struct _typeobject *tp_prev; 
+    struct _typeobject *tp_next; 
+#endif 
+} PyTypeObject; 
+ 
+ 
+/* The *real* layout of a type object when allocated on the heap */ 
+typedef struct _heaptypeobject { 
+    /* Note: there's a dependency on the order of these members 
+       in slotptr() in typeobject.c . */ 
+    PyTypeObject ht_type; 
+    PyNumberMethods as_number; 
+    PyMappingMethods as_mapping; 
+    PySequenceMethods as_sequence; /* as_sequence comes after as_mapping, 
+                                      so that the mapping wins when both 
+                                      the mapping and the sequence define 
+                                      a given operator (e.g. __getitem__). 
+                                      see add_operators() in typeobject.c . */ 
+    PyBufferProcs as_buffer; 
+    PyObject *ht_name, *ht_slots; 
+    /* here are optional user slots, followed by the members. */ 
+} PyHeapTypeObject; 
+ 
+/* access macro to the members which are floating "behind" the object */ 
+#define PyHeapType_GET_MEMBERS(etype) \ 
+    ((PyMemberDef *)(((char *)etype) + Py_TYPE(etype)->tp_basicsize)) 
+ 
+ 
+/* Generic type check */ 
+PyAPI_FUNC(int) PyType_IsSubtype(PyTypeObject *, PyTypeObject *); 
+#define PyObject_TypeCheck(ob, tp) \ 
+    (Py_TYPE(ob) == (tp) || PyType_IsSubtype(Py_TYPE(ob), (tp))) 
+ 
+PyAPI_DATA(PyTypeObject) PyType_Type; /* built-in 'type' */ 
+PyAPI_DATA(PyTypeObject) PyBaseObject_Type; /* built-in 'object' */ 
+PyAPI_DATA(PyTypeObject) PySuper_Type; /* built-in 'super' */ 
+ 
+#define PyType_Check(op) \ 
+    PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_TYPE_SUBCLASS) 
+#define PyType_CheckExact(op) (Py_TYPE(op) == &PyType_Type) 
+ 
+PyAPI_FUNC(int) PyType_Ready(PyTypeObject *); 
+PyAPI_FUNC(PyObject *) PyType_GenericAlloc(PyTypeObject *, Py_ssize_t); 
+PyAPI_FUNC(PyObject *) PyType_GenericNew(PyTypeObject *, 
+                                               PyObject *, PyObject *); 
+PyAPI_FUNC(PyObject *) _PyType_Lookup(PyTypeObject *, PyObject *); 
+PyAPI_FUNC(PyObject *) _PyObject_LookupSpecial(PyObject *, char *, PyObject **); 
+PyAPI_FUNC(unsigned int) PyType_ClearCache(void); 
+PyAPI_FUNC(void) PyType_Modified(PyTypeObject *); 
+ 
+/* Generic operations on objects */ 
+PyAPI_FUNC(int) PyObject_Print(PyObject *, FILE *, int); 
+PyAPI_FUNC(void) _PyObject_Dump(PyObject *); 
+PyAPI_FUNC(PyObject *) PyObject_Repr(PyObject *); 
+PyAPI_FUNC(PyObject *) _PyObject_Str(PyObject *); 
+PyAPI_FUNC(PyObject *) PyObject_Str(PyObject *); 
+#define PyObject_Bytes PyObject_Str 
+#ifdef Py_USING_UNICODE 
+PyAPI_FUNC(PyObject *) PyObject_Unicode(PyObject *); 
+#endif 
+PyAPI_FUNC(int) PyObject_Compare(PyObject *, PyObject *); 
+PyAPI_FUNC(PyObject *) PyObject_RichCompare(PyObject *, PyObject *, int); 
+PyAPI_FUNC(int) PyObject_RichCompareBool(PyObject *, PyObject *, int); 
+PyAPI_FUNC(PyObject *) PyObject_GetAttrString(PyObject *, const char *); 
+PyAPI_FUNC(int) PyObject_SetAttrString(PyObject *, const char *, PyObject *); 
+PyAPI_FUNC(int) PyObject_HasAttrString(PyObject *, const char *); 
+PyAPI_FUNC(PyObject *) PyObject_GetAttr(PyObject *, PyObject *); 
+PyAPI_FUNC(int) PyObject_SetAttr(PyObject *, PyObject *, PyObject *); 
+PyAPI_FUNC(int) PyObject_HasAttr(PyObject *, PyObject *); 
+PyAPI_FUNC(PyObject **) _PyObject_GetDictPtr(PyObject *); 
+PyAPI_FUNC(PyObject *) PyObject_SelfIter(PyObject *); 
+PyAPI_FUNC(PyObject *) _PyObject_NextNotImplemented(PyObject *); 
+PyAPI_FUNC(PyObject *) PyObject_GenericGetAttr(PyObject *, PyObject *); 
+PyAPI_FUNC(int) PyObject_GenericSetAttr(PyObject *, 
+                                              PyObject *, PyObject *); 
+PyAPI_FUNC(long) PyObject_Hash(PyObject *); 
+PyAPI_FUNC(long) PyObject_HashNotImplemented(PyObject *); 
+PyAPI_FUNC(int) PyObject_IsTrue(PyObject *); 
+PyAPI_FUNC(int) PyObject_Not(PyObject *); 
+PyAPI_FUNC(int) PyCallable_Check(PyObject *); 
+PyAPI_FUNC(int) PyNumber_Coerce(PyObject **, PyObject **); 
+PyAPI_FUNC(int) PyNumber_CoerceEx(PyObject **, PyObject **); 
+ 
+PyAPI_FUNC(void) PyObject_ClearWeakRefs(PyObject *); 
+ 
+/* A slot function whose address we need to compare */ 
+extern int _PyObject_SlotCompare(PyObject *, PyObject *); 
+/* Same as PyObject_Generic{Get,Set}Attr, but passing the attributes 
+   dict as the last parameter. */ 
+PyAPI_FUNC(PyObject *) 
+_PyObject_GenericGetAttrWithDict(PyObject *, PyObject *, PyObject *); 
+PyAPI_FUNC(int) 
+_PyObject_GenericSetAttrWithDict(PyObject *, PyObject *, 
+                                 PyObject *, PyObject *); 
+ 
+ 
+/* PyObject_Dir(obj) acts like Python __builtin__.dir(obj), returning a 
+   list of strings.  PyObject_Dir(NULL) is like __builtin__.dir(), 
+   returning the names of the current locals.  In this case, if there are 
+   no current locals, NULL is returned, and PyErr_Occurred() is false. 
+*/ 
+PyAPI_FUNC(PyObject *) PyObject_Dir(PyObject *); 
+ 
+ 
+/* Helpers for printing recursive container types */ 
+PyAPI_FUNC(int) Py_ReprEnter(PyObject *); 
+PyAPI_FUNC(void) Py_ReprLeave(PyObject *); 
+ 
+/* Helpers for hash functions */ 
+PyAPI_FUNC(long) _Py_HashDouble(double); 
+PyAPI_FUNC(long) _Py_HashPointer(void*); 
+ 
+typedef struct { 
+    long prefix; 
+    long suffix; 
+} _Py_HashSecret_t; 
+PyAPI_DATA(_Py_HashSecret_t) _Py_HashSecret; 
+ 
+#ifdef Py_DEBUG 
+PyAPI_DATA(int) _Py_HashSecret_Initialized; 
+#endif 
+ 
 /* Helper for passing objects to printf and the like.
    Leaks refcounts.  Don't use it!
 */
-#define PyObject_REPR(obj) PyString_AS_STRING(PyObject_Repr(obj))
-
-/* Flag bits for printing: */
-#define Py_PRINT_RAW    1       /* No string quotes etc. */
-
-/*
-`Type flags (tp_flags)
-
-These flags are used to extend the type structure in a backwards-compatible
-fashion. Extensions can use the flags to indicate (and test) when a given
-type structure contains a new feature. The Python core will use these when
-introducing new functionality between major revisions (to avoid mid-version
-changes in the PYTHON_API_VERSION).
-
-Arbitration of the flag bit positions will need to be coordinated among
-all extension writers who publically release their extensions (this will
-be fewer than you might expect!)..
-
-Python 1.5.2 introduced the bf_getcharbuffer slot into PyBufferProcs.
-
-Type definitions should use Py_TPFLAGS_DEFAULT for their tp_flags value.
-
-Code can use PyType_HasFeature(type_ob, flag_value) to test whether the
-given type object has a specified feature.
-
-NOTE: when building the core, Py_TPFLAGS_DEFAULT includes
-Py_TPFLAGS_HAVE_VERSION_TAG; outside the core, it doesn't.  This is so
-that extensions that modify tp_dict of their own types directly don't
-break, since this was allowed in 2.5.  In 3.0 they will have to
-manually remove this flag though!
-*/
-
-/* PyBufferProcs contains bf_getcharbuffer */
-#define Py_TPFLAGS_HAVE_GETCHARBUFFER  (1L<<0)
-
-/* PySequenceMethods contains sq_contains */
-#define Py_TPFLAGS_HAVE_SEQUENCE_IN (1L<<1)
-
-/* This is here for backwards compatibility.  Extensions that use the old GC
- * API will still compile but the objects will not be tracked by the GC. */
-#define Py_TPFLAGS_GC 0 /* used to be (1L<<2) */
-
-/* PySequenceMethods and PyNumberMethods contain in-place operators */
-#define Py_TPFLAGS_HAVE_INPLACEOPS (1L<<3)
-
-/* PyNumberMethods do their own coercion */
-#define Py_TPFLAGS_CHECKTYPES (1L<<4)
-
-/* tp_richcompare is defined */
-#define Py_TPFLAGS_HAVE_RICHCOMPARE (1L<<5)
-
-/* Objects which are weakly referencable if their tp_weaklistoffset is >0 */
-#define Py_TPFLAGS_HAVE_WEAKREFS (1L<<6)
-
-/* tp_iter is defined */
-#define Py_TPFLAGS_HAVE_ITER (1L<<7)
-
-/* New members introduced by Python 2.2 exist */
-#define Py_TPFLAGS_HAVE_CLASS (1L<<8)
-
-/* Set if the type object is dynamically allocated */
-#define Py_TPFLAGS_HEAPTYPE (1L<<9)
-
-/* Set if the type allows subclassing */
-#define Py_TPFLAGS_BASETYPE (1L<<10)
-
-/* Set if the type is 'ready' -- fully initialized */
-#define Py_TPFLAGS_READY (1L<<12)
-
-/* Set while the type is being 'readied', to prevent recursive ready calls */
-#define Py_TPFLAGS_READYING (1L<<13)
-
-/* Objects support garbage collection (see objimp.h) */
-#define Py_TPFLAGS_HAVE_GC (1L<<14)
-
-/* These two bits are preserved for Stackless Python, next after this is 17 */
-#ifdef STACKLESS
-#define Py_TPFLAGS_HAVE_STACKLESS_EXTENSION (3L<<15)
-#else
-#define Py_TPFLAGS_HAVE_STACKLESS_EXTENSION 0
-#endif
-
-/* Objects support nb_index in PyNumberMethods */
-#define Py_TPFLAGS_HAVE_INDEX (1L<<17)
-
-/* Objects support type attribute cache */
-#define Py_TPFLAGS_HAVE_VERSION_TAG   (1L<<18)
-#define Py_TPFLAGS_VALID_VERSION_TAG  (1L<<19)
-
-/* Type is abstract and cannot be instantiated */
-#define Py_TPFLAGS_IS_ABSTRACT (1L<<20)
-
-/* Has the new buffer protocol */
-#define Py_TPFLAGS_HAVE_NEWBUFFER (1L<<21)
-
-/* These flags are used to determine if a type is a subclass. */
-#define Py_TPFLAGS_INT_SUBCLASS         (1L<<23)
-#define Py_TPFLAGS_LONG_SUBCLASS        (1L<<24)
-#define Py_TPFLAGS_LIST_SUBCLASS        (1L<<25)
-#define Py_TPFLAGS_TUPLE_SUBCLASS       (1L<<26)
-#define Py_TPFLAGS_STRING_SUBCLASS      (1L<<27)
-#define Py_TPFLAGS_UNICODE_SUBCLASS     (1L<<28)
-#define Py_TPFLAGS_DICT_SUBCLASS        (1L<<29)
-#define Py_TPFLAGS_BASE_EXC_SUBCLASS    (1L<<30)
-#define Py_TPFLAGS_TYPE_SUBCLASS        (1L<<31)
-
-#define Py_TPFLAGS_DEFAULT_EXTERNAL ( \
-                 Py_TPFLAGS_HAVE_GETCHARBUFFER | \
-                 Py_TPFLAGS_HAVE_SEQUENCE_IN | \
-                 Py_TPFLAGS_HAVE_INPLACEOPS | \
-                 Py_TPFLAGS_HAVE_RICHCOMPARE | \
-                 Py_TPFLAGS_HAVE_WEAKREFS | \
-                 Py_TPFLAGS_HAVE_ITER | \
-                 Py_TPFLAGS_HAVE_CLASS | \
-                 Py_TPFLAGS_HAVE_STACKLESS_EXTENSION | \
-                 Py_TPFLAGS_HAVE_INDEX | \
-                 0)
-#define Py_TPFLAGS_DEFAULT_CORE (Py_TPFLAGS_DEFAULT_EXTERNAL | \
-                 Py_TPFLAGS_HAVE_VERSION_TAG)
-
-#ifdef Py_BUILD_CORE
-#define Py_TPFLAGS_DEFAULT Py_TPFLAGS_DEFAULT_CORE
-#else
-#define Py_TPFLAGS_DEFAULT Py_TPFLAGS_DEFAULT_EXTERNAL
-#endif
-
-#define PyType_HasFeature(t,f)  (((t)->tp_flags & (f)) != 0)
-#define PyType_FastSubclass(t,f)  PyType_HasFeature(t,f)
-
-
-/*
-The macros Py_INCREF(op) and Py_DECREF(op) are used to increment or decrement
-reference counts.  Py_DECREF calls the object's deallocator function when
-the refcount falls to 0; for
-objects that don't contain references to other objects or heap memory
-this can be the standard function free().  Both macros can be used
-wherever a void expression is allowed.  The argument must not be a
-NULL pointer.  If it may be NULL, use Py_XINCREF/Py_XDECREF instead.
-The macro _Py_NewReference(op) initialize reference counts to 1, and
-in special builds (Py_REF_DEBUG, Py_TRACE_REFS) performs additional
-bookkeeping appropriate to the special build.
-
-We assume that the reference count field can never overflow; this can
-be proven when the size of the field is the same as the pointer size, so
-we ignore the possibility.  Provided a C int is at least 32 bits (which
-is implicitly assumed in many parts of this code), that's enough for
-about 2**31 references to an object.
-
-XXX The following became out of date in Python 2.2, but I'm not sure
-XXX what the full truth is now.  Certainly, heap-allocated type objects
-XXX can and should be deallocated.
-Type objects should never be deallocated; the type pointer in an object
-is not considered to be a reference to the type object, to save
-complications in the deallocation function.  (This is actually a
-decision that's up to the implementer of each new type so if you want,
-you can count such references to the type object.)
-
-*** WARNING*** The Py_DECREF macro must have a side-effect-free argument
-since it may evaluate its argument multiple times.  (The alternative
-would be to mace it a proper function or assign it to a global temporary
-variable first, both of which are slower; and in a multi-threaded
-environment the global variable trick is not safe.)
-*/
-
-/* First define a pile of simple helper macros, one set per special
- * build symbol.  These either expand to the obvious things, or to
- * nothing at all when the special mode isn't in effect.  The main
- * macros can later be defined just once then, yet expand to different
- * things depending on which special build options are and aren't in effect.
- * Trust me <wink>:  while painful, this is 20x easier to understand than,
- * e.g, defining _Py_NewReference five different times in a maze of nested
- * #ifdefs (we used to do that -- it was impenetrable).
- */
-#ifdef Py_REF_DEBUG
-PyAPI_DATA(Py_ssize_t) _Py_RefTotal;
-PyAPI_FUNC(void) _Py_NegativeRefcount(const char *fname,
-                                            int lineno, PyObject *op);
-PyAPI_FUNC(PyObject *) _PyDict_Dummy(void);
-PyAPI_FUNC(PyObject *) _PySet_Dummy(void);
-PyAPI_FUNC(Py_ssize_t) _Py_GetRefTotal(void);
-#define _Py_INC_REFTOTAL        _Py_RefTotal++
-#define _Py_DEC_REFTOTAL        _Py_RefTotal--
-#define _Py_REF_DEBUG_COMMA     ,
-#define _Py_CHECK_REFCNT(OP)                                    \
-{       if (((PyObject*)OP)->ob_refcnt < 0)                             \
-                _Py_NegativeRefcount(__FILE__, __LINE__,        \
-                                     (PyObject *)(OP));         \
-}
-#else
-#define _Py_INC_REFTOTAL
-#define _Py_DEC_REFTOTAL
-#define _Py_REF_DEBUG_COMMA
-#define _Py_CHECK_REFCNT(OP)    /* a semicolon */;
-#endif /* Py_REF_DEBUG */
-
-#ifdef COUNT_ALLOCS
-PyAPI_FUNC(void) inc_count(PyTypeObject *);
-PyAPI_FUNC(void) dec_count(PyTypeObject *);
-#define _Py_INC_TPALLOCS(OP)    inc_count(Py_TYPE(OP))
-#define _Py_INC_TPFREES(OP)     dec_count(Py_TYPE(OP))
-#define _Py_DEC_TPFREES(OP)     Py_TYPE(OP)->tp_frees--
-#define _Py_COUNT_ALLOCS_COMMA  ,
-#else
-#define _Py_INC_TPALLOCS(OP)
-#define _Py_INC_TPFREES(OP)
-#define _Py_DEC_TPFREES(OP)
-#define _Py_COUNT_ALLOCS_COMMA
-#endif /* COUNT_ALLOCS */
-
-#ifdef Py_TRACE_REFS
-/* Py_TRACE_REFS is such major surgery that we call external routines. */
-PyAPI_FUNC(void) _Py_NewReference(PyObject *);
-PyAPI_FUNC(void) _Py_ForgetReference(PyObject *);
-PyAPI_FUNC(void) _Py_Dealloc(PyObject *);
-PyAPI_FUNC(void) _Py_PrintReferences(FILE *);
-PyAPI_FUNC(void) _Py_PrintReferenceAddresses(FILE *);
-PyAPI_FUNC(void) _Py_AddToAllObjects(PyObject *, int force);
-
-#else
-/* Without Py_TRACE_REFS, there's little enough to do that we expand code
- * inline.
- */
-#define _Py_NewReference(op) (                          \
-    _Py_INC_TPALLOCS(op) _Py_COUNT_ALLOCS_COMMA         \
-    _Py_INC_REFTOTAL  _Py_REF_DEBUG_COMMA               \
-    Py_REFCNT(op) = 1)
-
-#define _Py_ForgetReference(op) _Py_INC_TPFREES(op)
-
-#define _Py_Dealloc(op) (                               \
-    _Py_INC_TPFREES(op) _Py_COUNT_ALLOCS_COMMA          \
-    (*Py_TYPE(op)->tp_dealloc)((PyObject *)(op)))
-#endif /* !Py_TRACE_REFS */
-
-#define Py_INCREF(op) (                         \
-    _Py_INC_REFTOTAL  _Py_REF_DEBUG_COMMA       \
-    ((PyObject*)(op))->ob_refcnt++)
-
-#define Py_DECREF(op)                                   \
-    do {                                                \
-        if (_Py_DEC_REFTOTAL  _Py_REF_DEBUG_COMMA       \
-        --((PyObject*)(op))->ob_refcnt != 0)            \
-            _Py_CHECK_REFCNT(op)                        \
-        else                                            \
-        _Py_Dealloc((PyObject *)(op));                  \
-    } while (0)
-
-/* Safely decref `op` and set `op` to NULL, especially useful in tp_clear
+#define PyObject_REPR(obj) PyString_AS_STRING(PyObject_Repr(obj)) 
+ 
+/* Flag bits for printing: */ 
+#define Py_PRINT_RAW    1       /* No string quotes etc. */ 
+ 
+/* 
+`Type flags (tp_flags) 
+ 
+These flags are used to extend the type structure in a backwards-compatible 
+fashion. Extensions can use the flags to indicate (and test) when a given 
+type structure contains a new feature. The Python core will use these when 
+introducing new functionality between major revisions (to avoid mid-version 
+changes in the PYTHON_API_VERSION). 
+ 
+Arbitration of the flag bit positions will need to be coordinated among 
+all extension writers who publically release their extensions (this will 
+be fewer than you might expect!).. 
+ 
+Python 1.5.2 introduced the bf_getcharbuffer slot into PyBufferProcs. 
+ 
+Type definitions should use Py_TPFLAGS_DEFAULT for their tp_flags value. 
+ 
+Code can use PyType_HasFeature(type_ob, flag_value) to test whether the 
+given type object has a specified feature. 
+ 
+NOTE: when building the core, Py_TPFLAGS_DEFAULT includes 
+Py_TPFLAGS_HAVE_VERSION_TAG; outside the core, it doesn't.  This is so 
+that extensions that modify tp_dict of their own types directly don't 
+break, since this was allowed in 2.5.  In 3.0 they will have to 
+manually remove this flag though! 
+*/ 
+ 
+/* PyBufferProcs contains bf_getcharbuffer */ 
+#define Py_TPFLAGS_HAVE_GETCHARBUFFER  (1L<<0) 
+ 
+/* PySequenceMethods contains sq_contains */ 
+#define Py_TPFLAGS_HAVE_SEQUENCE_IN (1L<<1) 
+ 
+/* This is here for backwards compatibility.  Extensions that use the old GC 
+ * API will still compile but the objects will not be tracked by the GC. */ 
+#define Py_TPFLAGS_GC 0 /* used to be (1L<<2) */ 
+ 
+/* PySequenceMethods and PyNumberMethods contain in-place operators */ 
+#define Py_TPFLAGS_HAVE_INPLACEOPS (1L<<3) 
+ 
+/* PyNumberMethods do their own coercion */ 
+#define Py_TPFLAGS_CHECKTYPES (1L<<4) 
+ 
+/* tp_richcompare is defined */ 
+#define Py_TPFLAGS_HAVE_RICHCOMPARE (1L<<5) 
+ 
+/* Objects which are weakly referencable if their tp_weaklistoffset is >0 */ 
+#define Py_TPFLAGS_HAVE_WEAKREFS (1L<<6) 
+ 
+/* tp_iter is defined */ 
+#define Py_TPFLAGS_HAVE_ITER (1L<<7) 
+ 
+/* New members introduced by Python 2.2 exist */ 
+#define Py_TPFLAGS_HAVE_CLASS (1L<<8) 
+ 
+/* Set if the type object is dynamically allocated */ 
+#define Py_TPFLAGS_HEAPTYPE (1L<<9) 
+ 
+/* Set if the type allows subclassing */ 
+#define Py_TPFLAGS_BASETYPE (1L<<10) 
+ 
+/* Set if the type is 'ready' -- fully initialized */ 
+#define Py_TPFLAGS_READY (1L<<12) 
+ 
+/* Set while the type is being 'readied', to prevent recursive ready calls */ 
+#define Py_TPFLAGS_READYING (1L<<13) 
+ 
+/* Objects support garbage collection (see objimp.h) */ 
+#define Py_TPFLAGS_HAVE_GC (1L<<14) 
+ 
+/* These two bits are preserved for Stackless Python, next after this is 17 */ 
+#ifdef STACKLESS 
+#define Py_TPFLAGS_HAVE_STACKLESS_EXTENSION (3L<<15) 
+#else 
+#define Py_TPFLAGS_HAVE_STACKLESS_EXTENSION 0 
+#endif 
+ 
+/* Objects support nb_index in PyNumberMethods */ 
+#define Py_TPFLAGS_HAVE_INDEX (1L<<17) 
+ 
+/* Objects support type attribute cache */ 
+#define Py_TPFLAGS_HAVE_VERSION_TAG   (1L<<18) 
+#define Py_TPFLAGS_VALID_VERSION_TAG  (1L<<19) 
+ 
+/* Type is abstract and cannot be instantiated */ 
+#define Py_TPFLAGS_IS_ABSTRACT (1L<<20) 
+ 
+/* Has the new buffer protocol */ 
+#define Py_TPFLAGS_HAVE_NEWBUFFER (1L<<21) 
+ 
+/* These flags are used to determine if a type is a subclass. */ 
+#define Py_TPFLAGS_INT_SUBCLASS         (1L<<23) 
+#define Py_TPFLAGS_LONG_SUBCLASS        (1L<<24) 
+#define Py_TPFLAGS_LIST_SUBCLASS        (1L<<25) 
+#define Py_TPFLAGS_TUPLE_SUBCLASS       (1L<<26) 
+#define Py_TPFLAGS_STRING_SUBCLASS      (1L<<27) 
+#define Py_TPFLAGS_UNICODE_SUBCLASS     (1L<<28) 
+#define Py_TPFLAGS_DICT_SUBCLASS        (1L<<29) 
+#define Py_TPFLAGS_BASE_EXC_SUBCLASS    (1L<<30) 
+#define Py_TPFLAGS_TYPE_SUBCLASS        (1L<<31) 
+ 
+#define Py_TPFLAGS_DEFAULT_EXTERNAL ( \ 
+                 Py_TPFLAGS_HAVE_GETCHARBUFFER | \ 
+                 Py_TPFLAGS_HAVE_SEQUENCE_IN | \ 
+                 Py_TPFLAGS_HAVE_INPLACEOPS | \ 
+                 Py_TPFLAGS_HAVE_RICHCOMPARE | \ 
+                 Py_TPFLAGS_HAVE_WEAKREFS | \ 
+                 Py_TPFLAGS_HAVE_ITER | \ 
+                 Py_TPFLAGS_HAVE_CLASS | \ 
+                 Py_TPFLAGS_HAVE_STACKLESS_EXTENSION | \ 
+                 Py_TPFLAGS_HAVE_INDEX | \ 
+                 0) 
+#define Py_TPFLAGS_DEFAULT_CORE (Py_TPFLAGS_DEFAULT_EXTERNAL | \ 
+                 Py_TPFLAGS_HAVE_VERSION_TAG) 
+ 
+#ifdef Py_BUILD_CORE 
+#define Py_TPFLAGS_DEFAULT Py_TPFLAGS_DEFAULT_CORE 
+#else 
+#define Py_TPFLAGS_DEFAULT Py_TPFLAGS_DEFAULT_EXTERNAL 
+#endif 
+ 
+#define PyType_HasFeature(t,f)  (((t)->tp_flags & (f)) != 0) 
+#define PyType_FastSubclass(t,f)  PyType_HasFeature(t,f) 
+ 
+ 
+/* 
+The macros Py_INCREF(op) and Py_DECREF(op) are used to increment or decrement 
+reference counts.  Py_DECREF calls the object's deallocator function when 
+the refcount falls to 0; for 
+objects that don't contain references to other objects or heap memory 
+this can be the standard function free().  Both macros can be used 
+wherever a void expression is allowed.  The argument must not be a 
+NULL pointer.  If it may be NULL, use Py_XINCREF/Py_XDECREF instead. 
+The macro _Py_NewReference(op) initialize reference counts to 1, and 
+in special builds (Py_REF_DEBUG, Py_TRACE_REFS) performs additional 
+bookkeeping appropriate to the special build. 
+ 
+We assume that the reference count field can never overflow; this can 
+be proven when the size of the field is the same as the pointer size, so 
+we ignore the possibility.  Provided a C int is at least 32 bits (which 
+is implicitly assumed in many parts of this code), that's enough for 
+about 2**31 references to an object. 
+ 
+XXX The following became out of date in Python 2.2, but I'm not sure 
+XXX what the full truth is now.  Certainly, heap-allocated type objects 
+XXX can and should be deallocated. 
+Type objects should never be deallocated; the type pointer in an object 
+is not considered to be a reference to the type object, to save 
+complications in the deallocation function.  (This is actually a 
+decision that's up to the implementer of each new type so if you want, 
+you can count such references to the type object.) 
+ 
+*** WARNING*** The Py_DECREF macro must have a side-effect-free argument 
+since it may evaluate its argument multiple times.  (The alternative 
+would be to mace it a proper function or assign it to a global temporary 
+variable first, both of which are slower; and in a multi-threaded 
+environment the global variable trick is not safe.) 
+*/ 
+ 
+/* First define a pile of simple helper macros, one set per special 
+ * build symbol.  These either expand to the obvious things, or to 
+ * nothing at all when the special mode isn't in effect.  The main 
+ * macros can later be defined just once then, yet expand to different 
+ * things depending on which special build options are and aren't in effect. 
+ * Trust me <wink>:  while painful, this is 20x easier to understand than, 
+ * e.g, defining _Py_NewReference five different times in a maze of nested 
+ * #ifdefs (we used to do that -- it was impenetrable). 
+ */ 
+#ifdef Py_REF_DEBUG 
+PyAPI_DATA(Py_ssize_t) _Py_RefTotal; 
+PyAPI_FUNC(void) _Py_NegativeRefcount(const char *fname, 
+                                            int lineno, PyObject *op); 
+PyAPI_FUNC(PyObject *) _PyDict_Dummy(void); 
+PyAPI_FUNC(PyObject *) _PySet_Dummy(void); 
+PyAPI_FUNC(Py_ssize_t) _Py_GetRefTotal(void); 
+#define _Py_INC_REFTOTAL        _Py_RefTotal++ 
+#define _Py_DEC_REFTOTAL        _Py_RefTotal-- 
+#define _Py_REF_DEBUG_COMMA     , 
+#define _Py_CHECK_REFCNT(OP)                                    \ 
+{       if (((PyObject*)OP)->ob_refcnt < 0)                             \ 
+                _Py_NegativeRefcount(__FILE__, __LINE__,        \ 
+                                     (PyObject *)(OP));         \ 
+} 
+#else 
+#define _Py_INC_REFTOTAL 
+#define _Py_DEC_REFTOTAL 
+#define _Py_REF_DEBUG_COMMA 
+#define _Py_CHECK_REFCNT(OP)    /* a semicolon */; 
+#endif /* Py_REF_DEBUG */ 
+ 
+#ifdef COUNT_ALLOCS 
+PyAPI_FUNC(void) inc_count(PyTypeObject *); 
+PyAPI_FUNC(void) dec_count(PyTypeObject *); 
+#define _Py_INC_TPALLOCS(OP)    inc_count(Py_TYPE(OP)) 
+#define _Py_INC_TPFREES(OP)     dec_count(Py_TYPE(OP)) 
+#define _Py_DEC_TPFREES(OP)     Py_TYPE(OP)->tp_frees-- 
+#define _Py_COUNT_ALLOCS_COMMA  , 
+#else 
+#define _Py_INC_TPALLOCS(OP) 
+#define _Py_INC_TPFREES(OP) 
+#define _Py_DEC_TPFREES(OP) 
+#define _Py_COUNT_ALLOCS_COMMA 
+#endif /* COUNT_ALLOCS */ 
+ 
+#ifdef Py_TRACE_REFS 
+/* Py_TRACE_REFS is such major surgery that we call external routines. */ 
+PyAPI_FUNC(void) _Py_NewReference(PyObject *); 
+PyAPI_FUNC(void) _Py_ForgetReference(PyObject *); 
+PyAPI_FUNC(void) _Py_Dealloc(PyObject *); 
+PyAPI_FUNC(void) _Py_PrintReferences(FILE *); 
+PyAPI_FUNC(void) _Py_PrintReferenceAddresses(FILE *); 
+PyAPI_FUNC(void) _Py_AddToAllObjects(PyObject *, int force); 
+ 
+#else 
+/* Without Py_TRACE_REFS, there's little enough to do that we expand code 
+ * inline. 
+ */ 
+#define _Py_NewReference(op) (                          \ 
+    _Py_INC_TPALLOCS(op) _Py_COUNT_ALLOCS_COMMA         \ 
+    _Py_INC_REFTOTAL  _Py_REF_DEBUG_COMMA               \ 
+    Py_REFCNT(op) = 1) 
+ 
+#define _Py_ForgetReference(op) _Py_INC_TPFREES(op) 
+ 
+#define _Py_Dealloc(op) (                               \ 
+    _Py_INC_TPFREES(op) _Py_COUNT_ALLOCS_COMMA          \ 
+    (*Py_TYPE(op)->tp_dealloc)((PyObject *)(op))) 
+#endif /* !Py_TRACE_REFS */ 
+ 
+#define Py_INCREF(op) (                         \ 
+    _Py_INC_REFTOTAL  _Py_REF_DEBUG_COMMA       \ 
+    ((PyObject*)(op))->ob_refcnt++) 
+ 
+#define Py_DECREF(op)                                   \ 
+    do {                                                \ 
+        if (_Py_DEC_REFTOTAL  _Py_REF_DEBUG_COMMA       \ 
+        --((PyObject*)(op))->ob_refcnt != 0)            \ 
+            _Py_CHECK_REFCNT(op)                        \ 
+        else                                            \ 
+        _Py_Dealloc((PyObject *)(op));                  \ 
+    } while (0) 
+ 
+/* Safely decref `op` and set `op` to NULL, especially useful in tp_clear 
  * and tp_dealloc implementations.
- *
- * Note that "the obvious" code can be deadly:
- *
- *     Py_XDECREF(op);
- *     op = NULL;
- *
- * Typically, `op` is something like self->containee, and `self` is done
- * using its `containee` member.  In the code sequence above, suppose
- * `containee` is non-NULL with a refcount of 1.  Its refcount falls to
- * 0 on the first line, which can trigger an arbitrary amount of code,
- * possibly including finalizers (like __del__ methods or weakref callbacks)
- * coded in Python, which in turn can release the GIL and allow other threads
- * to run, etc.  Such code may even invoke methods of `self` again, or cause
- * cyclic gc to trigger, but-- oops! --self->containee still points to the
- * object being torn down, and it may be in an insane state while being torn
- * down.  This has in fact been a rich historic source of miserable (rare &
- * hard-to-diagnose) segfaulting (and other) bugs.
- *
- * The safe way is:
- *
- *      Py_CLEAR(op);
- *
- * That arranges to set `op` to NULL _before_ decref'ing, so that any code
- * triggered as a side-effect of `op` getting torn down no longer believes
- * `op` points to a valid object.
- *
- * There are cases where it's safe to use the naive code, but they're brittle.
- * For example, if `op` points to a Python integer, you know that destroying
- * one of those can't cause problems -- but in part that relies on that
- * Python integers aren't currently weakly referencable.  Best practice is
- * to use Py_CLEAR() even if you can't think of a reason for why you need to.
- */
-#define Py_CLEAR(op)                            \
-    do {                                        \
-        if (op) {                               \
-            PyObject *_py_tmp = (PyObject *)(op);               \
-            (op) = NULL;                        \
-            Py_DECREF(_py_tmp);                 \
-        }                                       \
-    } while (0)
-
-/* Macros to use in case the object pointer may be NULL: */
-#define Py_XINCREF(op) do { if ((op) == NULL) ; else Py_INCREF(op); } while (0)
-#define Py_XDECREF(op) do { if ((op) == NULL) ; else Py_DECREF(op); } while (0)
-
+ * 
+ * Note that "the obvious" code can be deadly: 
+ * 
+ *     Py_XDECREF(op); 
+ *     op = NULL; 
+ * 
+ * Typically, `op` is something like self->containee, and `self` is done 
+ * using its `containee` member.  In the code sequence above, suppose 
+ * `containee` is non-NULL with a refcount of 1.  Its refcount falls to 
+ * 0 on the first line, which can trigger an arbitrary amount of code, 
+ * possibly including finalizers (like __del__ methods or weakref callbacks) 
+ * coded in Python, which in turn can release the GIL and allow other threads 
+ * to run, etc.  Such code may even invoke methods of `self` again, or cause 
+ * cyclic gc to trigger, but-- oops! --self->containee still points to the 
+ * object being torn down, and it may be in an insane state while being torn 
+ * down.  This has in fact been a rich historic source of miserable (rare & 
+ * hard-to-diagnose) segfaulting (and other) bugs. 
+ * 
+ * The safe way is: 
+ * 
+ *      Py_CLEAR(op); 
+ * 
+ * That arranges to set `op` to NULL _before_ decref'ing, so that any code 
+ * triggered as a side-effect of `op` getting torn down no longer believes 
+ * `op` points to a valid object. 
+ * 
+ * There are cases where it's safe to use the naive code, but they're brittle. 
+ * For example, if `op` points to a Python integer, you know that destroying 
+ * one of those can't cause problems -- but in part that relies on that 
+ * Python integers aren't currently weakly referencable.  Best practice is 
+ * to use Py_CLEAR() even if you can't think of a reason for why you need to. 
+ */ 
+#define Py_CLEAR(op)                            \ 
+    do {                                        \ 
+        if (op) {                               \ 
+            PyObject *_py_tmp = (PyObject *)(op);               \ 
+            (op) = NULL;                        \ 
+            Py_DECREF(_py_tmp);                 \ 
+        }                                       \ 
+    } while (0) 
+ 
+/* Macros to use in case the object pointer may be NULL: */ 
+#define Py_XINCREF(op) do { if ((op) == NULL) ; else Py_INCREF(op); } while (0) 
+#define Py_XDECREF(op) do { if ((op) == NULL) ; else Py_DECREF(op); } while (0) 
+ 
 /* Safely decref `op` and set `op` to `op2`.
  *
  * As in case of Py_CLEAR "the obvious" code can be deadly:
@@ -857,170 +857,170 @@ PyAPI_FUNC(void) _Py_AddToAllObjects(PyObject *, int force);
         Py_XDECREF(_py_tmp);                    \
     } while (0)
 
-/*
-These are provided as conveniences to Python runtime embedders, so that
-they can have object code that is not dependent on Python compilation flags.
-*/
-PyAPI_FUNC(void) Py_IncRef(PyObject *);
-PyAPI_FUNC(void) Py_DecRef(PyObject *);
-
-/*
-_Py_NoneStruct is an object of undefined type which can be used in contexts
-where NULL (nil) is not suitable (since NULL often means 'error').
-
-Don't forget to apply Py_INCREF() when returning this value!!!
-*/
-PyAPI_DATA(PyObject) _Py_NoneStruct; /* Don't use this directly */
-#define Py_None (&_Py_NoneStruct)
-
-/* Macro for returning Py_None from a function */
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-
-/*
-Py_NotImplemented is a singleton used to signal that an operation is
-not implemented for a given type combination.
-*/
-PyAPI_DATA(PyObject) _Py_NotImplementedStruct; /* Don't use this directly */
-#define Py_NotImplemented (&_Py_NotImplementedStruct)
-
-/* Rich comparison opcodes */
-#define Py_LT 0
-#define Py_LE 1
-#define Py_EQ 2
-#define Py_NE 3
-#define Py_GT 4
-#define Py_GE 5
-
-/* Maps Py_LT to Py_GT, ..., Py_GE to Py_LE.
- * Defined in object.c.
- */
-PyAPI_DATA(int) _Py_SwappedOp[];
-
-/*
-Define staticforward and statichere for source compatibility with old
-C extensions.
-
-The staticforward define was needed to support certain broken C
-compilers (notably SCO ODT 3.0, perhaps early AIX as well) botched the
-static keyword when it was used with a forward declaration of a static
-initialized structure.  Standard C allows the forward declaration with
-static, and we've decided to stop catering to broken C compilers.
-(In fact, we expect that the compilers are all fixed eight years later.)
-*/
-
-#define staticforward static
-#define statichere static
-
-
-/*
-More conventions
-================
-
-Argument Checking
------------------
-
-Functions that take objects as arguments normally don't check for nil
-arguments, but they do check the type of the argument, and return an
-error if the function doesn't apply to the type.
-
-Failure Modes
--------------
-
-Functions may fail for a variety of reasons, including running out of
-memory.  This is communicated to the caller in two ways: an error string
-is set (see errors.h), and the function result differs: functions that
-normally return a pointer return NULL for failure, functions returning
-an integer return -1 (which could be a legal return value too!), and
-other functions return 0 for success and -1 for failure.
-Callers should always check for errors before using the result.  If
-an error was set, the caller must either explicitly clear it, or pass
-the error on to its caller.
-
-Reference Counts
-----------------
-
-It takes a while to get used to the proper usage of reference counts.
-
-Functions that create an object set the reference count to 1; such new
-objects must be stored somewhere or destroyed again with Py_DECREF().
-Some functions that 'store' objects, such as PyTuple_SetItem() and
-PyList_SetItem(),
-don't increment the reference count of the object, since the most
-frequent use is to store a fresh object.  Functions that 'retrieve'
-objects, such as PyTuple_GetItem() and PyDict_GetItemString(), also
-don't increment
-the reference count, since most frequently the object is only looked at
-quickly.  Thus, to retrieve an object and store it again, the caller
-must call Py_INCREF() explicitly.
-
-NOTE: functions that 'consume' a reference count, like
-PyList_SetItem(), consume the reference even if the object wasn't
-successfully stored, to simplify error handling.
-
-It seems attractive to make other functions that take an object as
-argument consume a reference count; however, this may quickly get
-confusing (even the current practice is already confusing).  Consider
-it carefully, it may save lots of calls to Py_INCREF() and Py_DECREF() at
-times.
-*/
-
-
-/* Trashcan mechanism, thanks to Christian Tismer.
-
-When deallocating a container object, it's possible to trigger an unbounded
-chain of deallocations, as each Py_DECREF in turn drops the refcount on "the
-next" object in the chain to 0.  This can easily lead to stack faults, and
-especially in threads (which typically have less stack space to work with).
-
-A container object that participates in cyclic gc can avoid this by
-bracketing the body of its tp_dealloc function with a pair of macros:
-
-static void
-mytype_dealloc(mytype *p)
-{
-    ... declarations go here ...
-
-    PyObject_GC_UnTrack(p);        // must untrack first
-    Py_TRASHCAN_SAFE_BEGIN(p)
-    ... The body of the deallocator goes here, including all calls ...
-    ... to Py_DECREF on contained objects.                         ...
-    Py_TRASHCAN_SAFE_END(p)
-}
-
-CAUTION:  Never return from the middle of the body!  If the body needs to
-"get out early", put a label immediately before the Py_TRASHCAN_SAFE_END
-call, and goto it.  Else the call-depth counter (see below) will stay
-above 0 forever, and the trashcan will never get emptied.
-
-How it works:  The BEGIN macro increments a call-depth counter.  So long
-as this counter is small, the body of the deallocator is run directly without
-further ado.  But if the counter gets large, it instead adds p to a list of
-objects to be deallocated later, skips the body of the deallocator, and
-resumes execution after the END macro.  The tp_dealloc routine then returns
-without deallocating anything (and so unbounded call-stack depth is avoided).
-
-When the call stack finishes unwinding again, code generated by the END macro
-notices this, and calls another routine to deallocate all the objects that
-may have been added to the list of deferred deallocations.  In effect, a
-chain of N deallocations is broken into N / PyTrash_UNWIND_LEVEL pieces,
-with the call stack never exceeding a depth of PyTrash_UNWIND_LEVEL.
-*/
-
+/* 
+These are provided as conveniences to Python runtime embedders, so that 
+they can have object code that is not dependent on Python compilation flags. 
+*/ 
+PyAPI_FUNC(void) Py_IncRef(PyObject *); 
+PyAPI_FUNC(void) Py_DecRef(PyObject *); 
+ 
+/* 
+_Py_NoneStruct is an object of undefined type which can be used in contexts 
+where NULL (nil) is not suitable (since NULL often means 'error'). 
+ 
+Don't forget to apply Py_INCREF() when returning this value!!! 
+*/ 
+PyAPI_DATA(PyObject) _Py_NoneStruct; /* Don't use this directly */ 
+#define Py_None (&_Py_NoneStruct) 
+ 
+/* Macro for returning Py_None from a function */ 
+#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None 
+ 
+/* 
+Py_NotImplemented is a singleton used to signal that an operation is 
+not implemented for a given type combination. 
+*/ 
+PyAPI_DATA(PyObject) _Py_NotImplementedStruct; /* Don't use this directly */ 
+#define Py_NotImplemented (&_Py_NotImplementedStruct) 
+ 
+/* Rich comparison opcodes */ 
+#define Py_LT 0 
+#define Py_LE 1 
+#define Py_EQ 2 
+#define Py_NE 3 
+#define Py_GT 4 
+#define Py_GE 5 
+ 
+/* Maps Py_LT to Py_GT, ..., Py_GE to Py_LE. 
+ * Defined in object.c. 
+ */ 
+PyAPI_DATA(int) _Py_SwappedOp[]; 
+ 
+/* 
+Define staticforward and statichere for source compatibility with old 
+C extensions. 
+ 
+The staticforward define was needed to support certain broken C 
+compilers (notably SCO ODT 3.0, perhaps early AIX as well) botched the 
+static keyword when it was used with a forward declaration of a static 
+initialized structure.  Standard C allows the forward declaration with 
+static, and we've decided to stop catering to broken C compilers. 
+(In fact, we expect that the compilers are all fixed eight years later.) 
+*/ 
+ 
+#define staticforward static 
+#define statichere static 
+ 
+ 
+/* 
+More conventions 
+================ 
+ 
+Argument Checking 
+----------------- 
+ 
+Functions that take objects as arguments normally don't check for nil 
+arguments, but they do check the type of the argument, and return an 
+error if the function doesn't apply to the type. 
+ 
+Failure Modes 
+------------- 
+ 
+Functions may fail for a variety of reasons, including running out of 
+memory.  This is communicated to the caller in two ways: an error string 
+is set (see errors.h), and the function result differs: functions that 
+normally return a pointer return NULL for failure, functions returning 
+an integer return -1 (which could be a legal return value too!), and 
+other functions return 0 for success and -1 for failure. 
+Callers should always check for errors before using the result.  If 
+an error was set, the caller must either explicitly clear it, or pass 
+the error on to its caller. 
+ 
+Reference Counts 
+---------------- 
+ 
+It takes a while to get used to the proper usage of reference counts. 
+ 
+Functions that create an object set the reference count to 1; such new 
+objects must be stored somewhere or destroyed again with Py_DECREF(). 
+Some functions that 'store' objects, such as PyTuple_SetItem() and 
+PyList_SetItem(), 
+don't increment the reference count of the object, since the most 
+frequent use is to store a fresh object.  Functions that 'retrieve' 
+objects, such as PyTuple_GetItem() and PyDict_GetItemString(), also 
+don't increment 
+the reference count, since most frequently the object is only looked at 
+quickly.  Thus, to retrieve an object and store it again, the caller 
+must call Py_INCREF() explicitly. 
+ 
+NOTE: functions that 'consume' a reference count, like 
+PyList_SetItem(), consume the reference even if the object wasn't 
+successfully stored, to simplify error handling. 
+ 
+It seems attractive to make other functions that take an object as 
+argument consume a reference count; however, this may quickly get 
+confusing (even the current practice is already confusing).  Consider 
+it carefully, it may save lots of calls to Py_INCREF() and Py_DECREF() at 
+times. 
+*/ 
+ 
+ 
+/* Trashcan mechanism, thanks to Christian Tismer. 
+ 
+When deallocating a container object, it's possible to trigger an unbounded 
+chain of deallocations, as each Py_DECREF in turn drops the refcount on "the 
+next" object in the chain to 0.  This can easily lead to stack faults, and 
+especially in threads (which typically have less stack space to work with). 
+ 
+A container object that participates in cyclic gc can avoid this by 
+bracketing the body of its tp_dealloc function with a pair of macros: 
+ 
+static void 
+mytype_dealloc(mytype *p) 
+{ 
+    ... declarations go here ... 
+ 
+    PyObject_GC_UnTrack(p);        // must untrack first 
+    Py_TRASHCAN_SAFE_BEGIN(p) 
+    ... The body of the deallocator goes here, including all calls ... 
+    ... to Py_DECREF on contained objects.                         ... 
+    Py_TRASHCAN_SAFE_END(p) 
+} 
+ 
+CAUTION:  Never return from the middle of the body!  If the body needs to 
+"get out early", put a label immediately before the Py_TRASHCAN_SAFE_END 
+call, and goto it.  Else the call-depth counter (see below) will stay 
+above 0 forever, and the trashcan will never get emptied. 
+ 
+How it works:  The BEGIN macro increments a call-depth counter.  So long 
+as this counter is small, the body of the deallocator is run directly without 
+further ado.  But if the counter gets large, it instead adds p to a list of 
+objects to be deallocated later, skips the body of the deallocator, and 
+resumes execution after the END macro.  The tp_dealloc routine then returns 
+without deallocating anything (and so unbounded call-stack depth is avoided). 
+ 
+When the call stack finishes unwinding again, code generated by the END macro 
+notices this, and calls another routine to deallocate all the objects that 
+may have been added to the list of deferred deallocations.  In effect, a 
+chain of N deallocations is broken into N / PyTrash_UNWIND_LEVEL pieces, 
+with the call stack never exceeding a depth of PyTrash_UNWIND_LEVEL. 
+*/ 
+ 
 /* This is the old private API, invoked by the macros before 2.7.4.
    Kept for binary compatibility of extensions. */
-PyAPI_FUNC(void) _PyTrash_deposit_object(PyObject*);
-PyAPI_FUNC(void) _PyTrash_destroy_chain(void);
-PyAPI_DATA(int) _PyTrash_delete_nesting;
-PyAPI_DATA(PyObject *) _PyTrash_delete_later;
-
+PyAPI_FUNC(void) _PyTrash_deposit_object(PyObject*); 
+PyAPI_FUNC(void) _PyTrash_destroy_chain(void); 
+PyAPI_DATA(int) _PyTrash_delete_nesting; 
+PyAPI_DATA(PyObject *) _PyTrash_delete_later; 
+ 
 /* The new thread-safe private API, invoked by the macros below. */
 PyAPI_FUNC(void) _PyTrash_thread_deposit_object(PyObject*);
 PyAPI_FUNC(void) _PyTrash_thread_destroy_chain(void);
 
-#define PyTrash_UNWIND_LEVEL 50
-
+#define PyTrash_UNWIND_LEVEL 50 
+ 
 /* Note the workaround for when the thread state is NULL (issue #17703) */
-#define Py_TRASHCAN_SAFE_BEGIN(op) \
+#define Py_TRASHCAN_SAFE_BEGIN(op) \ 
     do { \
         PyThreadState *_tstate = PyThreadState_GET(); \
         if (!_tstate || \
@@ -1028,7 +1028,7 @@ PyAPI_FUNC(void) _PyTrash_thread_destroy_chain(void);
             if (_tstate) \
                 ++_tstate->trash_delete_nesting;
             /* The body of the deallocator is here. */
-#define Py_TRASHCAN_SAFE_END(op) \
+#define Py_TRASHCAN_SAFE_END(op) \ 
             if (_tstate) { \
                 --_tstate->trash_delete_nesting; \
                 if (_tstate->trash_delete_later \
@@ -1039,8 +1039,8 @@ PyAPI_FUNC(void) _PyTrash_thread_destroy_chain(void);
         else \
             _PyTrash_thread_deposit_object((PyObject*)op); \
     } while (0);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_OBJECT_H */
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_OBJECT_H */ 
diff --git a/contrib/tools/python/src/Include/objimpl.h b/contrib/tools/python/src/Include/objimpl.h
index c02c47ed10..4a8fac77a8 100644
--- a/contrib/tools/python/src/Include/objimpl.h
+++ b/contrib/tools/python/src/Include/objimpl.h
@@ -1,241 +1,241 @@
-/* The PyObject_ memory family:  high-level object memory interfaces.
-   See pymem.h for the low-level PyMem_ family.
-*/
-
-#ifndef Py_OBJIMPL_H
-#define Py_OBJIMPL_H
-
-#include "pymem.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* BEWARE:
-
-   Each interface exports both functions and macros.  Extension modules should
-   use the functions, to ensure binary compatibility across Python versions.
-   Because the Python implementation is free to change internal details, and
-   the macros may (or may not) expose details for speed, if you do use the
-   macros you must recompile your extensions with each Python release.
-
-   Never mix calls to PyObject_ memory functions with calls to the platform
-   malloc/realloc/ calloc/free, or with calls to PyMem_.
-*/
-
-/*
-Functions and macros for modules that implement new object types.
-
- - PyObject_New(type, typeobj) allocates memory for a new object of the given
-   type, and initializes part of it.  'type' must be the C structure type used
-   to represent the object, and 'typeobj' the address of the corresponding
-   type object.  Reference count and type pointer are filled in; the rest of
-   the bytes of the object are *undefined*!  The resulting expression type is
-   'type *'.  The size of the object is determined by the tp_basicsize field
-   of the type object.
-
- - PyObject_NewVar(type, typeobj, n) is similar but allocates a variable-size
-   object with room for n items.  In addition to the refcount and type pointer
-   fields, this also fills in the ob_size field.
-
- - PyObject_Del(op) releases the memory allocated for an object.  It does not
-   run a destructor -- it only frees the memory.  PyObject_Free is identical.
-
- - PyObject_Init(op, typeobj) and PyObject_InitVar(op, typeobj, n) don't
-   allocate memory.  Instead of a 'type' parameter, they take a pointer to a
-   new object (allocated by an arbitrary allocator), and initialize its object
-   header fields.
-
-Note that objects created with PyObject_{New, NewVar} are allocated using the
-specialized Python allocator (implemented in obmalloc.c), if WITH_PYMALLOC is
-enabled.  In addition, a special debugging allocator is used if PYMALLOC_DEBUG
-is also #defined.
-
-In case a specific form of memory management is needed (for example, if you
-must use the platform malloc heap(s), or shared memory, or C++ local storage or
-operator new), you must first allocate the object with your custom allocator,
-then pass its pointer to PyObject_{Init, InitVar} for filling in its Python-
-specific fields:  reference count, type pointer, possibly others.  You should
+/* The PyObject_ memory family:  high-level object memory interfaces. 
+   See pymem.h for the low-level PyMem_ family. 
+*/ 
+ 
+#ifndef Py_OBJIMPL_H 
+#define Py_OBJIMPL_H 
+ 
+#include "pymem.h" 
+ 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+/* BEWARE: 
+ 
+   Each interface exports both functions and macros.  Extension modules should 
+   use the functions, to ensure binary compatibility across Python versions. 
+   Because the Python implementation is free to change internal details, and 
+   the macros may (or may not) expose details for speed, if you do use the 
+   macros you must recompile your extensions with each Python release. 
+ 
+   Never mix calls to PyObject_ memory functions with calls to the platform 
+   malloc/realloc/ calloc/free, or with calls to PyMem_. 
+*/ 
+ 
+/* 
+Functions and macros for modules that implement new object types. 
+ 
+ - PyObject_New(type, typeobj) allocates memory for a new object of the given 
+   type, and initializes part of it.  'type' must be the C structure type used 
+   to represent the object, and 'typeobj' the address of the corresponding 
+   type object.  Reference count and type pointer are filled in; the rest of 
+   the bytes of the object are *undefined*!  The resulting expression type is 
+   'type *'.  The size of the object is determined by the tp_basicsize field 
+   of the type object. 
+ 
+ - PyObject_NewVar(type, typeobj, n) is similar but allocates a variable-size 
+   object with room for n items.  In addition to the refcount and type pointer 
+   fields, this also fills in the ob_size field. 
+ 
+ - PyObject_Del(op) releases the memory allocated for an object.  It does not 
+   run a destructor -- it only frees the memory.  PyObject_Free is identical. 
+ 
+ - PyObject_Init(op, typeobj) and PyObject_InitVar(op, typeobj, n) don't 
+   allocate memory.  Instead of a 'type' parameter, they take a pointer to a 
+   new object (allocated by an arbitrary allocator), and initialize its object 
+   header fields. 
+ 
+Note that objects created with PyObject_{New, NewVar} are allocated using the 
+specialized Python allocator (implemented in obmalloc.c), if WITH_PYMALLOC is 
+enabled.  In addition, a special debugging allocator is used if PYMALLOC_DEBUG 
+is also #defined. 
+ 
+In case a specific form of memory management is needed (for example, if you 
+must use the platform malloc heap(s), or shared memory, or C++ local storage or 
+operator new), you must first allocate the object with your custom allocator, 
+then pass its pointer to PyObject_{Init, InitVar} for filling in its Python- 
+specific fields:  reference count, type pointer, possibly others.  You should 
 be aware that Python has no control over these objects because they don't
-cooperate with the Python memory manager.  Such objects may not be eligible
-for automatic garbage collection and you have to make sure that they are
-released accordingly whenever their destructor gets called (cf. the specific
-form of memory management you're using).
-
-Unless you have specific memory management requirements, use
-PyObject_{New, NewVar, Del}.
-*/
-
-/*
- * Raw object memory interface
- * ===========================
- */
-
-/* Functions to call the same malloc/realloc/free as used by Python's
-   object allocator.  If WITH_PYMALLOC is enabled, these may differ from
-   the platform malloc/realloc/free.  The Python object allocator is
-   designed for fast, cache-conscious allocation of many "small" objects,
-   and with low hidden memory overhead.
-
-   PyObject_Malloc(0) returns a unique non-NULL pointer if possible.
-
-   PyObject_Realloc(NULL, n) acts like PyObject_Malloc(n).
-   PyObject_Realloc(p != NULL, 0) does not return  NULL, or free the memory
-   at p.
-
-   Returned pointers must be checked for NULL explicitly; no action is
-   performed on failure other than to return NULL (no warning it printed, no
-   exception is set, etc).
-
-   For allocating objects, use PyObject_{New, NewVar} instead whenever
-   possible.  The PyObject_{Malloc, Realloc, Free} family is exposed
-   so that you can exploit Python's small-block allocator for non-object
-   uses.  If you must use these routines to allocate object memory, make sure
-   the object gets initialized via PyObject_{Init, InitVar} after obtaining
-   the raw memory.
-*/
-PyAPI_FUNC(void *) PyObject_Malloc(size_t);
-PyAPI_FUNC(void *) PyObject_Realloc(void *, size_t);
-PyAPI_FUNC(void) PyObject_Free(void *);
-
-
-/* Macros */
+cooperate with the Python memory manager.  Such objects may not be eligible 
+for automatic garbage collection and you have to make sure that they are 
+released accordingly whenever their destructor gets called (cf. the specific 
+form of memory management you're using). 
+ 
+Unless you have specific memory management requirements, use 
+PyObject_{New, NewVar, Del}. 
+*/ 
+ 
+/* 
+ * Raw object memory interface 
+ * =========================== 
+ */ 
+ 
+/* Functions to call the same malloc/realloc/free as used by Python's 
+   object allocator.  If WITH_PYMALLOC is enabled, these may differ from 
+   the platform malloc/realloc/free.  The Python object allocator is 
+   designed for fast, cache-conscious allocation of many "small" objects, 
+   and with low hidden memory overhead. 
+ 
+   PyObject_Malloc(0) returns a unique non-NULL pointer if possible. 
+ 
+   PyObject_Realloc(NULL, n) acts like PyObject_Malloc(n). 
+   PyObject_Realloc(p != NULL, 0) does not return  NULL, or free the memory 
+   at p. 
+ 
+   Returned pointers must be checked for NULL explicitly; no action is 
+   performed on failure other than to return NULL (no warning it printed, no 
+   exception is set, etc). 
+ 
+   For allocating objects, use PyObject_{New, NewVar} instead whenever 
+   possible.  The PyObject_{Malloc, Realloc, Free} family is exposed 
+   so that you can exploit Python's small-block allocator for non-object 
+   uses.  If you must use these routines to allocate object memory, make sure 
+   the object gets initialized via PyObject_{Init, InitVar} after obtaining 
+   the raw memory. 
+*/ 
+PyAPI_FUNC(void *) PyObject_Malloc(size_t); 
+PyAPI_FUNC(void *) PyObject_Realloc(void *, size_t); 
+PyAPI_FUNC(void) PyObject_Free(void *); 
+ 
+ 
+/* Macros */ 
 #if defined(WITH_PYMALLOC) && defined(PYMALLOC_DEBUG)
-PyAPI_FUNC(void *) _PyObject_DebugMalloc(size_t nbytes);
-PyAPI_FUNC(void *) _PyObject_DebugRealloc(void *p, size_t nbytes);
-PyAPI_FUNC(void) _PyObject_DebugFree(void *p);
-PyAPI_FUNC(void) _PyObject_DebugDumpAddress(const void *p);
-PyAPI_FUNC(void) _PyObject_DebugCheckAddress(const void *p);
-PyAPI_FUNC(void) _PyObject_DebugMallocStats(void);
-PyAPI_FUNC(void *) _PyObject_DebugMallocApi(char api, size_t nbytes);
-PyAPI_FUNC(void *) _PyObject_DebugReallocApi(char api, void *p, size_t nbytes);
-PyAPI_FUNC(void) _PyObject_DebugFreeApi(char api, void *p);
-PyAPI_FUNC(void) _PyObject_DebugCheckAddressApi(char api, const void *p);
-PyAPI_FUNC(void *) _PyMem_DebugMalloc(size_t nbytes);
-PyAPI_FUNC(void *) _PyMem_DebugRealloc(void *p, size_t nbytes);
-PyAPI_FUNC(void) _PyMem_DebugFree(void *p);
+PyAPI_FUNC(void *) _PyObject_DebugMalloc(size_t nbytes); 
+PyAPI_FUNC(void *) _PyObject_DebugRealloc(void *p, size_t nbytes); 
+PyAPI_FUNC(void) _PyObject_DebugFree(void *p); 
+PyAPI_FUNC(void) _PyObject_DebugDumpAddress(const void *p); 
+PyAPI_FUNC(void) _PyObject_DebugCheckAddress(const void *p); 
+PyAPI_FUNC(void) _PyObject_DebugMallocStats(void); 
+PyAPI_FUNC(void *) _PyObject_DebugMallocApi(char api, size_t nbytes); 
+PyAPI_FUNC(void *) _PyObject_DebugReallocApi(char api, void *p, size_t nbytes); 
+PyAPI_FUNC(void) _PyObject_DebugFreeApi(char api, void *p); 
+PyAPI_FUNC(void) _PyObject_DebugCheckAddressApi(char api, const void *p); 
+PyAPI_FUNC(void *) _PyMem_DebugMalloc(size_t nbytes); 
+PyAPI_FUNC(void *) _PyMem_DebugRealloc(void *p, size_t nbytes); 
+PyAPI_FUNC(void) _PyMem_DebugFree(void *p); 
 #endif
-
-#define PyObject_MALLOC         PyObject_Malloc
-#define PyObject_REALLOC        PyObject_Realloc
-#define PyObject_FREE           PyObject_Free
+ 
+#define PyObject_MALLOC         PyObject_Malloc 
+#define PyObject_REALLOC        PyObject_Realloc 
+#define PyObject_FREE           PyObject_Free 
 #define PyObject_Del            PyObject_Free
 #define PyObject_DEL            PyObject_Free
 
 #ifdef PYMALLOC_DEBUG   /* WITH_PYMALLOC && PYMALLOC_DEBUG */
 PyAPI_FUNC(void) _PyObject_DebugMallocStats(void);
-#endif
-
-/* for source compatibility with 2.2 */
-#define _PyObject_Del           PyObject_Free
-
-/*
- * Generic object allocator interface
- * ==================================
- */
-
-/* Functions */
-PyAPI_FUNC(PyObject *) PyObject_Init(PyObject *, PyTypeObject *);
-PyAPI_FUNC(PyVarObject *) PyObject_InitVar(PyVarObject *,
-                                                 PyTypeObject *, Py_ssize_t);
-PyAPI_FUNC(PyObject *) _PyObject_New(PyTypeObject *);
-PyAPI_FUNC(PyVarObject *) _PyObject_NewVar(PyTypeObject *, Py_ssize_t);
-
-#define PyObject_New(type, typeobj) \
-                ( (type *) _PyObject_New(typeobj) )
-#define PyObject_NewVar(type, typeobj, n) \
-                ( (type *) _PyObject_NewVar((typeobj), (n)) )
-
-/* Macros trading binary compatibility for speed. See also pymem.h.
-   Note that these macros expect non-NULL object pointers.*/
-#define PyObject_INIT(op, typeobj) \
-    ( Py_TYPE(op) = (typeobj), _Py_NewReference((PyObject *)(op)), (op) )
-#define PyObject_INIT_VAR(op, typeobj, size) \
-    ( Py_SIZE(op) = (size), PyObject_INIT((op), (typeobj)) )
-
-#define _PyObject_SIZE(typeobj) ( (typeobj)->tp_basicsize )
-
-/* _PyObject_VAR_SIZE returns the number of bytes (as size_t) allocated for a
-   vrbl-size object with nitems items, exclusive of gc overhead (if any).  The
-   value is rounded up to the closest multiple of sizeof(void *), in order to
-   ensure that pointer fields at the end of the object are correctly aligned
-   for the platform (this is of special importance for subclasses of, e.g.,
-   str or long, so that pointers can be stored after the embedded data).
-
-   Note that there's no memory wastage in doing this, as malloc has to
-   return (at worst) pointer-aligned memory anyway.
-*/
-#if ((SIZEOF_VOID_P - 1) & SIZEOF_VOID_P) != 0
-#   error "_PyObject_VAR_SIZE requires SIZEOF_VOID_P be a power of 2"
-#endif
-
-#define _PyObject_VAR_SIZE(typeobj, nitems)     \
-    (size_t)                                    \
-    ( ( (typeobj)->tp_basicsize +               \
-        (nitems)*(typeobj)->tp_itemsize +       \
-        (SIZEOF_VOID_P - 1)                     \
-      ) & ~(SIZEOF_VOID_P - 1)                  \
-    )
-
-#define PyObject_NEW(type, typeobj) \
-( (type *) PyObject_Init( \
-    (PyObject *) PyObject_MALLOC( _PyObject_SIZE(typeobj) ), (typeobj)) )
-
-#define PyObject_NEW_VAR(type, typeobj, n) \
-( (type *) PyObject_InitVar( \
-      (PyVarObject *) PyObject_MALLOC(_PyObject_VAR_SIZE((typeobj),(n)) ),\
-      (typeobj), (n)) )
-
-/* This example code implements an object constructor with a custom
-   allocator, where PyObject_New is inlined, and shows the important
-   distinction between two steps (at least):
-       1) the actual allocation of the object storage;
-       2) the initialization of the Python specific fields
-      in this storage with PyObject_{Init, InitVar}.
-
-   PyObject *
-   YourObject_New(...)
-   {
-       PyObject *op;
-
-       op = (PyObject *) Your_Allocator(_PyObject_SIZE(YourTypeStruct));
-       if (op == NULL)
-       return PyErr_NoMemory();
-
-       PyObject_Init(op, &YourTypeStruct);
-
-       op->ob_field = value;
-       ...
-       return op;
-   }
-
-   Note that in C++, the use of the new operator usually implies that
-   the 1st step is performed automatically for you, so in a C++ class
-   constructor you would start directly with PyObject_Init/InitVar
-*/
-
-/*
- * Garbage Collection Support
- * ==========================
- */
-
-/* C equivalent of gc.collect(). */
-PyAPI_FUNC(Py_ssize_t) PyGC_Collect(void);
-
-/* Test if a type has a GC head */
-#define PyType_IS_GC(t) PyType_HasFeature((t), Py_TPFLAGS_HAVE_GC)
-
-/* Test if an object has a GC head */
-#define PyObject_IS_GC(o) (PyType_IS_GC(Py_TYPE(o)) && \
-    (Py_TYPE(o)->tp_is_gc == NULL || Py_TYPE(o)->tp_is_gc(o)))
-
-PyAPI_FUNC(PyVarObject *) _PyObject_GC_Resize(PyVarObject *, Py_ssize_t);
-#define PyObject_GC_Resize(type, op, n) \
-                ( (type *) _PyObject_GC_Resize((PyVarObject *)(op), (n)) )
-
-/* for source compatibility with 2.2 */
-#define _PyObject_GC_Del PyObject_GC_Del
-
+#endif 
+ 
+/* for source compatibility with 2.2 */ 
+#define _PyObject_Del           PyObject_Free 
+ 
+/* 
+ * Generic object allocator interface 
+ * ================================== 
+ */ 
+ 
+/* Functions */ 
+PyAPI_FUNC(PyObject *) PyObject_Init(PyObject *, PyTypeObject *); 
+PyAPI_FUNC(PyVarObject *) PyObject_InitVar(PyVarObject *, 
+                                                 PyTypeObject *, Py_ssize_t); 
+PyAPI_FUNC(PyObject *) _PyObject_New(PyTypeObject *); 
+PyAPI_FUNC(PyVarObject *) _PyObject_NewVar(PyTypeObject *, Py_ssize_t); 
+ 
+#define PyObject_New(type, typeobj) \ 
+                ( (type *) _PyObject_New(typeobj) ) 
+#define PyObject_NewVar(type, typeobj, n) \ 
+                ( (type *) _PyObject_NewVar((typeobj), (n)) ) 
+ 
+/* Macros trading binary compatibility for speed. See also pymem.h. 
+   Note that these macros expect non-NULL object pointers.*/ 
+#define PyObject_INIT(op, typeobj) \ 
+    ( Py_TYPE(op) = (typeobj), _Py_NewReference((PyObject *)(op)), (op) ) 
+#define PyObject_INIT_VAR(op, typeobj, size) \ 
+    ( Py_SIZE(op) = (size), PyObject_INIT((op), (typeobj)) ) 
+ 
+#define _PyObject_SIZE(typeobj) ( (typeobj)->tp_basicsize ) 
+ 
+/* _PyObject_VAR_SIZE returns the number of bytes (as size_t) allocated for a 
+   vrbl-size object with nitems items, exclusive of gc overhead (if any).  The 
+   value is rounded up to the closest multiple of sizeof(void *), in order to 
+   ensure that pointer fields at the end of the object are correctly aligned 
+   for the platform (this is of special importance for subclasses of, e.g., 
+   str or long, so that pointers can be stored after the embedded data). 
+ 
+   Note that there's no memory wastage in doing this, as malloc has to 
+   return (at worst) pointer-aligned memory anyway. 
+*/ 
+#if ((SIZEOF_VOID_P - 1) & SIZEOF_VOID_P) != 0 
+#   error "_PyObject_VAR_SIZE requires SIZEOF_VOID_P be a power of 2" 
+#endif 
+ 
+#define _PyObject_VAR_SIZE(typeobj, nitems)     \ 
+    (size_t)                                    \ 
+    ( ( (typeobj)->tp_basicsize +               \ 
+        (nitems)*(typeobj)->tp_itemsize +       \ 
+        (SIZEOF_VOID_P - 1)                     \ 
+      ) & ~(SIZEOF_VOID_P - 1)                  \ 
+    ) 
+ 
+#define PyObject_NEW(type, typeobj) \ 
+( (type *) PyObject_Init( \ 
+    (PyObject *) PyObject_MALLOC( _PyObject_SIZE(typeobj) ), (typeobj)) ) 
+ 
+#define PyObject_NEW_VAR(type, typeobj, n) \ 
+( (type *) PyObject_InitVar( \ 
+      (PyVarObject *) PyObject_MALLOC(_PyObject_VAR_SIZE((typeobj),(n)) ),\ 
+      (typeobj), (n)) ) 
+ 
+/* This example code implements an object constructor with a custom 
+   allocator, where PyObject_New is inlined, and shows the important 
+   distinction between two steps (at least): 
+       1) the actual allocation of the object storage; 
+       2) the initialization of the Python specific fields 
+      in this storage with PyObject_{Init, InitVar}. 
+ 
+   PyObject * 
+   YourObject_New(...) 
+   { 
+       PyObject *op; 
+ 
+       op = (PyObject *) Your_Allocator(_PyObject_SIZE(YourTypeStruct)); 
+       if (op == NULL) 
+       return PyErr_NoMemory(); 
+ 
+       PyObject_Init(op, &YourTypeStruct); 
+ 
+       op->ob_field = value; 
+       ... 
+       return op; 
+   } 
+ 
+   Note that in C++, the use of the new operator usually implies that 
+   the 1st step is performed automatically for you, so in a C++ class 
+   constructor you would start directly with PyObject_Init/InitVar 
+*/ 
+ 
+/* 
+ * Garbage Collection Support 
+ * ========================== 
+ */ 
+ 
+/* C equivalent of gc.collect(). */ 
+PyAPI_FUNC(Py_ssize_t) PyGC_Collect(void); 
+ 
+/* Test if a type has a GC head */ 
+#define PyType_IS_GC(t) PyType_HasFeature((t), Py_TPFLAGS_HAVE_GC) 
+ 
+/* Test if an object has a GC head */ 
+#define PyObject_IS_GC(o) (PyType_IS_GC(Py_TYPE(o)) && \ 
+    (Py_TYPE(o)->tp_is_gc == NULL || Py_TYPE(o)->tp_is_gc(o))) 
+ 
+PyAPI_FUNC(PyVarObject *) _PyObject_GC_Resize(PyVarObject *, Py_ssize_t); 
+#define PyObject_GC_Resize(type, op, n) \ 
+                ( (type *) _PyObject_GC_Resize((PyVarObject *)(op), (n)) ) 
+ 
+/* for source compatibility with 2.2 */ 
+#define _PyObject_GC_Del PyObject_GC_Del 
+ 
 /*
  * Former over-aligned definition of PyGC_Head, used to compute the size of the
  * padding for the new version below.
@@ -250,108 +250,108 @@ union _gc_head_old {
     long double dummy;
 };
 
-/* GC information is stored BEFORE the object structure. */
-typedef union _gc_head {
-    struct {
-        union _gc_head *gc_next;
-        union _gc_head *gc_prev;
-        Py_ssize_t gc_refs;
-    } gc;
+/* GC information is stored BEFORE the object structure. */ 
+typedef union _gc_head { 
+    struct { 
+        union _gc_head *gc_next; 
+        union _gc_head *gc_prev; 
+        Py_ssize_t gc_refs; 
+    } gc; 
     double dummy; /* Force at least 8-byte alignment. */
     char dummy_padding[sizeof(union _gc_head_old)];
-} PyGC_Head;
-
-extern PyGC_Head *_PyGC_generation0;
-
-#define _Py_AS_GC(o) ((PyGC_Head *)(o)-1)
-
-#define _PyGC_REFS_UNTRACKED                    (-2)
-#define _PyGC_REFS_REACHABLE                    (-3)
-#define _PyGC_REFS_TENTATIVELY_UNREACHABLE      (-4)
-
-/* Tell the GC to track this object.  NB: While the object is tracked the
- * collector it must be safe to call the ob_traverse method. */
-#define _PyObject_GC_TRACK(o) do { \
-    PyGC_Head *g = _Py_AS_GC(o); \
-    if (g->gc.gc_refs != _PyGC_REFS_UNTRACKED) \
-        Py_FatalError("GC object already tracked"); \
-    g->gc.gc_refs = _PyGC_REFS_REACHABLE; \
-    g->gc.gc_next = _PyGC_generation0; \
-    g->gc.gc_prev = _PyGC_generation0->gc.gc_prev; \
-    g->gc.gc_prev->gc.gc_next = g; \
-    _PyGC_generation0->gc.gc_prev = g; \
-    } while (0);
-
-/* Tell the GC to stop tracking this object.
- * gc_next doesn't need to be set to NULL, but doing so is a good
- * way to provoke memory errors if calling code is confused.
- */
-#define _PyObject_GC_UNTRACK(o) do { \
-    PyGC_Head *g = _Py_AS_GC(o); \
-    assert(g->gc.gc_refs != _PyGC_REFS_UNTRACKED); \
-    g->gc.gc_refs = _PyGC_REFS_UNTRACKED; \
-    g->gc.gc_prev->gc.gc_next = g->gc.gc_next; \
-    g->gc.gc_next->gc.gc_prev = g->gc.gc_prev; \
-    g->gc.gc_next = NULL; \
-    } while (0);
-
-/* True if the object is currently tracked by the GC. */
-#define _PyObject_GC_IS_TRACKED(o) \
-    ((_Py_AS_GC(o))->gc.gc_refs != _PyGC_REFS_UNTRACKED)
-
-/* True if the object may be tracked by the GC in the future, or already is.
-   This can be useful to implement some optimizations. */
-#define _PyObject_GC_MAY_BE_TRACKED(obj) \
-    (PyObject_IS_GC(obj) && \
-        (!PyTuple_CheckExact(obj) || _PyObject_GC_IS_TRACKED(obj)))
-
-
-PyAPI_FUNC(PyObject *) _PyObject_GC_Malloc(size_t);
-PyAPI_FUNC(PyObject *) _PyObject_GC_New(PyTypeObject *);
-PyAPI_FUNC(PyVarObject *) _PyObject_GC_NewVar(PyTypeObject *, Py_ssize_t);
-PyAPI_FUNC(void) PyObject_GC_Track(void *);
-PyAPI_FUNC(void) PyObject_GC_UnTrack(void *);
-PyAPI_FUNC(void) PyObject_GC_Del(void *);
-
-#define PyObject_GC_New(type, typeobj) \
-                ( (type *) _PyObject_GC_New(typeobj) )
-#define PyObject_GC_NewVar(type, typeobj, n) \
-                ( (type *) _PyObject_GC_NewVar((typeobj), (n)) )
-
-
-/* Utility macro to help write tp_traverse functions.
- * To use this macro, the tp_traverse function must name its arguments
- * "visit" and "arg".  This is intended to keep tp_traverse functions
- * looking as much alike as possible.
- */
-#define Py_VISIT(op)                                                    \
-    do {                                                                \
-        if (op) {                                                       \
-            int vret = visit((PyObject *)(op), arg);                    \
-            if (vret)                                                   \
-                return vret;                                            \
-        }                                                               \
-    } while (0)
-
-/* This is here for the sake of backwards compatibility.  Extensions that
- * use the old GC API will still compile but the objects will not be
- * tracked by the GC. */
-#define PyGC_HEAD_SIZE 0
-#define PyObject_GC_Init(op)
-#define PyObject_GC_Fini(op)
-#define PyObject_AS_GC(op) (op)
-#define PyObject_FROM_GC(op) (op)
-
-
-/* Test if a type supports weak references */
-#define PyType_SUPPORTS_WEAKREFS(t) \
-    (PyType_HasFeature((t), Py_TPFLAGS_HAVE_WEAKREFS) \
-     && ((t)->tp_weaklistoffset > 0))
-
-#define PyObject_GET_WEAKREFS_LISTPTR(o) \
-    ((PyObject **) (((char *) (o)) + Py_TYPE(o)->tp_weaklistoffset))
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_OBJIMPL_H */
+} PyGC_Head; 
+ 
+extern PyGC_Head *_PyGC_generation0; 
+ 
+#define _Py_AS_GC(o) ((PyGC_Head *)(o)-1) 
+ 
+#define _PyGC_REFS_UNTRACKED                    (-2) 
+#define _PyGC_REFS_REACHABLE                    (-3) 
+#define _PyGC_REFS_TENTATIVELY_UNREACHABLE      (-4) 
+ 
+/* Tell the GC to track this object.  NB: While the object is tracked the 
+ * collector it must be safe to call the ob_traverse method. */ 
+#define _PyObject_GC_TRACK(o) do { \ 
+    PyGC_Head *g = _Py_AS_GC(o); \ 
+    if (g->gc.gc_refs != _PyGC_REFS_UNTRACKED) \ 
+        Py_FatalError("GC object already tracked"); \ 
+    g->gc.gc_refs = _PyGC_REFS_REACHABLE; \ 
+    g->gc.gc_next = _PyGC_generation0; \ 
+    g->gc.gc_prev = _PyGC_generation0->gc.gc_prev; \ 
+    g->gc.gc_prev->gc.gc_next = g; \ 
+    _PyGC_generation0->gc.gc_prev = g; \ 
+    } while (0); 
+ 
+/* Tell the GC to stop tracking this object. 
+ * gc_next doesn't need to be set to NULL, but doing so is a good 
+ * way to provoke memory errors if calling code is confused. 
+ */ 
+#define _PyObject_GC_UNTRACK(o) do { \ 
+    PyGC_Head *g = _Py_AS_GC(o); \ 
+    assert(g->gc.gc_refs != _PyGC_REFS_UNTRACKED); \ 
+    g->gc.gc_refs = _PyGC_REFS_UNTRACKED; \ 
+    g->gc.gc_prev->gc.gc_next = g->gc.gc_next; \ 
+    g->gc.gc_next->gc.gc_prev = g->gc.gc_prev; \ 
+    g->gc.gc_next = NULL; \ 
+    } while (0); 
+ 
+/* True if the object is currently tracked by the GC. */ 
+#define _PyObject_GC_IS_TRACKED(o) \ 
+    ((_Py_AS_GC(o))->gc.gc_refs != _PyGC_REFS_UNTRACKED) 
+ 
+/* True if the object may be tracked by the GC in the future, or already is. 
+   This can be useful to implement some optimizations. */ 
+#define _PyObject_GC_MAY_BE_TRACKED(obj) \ 
+    (PyObject_IS_GC(obj) && \ 
+        (!PyTuple_CheckExact(obj) || _PyObject_GC_IS_TRACKED(obj))) 
+ 
+ 
+PyAPI_FUNC(PyObject *) _PyObject_GC_Malloc(size_t); 
+PyAPI_FUNC(PyObject *) _PyObject_GC_New(PyTypeObject *); 
+PyAPI_FUNC(PyVarObject *) _PyObject_GC_NewVar(PyTypeObject *, Py_ssize_t); 
+PyAPI_FUNC(void) PyObject_GC_Track(void *); 
+PyAPI_FUNC(void) PyObject_GC_UnTrack(void *); 
+PyAPI_FUNC(void) PyObject_GC_Del(void *); 
+ 
+#define PyObject_GC_New(type, typeobj) \ 
+                ( (type *) _PyObject_GC_New(typeobj) ) 
+#define PyObject_GC_NewVar(type, typeobj, n) \ 
+                ( (type *) _PyObject_GC_NewVar((typeobj), (n)) ) 
+ 
+ 
+/* Utility macro to help write tp_traverse functions. 
+ * To use this macro, the tp_traverse function must name its arguments 
+ * "visit" and "arg".  This is intended to keep tp_traverse functions 
+ * looking as much alike as possible. 
+ */ 
+#define Py_VISIT(op)                                                    \ 
+    do {                                                                \ 
+        if (op) {                                                       \ 
+            int vret = visit((PyObject *)(op), arg);                    \ 
+            if (vret)                                                   \ 
+                return vret;                                            \ 
+        }                                                               \ 
+    } while (0) 
+ 
+/* This is here for the sake of backwards compatibility.  Extensions that 
+ * use the old GC API will still compile but the objects will not be 
+ * tracked by the GC. */ 
+#define PyGC_HEAD_SIZE 0 
+#define PyObject_GC_Init(op) 
+#define PyObject_GC_Fini(op) 
+#define PyObject_AS_GC(op) (op) 
+#define PyObject_FROM_GC(op) (op) 
+ 
+ 
+/* Test if a type supports weak references */ 
+#define PyType_SUPPORTS_WEAKREFS(t) \ 
+    (PyType_HasFeature((t), Py_TPFLAGS_HAVE_WEAKREFS) \ 
+     && ((t)->tp_weaklistoffset > 0)) 
+ 
+#define PyObject_GET_WEAKREFS_LISTPTR(o) \ 
+    ((PyObject **) (((char *) (o)) + Py_TYPE(o)->tp_weaklistoffset)) 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_OBJIMPL_H */ 
diff --git a/contrib/tools/python/src/Include/opcode.h b/contrib/tools/python/src/Include/opcode.h
index 9ed548729e..48a298f4ec 100644
--- a/contrib/tools/python/src/Include/opcode.h
+++ b/contrib/tools/python/src/Include/opcode.h
@@ -1,171 +1,171 @@
-#ifndef Py_OPCODE_H
-#define Py_OPCODE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Instruction opcodes for compiled code */
-
-#define STOP_CODE	0
-#define POP_TOP		1
-#define ROT_TWO		2
-#define ROT_THREE	3
-#define DUP_TOP		4
-#define ROT_FOUR	5
-#define NOP		9
-
-#define UNARY_POSITIVE	10
-#define UNARY_NEGATIVE	11
-#define UNARY_NOT	12
-#define UNARY_CONVERT	13
-
-#define UNARY_INVERT	15
-
-#define BINARY_POWER	19
-
-#define BINARY_MULTIPLY	20
-#define BINARY_DIVIDE	21
-#define BINARY_MODULO	22
-#define BINARY_ADD	23
-#define BINARY_SUBTRACT	24
-#define BINARY_SUBSCR	25
-#define BINARY_FLOOR_DIVIDE 26
-#define BINARY_TRUE_DIVIDE 27
-#define INPLACE_FLOOR_DIVIDE 28
-#define INPLACE_TRUE_DIVIDE 29
-
-#define SLICE		30
-/* Also uses 31-33 */
+#ifndef Py_OPCODE_H 
+#define Py_OPCODE_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+ 
+/* Instruction opcodes for compiled code */ 
+ 
+#define STOP_CODE	0 
+#define POP_TOP		1 
+#define ROT_TWO		2 
+#define ROT_THREE	3 
+#define DUP_TOP		4 
+#define ROT_FOUR	5 
+#define NOP		9 
+ 
+#define UNARY_POSITIVE	10 
+#define UNARY_NEGATIVE	11 
+#define UNARY_NOT	12 
+#define UNARY_CONVERT	13 
+ 
+#define UNARY_INVERT	15 
+ 
+#define BINARY_POWER	19 
+ 
+#define BINARY_MULTIPLY	20 
+#define BINARY_DIVIDE	21 
+#define BINARY_MODULO	22 
+#define BINARY_ADD	23 
+#define BINARY_SUBTRACT	24 
+#define BINARY_SUBSCR	25 
+#define BINARY_FLOOR_DIVIDE 26 
+#define BINARY_TRUE_DIVIDE 27 
+#define INPLACE_FLOOR_DIVIDE 28 
+#define INPLACE_TRUE_DIVIDE 29 
+ 
+#define SLICE		30 
+/* Also uses 31-33 */ 
 #define SLICE_1		31
 #define SLICE_2		32
 #define SLICE_3		33
-
-#define STORE_SLICE	40
-/* Also uses 41-43 */
+ 
+#define STORE_SLICE	40 
+/* Also uses 41-43 */ 
 #define STORE_SLICE_1	41
 #define STORE_SLICE_2	42
 #define STORE_SLICE_3	43
-
-#define DELETE_SLICE	50
-/* Also uses 51-53 */
+ 
+#define DELETE_SLICE	50 
+/* Also uses 51-53 */ 
 #define DELETE_SLICE_1	51
 #define DELETE_SLICE_2	52
 #define DELETE_SLICE_3	53
-
-#define STORE_MAP	54
-#define INPLACE_ADD	55
-#define INPLACE_SUBTRACT	56
-#define INPLACE_MULTIPLY	57
-#define INPLACE_DIVIDE	58
-#define INPLACE_MODULO	59
-#define STORE_SUBSCR	60
-#define DELETE_SUBSCR	61
-
-#define BINARY_LSHIFT	62
-#define BINARY_RSHIFT	63
-#define BINARY_AND	64
-#define BINARY_XOR	65
-#define BINARY_OR	66
-#define INPLACE_POWER	67
-#define GET_ITER	68
-
-#define PRINT_EXPR	70
-#define PRINT_ITEM	71
-#define PRINT_NEWLINE	72
-#define PRINT_ITEM_TO   73
-#define PRINT_NEWLINE_TO 74
-#define INPLACE_LSHIFT	75
-#define INPLACE_RSHIFT	76
-#define INPLACE_AND	77
-#define INPLACE_XOR	78
-#define INPLACE_OR	79
-#define BREAK_LOOP	80
-#define WITH_CLEANUP    81
-#define LOAD_LOCALS	82
-#define RETURN_VALUE	83
-#define IMPORT_STAR	84
-#define EXEC_STMT	85
-#define YIELD_VALUE	86
-#define POP_BLOCK	87
-#define END_FINALLY	88
-#define BUILD_CLASS	89
-
-#define HAVE_ARGUMENT	90	/* Opcodes from here have an argument: */
-
-#define STORE_NAME	90	/* Index in name list */
-#define DELETE_NAME	91	/* "" */
-#define UNPACK_SEQUENCE	92	/* Number of sequence items */
-#define FOR_ITER	93
-#define LIST_APPEND	94
-
-#define STORE_ATTR	95	/* Index in name list */
-#define DELETE_ATTR	96	/* "" */
-#define STORE_GLOBAL	97	/* "" */
-#define DELETE_GLOBAL	98	/* "" */
-#define DUP_TOPX	99	/* number of items to duplicate */
-#define LOAD_CONST	100	/* Index in const list */
-#define LOAD_NAME	101	/* Index in name list */
-#define BUILD_TUPLE	102	/* Number of tuple items */
-#define BUILD_LIST	103	/* Number of list items */
-#define BUILD_SET	104     /* Number of set items */
-#define BUILD_MAP	105	/* Always zero for now */
-#define LOAD_ATTR	106	/* Index in name list */
-#define COMPARE_OP	107	/* Comparison operator */
-#define IMPORT_NAME	108	/* Index in name list */
-#define IMPORT_FROM	109	/* Index in name list */
-#define JUMP_FORWARD	110	/* Number of bytes to skip */
-
-#define JUMP_IF_FALSE_OR_POP 111 /* Target byte offset from beginning
-                                    of code */
-#define JUMP_IF_TRUE_OR_POP 112	/* "" */
-#define JUMP_ABSOLUTE	113	/* "" */
-#define POP_JUMP_IF_FALSE 114	/* "" */
-#define POP_JUMP_IF_TRUE 115	/* "" */
-
-#define LOAD_GLOBAL	116	/* Index in name list */
-
-#define CONTINUE_LOOP	119	/* Start of loop (absolute) */
-#define SETUP_LOOP	120	/* Target address (relative) */
-#define SETUP_EXCEPT	121	/* "" */
-#define SETUP_FINALLY	122	/* "" */
-
-#define LOAD_FAST	124	/* Local variable number */
-#define STORE_FAST	125	/* Local variable number */
-#define DELETE_FAST	126	/* Local variable number */
-
-#define RAISE_VARARGS	130	/* Number of raise arguments (1, 2 or 3) */
-/* CALL_FUNCTION_XXX opcodes defined below depend on this definition */
-#define CALL_FUNCTION	131	/* #args + (#kwargs<<8) */
-#define MAKE_FUNCTION	132	/* #defaults */
-#define BUILD_SLICE 	133	/* Number of items */
-
-#define MAKE_CLOSURE    134     /* #free vars */
-#define LOAD_CLOSURE    135     /* Load free variable from closure */
-#define LOAD_DEREF      136     /* Load and dereference from closure cell */ 
-#define STORE_DEREF     137     /* Store into cell */ 
-
-/* The next 3 opcodes must be contiguous and satisfy
-   (CALL_FUNCTION_VAR - CALL_FUNCTION) & 3 == 1  */
-#define CALL_FUNCTION_VAR          140	/* #args + (#kwargs<<8) */
-#define CALL_FUNCTION_KW           141	/* #args + (#kwargs<<8) */
-#define CALL_FUNCTION_VAR_KW       142	/* #args + (#kwargs<<8) */
-
-#define SETUP_WITH 143
-
-/* Support for opargs more than 16 bits long */
-#define EXTENDED_ARG  145
-
-#define SET_ADD         146
-#define MAP_ADD         147
-
-
-enum cmp_op {PyCmp_LT=Py_LT, PyCmp_LE=Py_LE, PyCmp_EQ=Py_EQ, PyCmp_NE=Py_NE, PyCmp_GT=Py_GT, PyCmp_GE=Py_GE,
-	     PyCmp_IN, PyCmp_NOT_IN, PyCmp_IS, PyCmp_IS_NOT, PyCmp_EXC_MATCH, PyCmp_BAD};
-
-#define HAS_ARG(op) ((op) >= HAVE_ARGUMENT)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_OPCODE_H */
+ 
+#define STORE_MAP	54 
+#define INPLACE_ADD	55 
+#define INPLACE_SUBTRACT	56 
+#define INPLACE_MULTIPLY	57 
+#define INPLACE_DIVIDE	58 
+#define INPLACE_MODULO	59 
+#define STORE_SUBSCR	60 
+#define DELETE_SUBSCR	61 
+ 
+#define BINARY_LSHIFT	62 
+#define BINARY_RSHIFT	63 
+#define BINARY_AND	64 
+#define BINARY_XOR	65 
+#define BINARY_OR	66 
+#define INPLACE_POWER	67 
+#define GET_ITER	68 
+ 
+#define PRINT_EXPR	70 
+#define PRINT_ITEM	71 
+#define PRINT_NEWLINE	72 
+#define PRINT_ITEM_TO   73 
+#define PRINT_NEWLINE_TO 74 
+#define INPLACE_LSHIFT	75 
+#define INPLACE_RSHIFT	76 
+#define INPLACE_AND	77 
+#define INPLACE_XOR	78 
+#define INPLACE_OR	79 
+#define BREAK_LOOP	80 
+#define WITH_CLEANUP    81 
+#define LOAD_LOCALS	82 
+#define RETURN_VALUE	83 
+#define IMPORT_STAR	84 
+#define EXEC_STMT	85 
+#define YIELD_VALUE	86 
+#define POP_BLOCK	87 
+#define END_FINALLY	88 
+#define BUILD_CLASS	89 
+ 
+#define HAVE_ARGUMENT	90	/* Opcodes from here have an argument: */ 
+ 
+#define STORE_NAME	90	/* Index in name list */ 
+#define DELETE_NAME	91	/* "" */ 
+#define UNPACK_SEQUENCE	92	/* Number of sequence items */ 
+#define FOR_ITER	93 
+#define LIST_APPEND	94 
+ 
+#define STORE_ATTR	95	/* Index in name list */ 
+#define DELETE_ATTR	96	/* "" */ 
+#define STORE_GLOBAL	97	/* "" */ 
+#define DELETE_GLOBAL	98	/* "" */ 
+#define DUP_TOPX	99	/* number of items to duplicate */ 
+#define LOAD_CONST	100	/* Index in const list */ 
+#define LOAD_NAME	101	/* Index in name list */ 
+#define BUILD_TUPLE	102	/* Number of tuple items */ 
+#define BUILD_LIST	103	/* Number of list items */ 
+#define BUILD_SET	104     /* Number of set items */ 
+#define BUILD_MAP	105	/* Always zero for now */ 
+#define LOAD_ATTR	106	/* Index in name list */ 
+#define COMPARE_OP	107	/* Comparison operator */ 
+#define IMPORT_NAME	108	/* Index in name list */ 
+#define IMPORT_FROM	109	/* Index in name list */ 
+#define JUMP_FORWARD	110	/* Number of bytes to skip */ 
+ 
+#define JUMP_IF_FALSE_OR_POP 111 /* Target byte offset from beginning 
+                                    of code */ 
+#define JUMP_IF_TRUE_OR_POP 112	/* "" */ 
+#define JUMP_ABSOLUTE	113	/* "" */ 
+#define POP_JUMP_IF_FALSE 114	/* "" */ 
+#define POP_JUMP_IF_TRUE 115	/* "" */ 
+ 
+#define LOAD_GLOBAL	116	/* Index in name list */ 
+ 
+#define CONTINUE_LOOP	119	/* Start of loop (absolute) */ 
+#define SETUP_LOOP	120	/* Target address (relative) */ 
+#define SETUP_EXCEPT	121	/* "" */ 
+#define SETUP_FINALLY	122	/* "" */ 
+ 
+#define LOAD_FAST	124	/* Local variable number */ 
+#define STORE_FAST	125	/* Local variable number */ 
+#define DELETE_FAST	126	/* Local variable number */ 
+ 
+#define RAISE_VARARGS	130	/* Number of raise arguments (1, 2 or 3) */ 
+/* CALL_FUNCTION_XXX opcodes defined below depend on this definition */ 
+#define CALL_FUNCTION	131	/* #args + (#kwargs<<8) */ 
+#define MAKE_FUNCTION	132	/* #defaults */ 
+#define BUILD_SLICE 	133	/* Number of items */ 
+ 
+#define MAKE_CLOSURE    134     /* #free vars */ 
+#define LOAD_CLOSURE    135     /* Load free variable from closure */ 
+#define LOAD_DEREF      136     /* Load and dereference from closure cell */  
+#define STORE_DEREF     137     /* Store into cell */  
+ 
+/* The next 3 opcodes must be contiguous and satisfy 
+   (CALL_FUNCTION_VAR - CALL_FUNCTION) & 3 == 1  */ 
+#define CALL_FUNCTION_VAR          140	/* #args + (#kwargs<<8) */ 
+#define CALL_FUNCTION_KW           141	/* #args + (#kwargs<<8) */ 
+#define CALL_FUNCTION_VAR_KW       142	/* #args + (#kwargs<<8) */ 
+ 
+#define SETUP_WITH 143 
+ 
+/* Support for opargs more than 16 bits long */ 
+#define EXTENDED_ARG  145 
+ 
+#define SET_ADD         146 
+#define MAP_ADD         147 
+ 
+ 
+enum cmp_op {PyCmp_LT=Py_LT, PyCmp_LE=Py_LE, PyCmp_EQ=Py_EQ, PyCmp_NE=Py_NE, PyCmp_GT=Py_GT, PyCmp_GE=Py_GE, 
+	     PyCmp_IN, PyCmp_NOT_IN, PyCmp_IS, PyCmp_IS_NOT, PyCmp_EXC_MATCH, PyCmp_BAD}; 
+ 
+#define HAS_ARG(op) ((op) >= HAVE_ARGUMENT) 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_OPCODE_H */ 
diff --git a/contrib/tools/python/src/Include/osdefs.h b/contrib/tools/python/src/Include/osdefs.h
index 77af923754..ef4f31afa8 100644
--- a/contrib/tools/python/src/Include/osdefs.h
+++ b/contrib/tools/python/src/Include/osdefs.h
@@ -1,41 +1,41 @@
-#ifndef Py_OSDEFS_H
-#define Py_OSDEFS_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Operating system dependencies */
-
-/* Mod by chrish: QNX has WATCOM, but isn't DOS */
-#if !defined(__QNX__)
-#if defined(MS_WINDOWS) || defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__DJGPP__) || defined(PYOS_OS2)
-#if defined(PYOS_OS2) && defined(PYCC_GCC)
-#define MAXPATHLEN 260
-#define SEP '/'
-#define ALTSEP '\\'
-#else
-#define SEP '\\'
-#define ALTSEP '/'
-#define MAXPATHLEN 256
-#endif
-#define DELIM ';'
-#endif
-#endif
-
-#ifdef RISCOS
-#define SEP '.'
-#define MAXPATHLEN 256
-#define DELIM ','
-#endif
-
-
-/* Filename separator */
-#ifndef SEP
-#define SEP '/'
-#endif
-
-/* Max pathname length */
+#ifndef Py_OSDEFS_H 
+#define Py_OSDEFS_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+ 
+/* Operating system dependencies */ 
+ 
+/* Mod by chrish: QNX has WATCOM, but isn't DOS */ 
+#if !defined(__QNX__) 
+#if defined(MS_WINDOWS) || defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__DJGPP__) || defined(PYOS_OS2) 
+#if defined(PYOS_OS2) && defined(PYCC_GCC) 
+#define MAXPATHLEN 260 
+#define SEP '/' 
+#define ALTSEP '\\' 
+#else 
+#define SEP '\\' 
+#define ALTSEP '/' 
+#define MAXPATHLEN 256 
+#endif 
+#define DELIM ';' 
+#endif 
+#endif 
+ 
+#ifdef RISCOS 
+#define SEP '.' 
+#define MAXPATHLEN 256 
+#define DELIM ',' 
+#endif 
+ 
+ 
+/* Filename separator */ 
+#ifndef SEP 
+#define SEP '/' 
+#endif 
+ 
+/* Max pathname length */ 
 #ifdef __hpux
 #include <sys/param.h>
 #include <limits.h>
@@ -44,20 +44,20 @@ extern "C" {
 #endif
 #endif
 
-#ifndef MAXPATHLEN
-#if defined(PATH_MAX) && PATH_MAX > 1024
-#define MAXPATHLEN PATH_MAX
-#else
-#define MAXPATHLEN 1024
-#endif
-#endif
-
-/* Search path entry delimiter */
-#ifndef DELIM
-#define DELIM ':'
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_OSDEFS_H */
+#ifndef MAXPATHLEN 
+#if defined(PATH_MAX) && PATH_MAX > 1024 
+#define MAXPATHLEN PATH_MAX 
+#else 
+#define MAXPATHLEN 1024 
+#endif 
+#endif 
+ 
+/* Search path entry delimiter */ 
+#ifndef DELIM 
+#define DELIM ':' 
+#endif 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_OSDEFS_H */ 
diff --git a/contrib/tools/python/src/Include/parsetok.h b/contrib/tools/python/src/Include/parsetok.h
index ec1eb6ff7d..516884b1d0 100644
--- a/contrib/tools/python/src/Include/parsetok.h
+++ b/contrib/tools/python/src/Include/parsetok.h
@@ -1,64 +1,64 @@
-
-/* Parser-tokenizer link interface */
-
-#ifndef Py_PARSETOK_H
-#define Py_PARSETOK_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
-    int error;
-    const char *filename;
-    int lineno;
-    int offset;
-    char *text;
-    int token;
-    int expected;
-} perrdetail;
-
-#if 0
-#define PyPARSE_YIELD_IS_KEYWORD	0x0001
-#endif
-
-#define PyPARSE_DONT_IMPLY_DEDENT	0x0002
-
-#if 0
-#define PyPARSE_WITH_IS_KEYWORD		0x0003
-#endif
-
-#define PyPARSE_PRINT_IS_FUNCTION       0x0004
-#define PyPARSE_UNICODE_LITERALS        0x0008
-
-
-
-PyAPI_FUNC(node *) PyParser_ParseString(const char *, grammar *, int,
-                                              perrdetail *);
-PyAPI_FUNC(node *) PyParser_ParseFile (FILE *, const char *, grammar *, int,
-                                             char *, char *, perrdetail *);
-
-PyAPI_FUNC(node *) PyParser_ParseStringFlags(const char *, grammar *, int,
-                                              perrdetail *, int);
-PyAPI_FUNC(node *) PyParser_ParseFileFlags(FILE *, const char *, grammar *,
-						 int, char *, char *,
-						 perrdetail *, int);
-PyAPI_FUNC(node *) PyParser_ParseFileFlagsEx(FILE *, const char *, grammar *,
-						 int, char *, char *,
-						 perrdetail *, int *);
-
-PyAPI_FUNC(node *) PyParser_ParseStringFlagsFilename(const char *,
-					      const char *,
-					      grammar *, int,
-                                              perrdetail *, int);
-PyAPI_FUNC(node *) PyParser_ParseStringFlagsFilenameEx(const char *,
-					      const char *,
-					      grammar *, int,
-                                              perrdetail *, int *);
-
-/* Note that he following function is defined in pythonrun.c not parsetok.c. */
-PyAPI_FUNC(void) PyParser_SetError(perrdetail *);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_PARSETOK_H */
+ 
+/* Parser-tokenizer link interface */ 
+ 
+#ifndef Py_PARSETOK_H 
+#define Py_PARSETOK_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+typedef struct { 
+    int error; 
+    const char *filename; 
+    int lineno; 
+    int offset; 
+    char *text; 
+    int token; 
+    int expected; 
+} perrdetail; 
+ 
+#if 0 
+#define PyPARSE_YIELD_IS_KEYWORD	0x0001 
+#endif 
+ 
+#define PyPARSE_DONT_IMPLY_DEDENT	0x0002 
+ 
+#if 0 
+#define PyPARSE_WITH_IS_KEYWORD		0x0003 
+#endif 
+ 
+#define PyPARSE_PRINT_IS_FUNCTION       0x0004 
+#define PyPARSE_UNICODE_LITERALS        0x0008 
+ 
+ 
+ 
+PyAPI_FUNC(node *) PyParser_ParseString(const char *, grammar *, int, 
+                                              perrdetail *); 
+PyAPI_FUNC(node *) PyParser_ParseFile (FILE *, const char *, grammar *, int, 
+                                             char *, char *, perrdetail *); 
+ 
+PyAPI_FUNC(node *) PyParser_ParseStringFlags(const char *, grammar *, int, 
+                                              perrdetail *, int); 
+PyAPI_FUNC(node *) PyParser_ParseFileFlags(FILE *, const char *, grammar *, 
+						 int, char *, char *, 
+						 perrdetail *, int); 
+PyAPI_FUNC(node *) PyParser_ParseFileFlagsEx(FILE *, const char *, grammar *, 
+						 int, char *, char *, 
+						 perrdetail *, int *); 
+ 
+PyAPI_FUNC(node *) PyParser_ParseStringFlagsFilename(const char *, 
+					      const char *, 
+					      grammar *, int, 
+                                              perrdetail *, int); 
+PyAPI_FUNC(node *) PyParser_ParseStringFlagsFilenameEx(const char *, 
+					      const char *, 
+					      grammar *, int, 
+                                              perrdetail *, int *); 
+ 
+/* Note that he following function is defined in pythonrun.c not parsetok.c. */ 
+PyAPI_FUNC(void) PyParser_SetError(perrdetail *); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_PARSETOK_H */ 
diff --git a/contrib/tools/python/src/Include/patchlevel.h b/contrib/tools/python/src/Include/patchlevel.h
index b12d901685..9bef34444f 100644
--- a/contrib/tools/python/src/Include/patchlevel.h
+++ b/contrib/tools/python/src/Include/patchlevel.h
@@ -1,43 +1,43 @@
-
-/* Newfangled version identification scheme.
-
-   This scheme was added in Python 1.5.2b2; before that time, only PATCHLEVEL
-   was available.  To test for presence of the scheme, test for
-   defined(PY_MAJOR_VERSION).
-
-   When the major or minor version changes, the VERSION variable in
+ 
+/* Newfangled version identification scheme. 
+ 
+   This scheme was added in Python 1.5.2b2; before that time, only PATCHLEVEL 
+   was available.  To test for presence of the scheme, test for 
+   defined(PY_MAJOR_VERSION). 
+ 
+   When the major or minor version changes, the VERSION variable in 
    configure.ac must also be changed.
-
-   There is also (independent) API version information in modsupport.h.
-*/
-
-/* Values for PY_RELEASE_LEVEL */
-#define PY_RELEASE_LEVEL_ALPHA	0xA
-#define PY_RELEASE_LEVEL_BETA	0xB
-#define PY_RELEASE_LEVEL_GAMMA	0xC     /* For release candidates */
-#define PY_RELEASE_LEVEL_FINAL	0xF	/* Serial should be 0 here */
-					/* Higher for patch releases */
-
-/* Version parsed out into numeric values */
-/*--start constants--*/
-#define PY_MAJOR_VERSION	2
-#define PY_MINOR_VERSION	7
+ 
+   There is also (independent) API version information in modsupport.h. 
+*/ 
+ 
+/* Values for PY_RELEASE_LEVEL */ 
+#define PY_RELEASE_LEVEL_ALPHA	0xA 
+#define PY_RELEASE_LEVEL_BETA	0xB 
+#define PY_RELEASE_LEVEL_GAMMA	0xC     /* For release candidates */ 
+#define PY_RELEASE_LEVEL_FINAL	0xF	/* Serial should be 0 here */ 
+					/* Higher for patch releases */ 
+ 
+/* Version parsed out into numeric values */ 
+/*--start constants--*/ 
+#define PY_MAJOR_VERSION	2 
+#define PY_MINOR_VERSION	7 
 #define PY_MICRO_VERSION	16
-#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_FINAL
-#define PY_RELEASE_SERIAL	0
-
-/* Version as a string */
+#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_FINAL 
+#define PY_RELEASE_SERIAL	0 
+ 
+/* Version as a string */ 
 #define PY_VERSION      	"2.7.16"
-/*--end constants--*/
-
-/* Subversion Revision number of this file (not of the repository). Empty
-   since Mercurial migration. */
-#define PY_PATCHLEVEL_REVISION  ""
-
-/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
-   Use this for numeric comparisons, e.g. #if PY_VERSION_HEX >= ... */
-#define PY_VERSION_HEX ((PY_MAJOR_VERSION << 24) | \
-			(PY_MINOR_VERSION << 16) | \
-			(PY_MICRO_VERSION <<  8) | \
-			(PY_RELEASE_LEVEL <<  4) | \
-			(PY_RELEASE_SERIAL << 0))
+/*--end constants--*/ 
+ 
+/* Subversion Revision number of this file (not of the repository). Empty 
+   since Mercurial migration. */ 
+#define PY_PATCHLEVEL_REVISION  "" 
+ 
+/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2. 
+   Use this for numeric comparisons, e.g. #if PY_VERSION_HEX >= ... */ 
+#define PY_VERSION_HEX ((PY_MAJOR_VERSION << 24) | \ 
+			(PY_MINOR_VERSION << 16) | \ 
+			(PY_MICRO_VERSION <<  8) | \ 
+			(PY_RELEASE_LEVEL <<  4) | \ 
+			(PY_RELEASE_SERIAL << 0)) 
diff --git a/contrib/tools/python/src/Include/pgen.h b/contrib/tools/python/src/Include/pgen.h
index 8a325ed074..73c463488c 100644
--- a/contrib/tools/python/src/Include/pgen.h
+++ b/contrib/tools/python/src/Include/pgen.h
@@ -1,18 +1,18 @@
-#ifndef Py_PGEN_H
-#define Py_PGEN_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Parser generator interface */
-
-extern grammar *meta_grammar(void);
-
-struct _node;
-extern grammar *pgen(struct _node *);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_PGEN_H */
+#ifndef Py_PGEN_H 
+#define Py_PGEN_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+ 
+/* Parser generator interface */ 
+ 
+extern grammar *meta_grammar(void); 
+ 
+struct _node; 
+extern grammar *pgen(struct _node *); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_PGEN_H */ 
diff --git a/contrib/tools/python/src/Include/pgenheaders.h b/contrib/tools/python/src/Include/pgenheaders.h
index 4843de6c02..69692cd7b2 100644
--- a/contrib/tools/python/src/Include/pgenheaders.h
+++ b/contrib/tools/python/src/Include/pgenheaders.h
@@ -1,43 +1,43 @@
-#ifndef Py_PGENHEADERS_H
-#define Py_PGENHEADERS_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Include files and extern declarations used by most of the parser. */
-
-#include "Python.h"
-
-PyAPI_FUNC(void) PySys_WriteStdout(const char *format, ...)
-			Py_GCC_ATTRIBUTE((format(printf, 1, 2)));
-PyAPI_FUNC(void) PySys_WriteStderr(const char *format, ...)
-			Py_GCC_ATTRIBUTE((format(printf, 1, 2)));
-
-#define addarc _Py_addarc
-#define addbit _Py_addbit
-#define adddfa _Py_adddfa
-#define addfirstsets _Py_addfirstsets
-#define addlabel _Py_addlabel
-#define addstate _Py_addstate
-#define delbitset _Py_delbitset
-#define dumptree _Py_dumptree
-#define findlabel _Py_findlabel
+#ifndef Py_PGENHEADERS_H 
+#define Py_PGENHEADERS_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+ 
+/* Include files and extern declarations used by most of the parser. */ 
+ 
+#include "Python.h" 
+ 
+PyAPI_FUNC(void) PySys_WriteStdout(const char *format, ...) 
+			Py_GCC_ATTRIBUTE((format(printf, 1, 2))); 
+PyAPI_FUNC(void) PySys_WriteStderr(const char *format, ...) 
+			Py_GCC_ATTRIBUTE((format(printf, 1, 2))); 
+ 
+#define addarc _Py_addarc 
+#define addbit _Py_addbit 
+#define adddfa _Py_adddfa 
+#define addfirstsets _Py_addfirstsets 
+#define addlabel _Py_addlabel 
+#define addstate _Py_addstate 
+#define delbitset _Py_delbitset 
+#define dumptree _Py_dumptree 
+#define findlabel _Py_findlabel 
 #define freegrammar _Py_freegrammar
-#define mergebitset _Py_mergebitset
-#define meta_grammar _Py_meta_grammar
-#define newbitset _Py_newbitset
-#define newgrammar _Py_newgrammar
-#define pgen _Py_pgen
-#define printgrammar _Py_printgrammar
-#define printnonterminals _Py_printnonterminals
-#define printtree _Py_printtree
-#define samebitset _Py_samebitset
-#define showtree _Py_showtree
-#define tok_dump _Py_tok_dump
-#define translatelabels _Py_translatelabels
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_PGENHEADERS_H */
+#define mergebitset _Py_mergebitset 
+#define meta_grammar _Py_meta_grammar 
+#define newbitset _Py_newbitset 
+#define newgrammar _Py_newgrammar 
+#define pgen _Py_pgen 
+#define printgrammar _Py_printgrammar 
+#define printnonterminals _Py_printnonterminals 
+#define printtree _Py_printtree 
+#define samebitset _Py_samebitset 
+#define showtree _Py_showtree 
+#define tok_dump _Py_tok_dump 
+#define translatelabels _Py_translatelabels 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_PGENHEADERS_H */ 
diff --git a/contrib/tools/python/src/Include/py_curses.h b/contrib/tools/python/src/Include/py_curses.h
index eb77e35d8b..705ef68299 100644
--- a/contrib/tools/python/src/Include/py_curses.h
+++ b/contrib/tools/python/src/Include/py_curses.h
@@ -1,44 +1,44 @@
-
-#ifndef Py_CURSES_H
-#define Py_CURSES_H
-
-#ifdef __APPLE__
-/*
-** On Mac OS X 10.2 [n]curses.h and stdlib.h use different guards
-** against multiple definition of wchar_t.
-*/
+ 
+#ifndef Py_CURSES_H 
+#define Py_CURSES_H 
+ 
+#ifdef __APPLE__ 
+/* 
+** On Mac OS X 10.2 [n]curses.h and stdlib.h use different guards 
+** against multiple definition of wchar_t. 
+*/ 
 #ifdef _BSD_WCHAR_T_DEFINED_
-#define _WCHAR_T
-#endif
-#endif /* __APPLE__ */
-
-#ifdef __FreeBSD__
-/*
-** On FreeBSD, [n]curses.h and stdlib.h/wchar.h use different guards
-** against multiple definition of wchar_t and wint_t.
-*/
+#define _WCHAR_T 
+#endif 
+#endif /* __APPLE__ */ 
+ 
+#ifdef __FreeBSD__ 
+/* 
+** On FreeBSD, [n]curses.h and stdlib.h/wchar.h use different guards 
+** against multiple definition of wchar_t and wint_t. 
+*/ 
 #ifdef _XOPEN_SOURCE_EXTENDED
-#ifndef __FreeBSD_version
-#include <osreldate.h>
-#endif
-#if __FreeBSD_version >= 500000
-#ifndef __wchar_t
-#define __wchar_t
-#endif
-#ifndef __wint_t
-#define __wint_t
-#endif
-#else
-#ifndef _WCHAR_T
-#define _WCHAR_T
-#endif
-#ifndef _WINT_T
-#define _WINT_T
-#endif
-#endif
-#endif
-#endif
-
+#ifndef __FreeBSD_version 
+#include <osreldate.h> 
+#endif 
+#if __FreeBSD_version >= 500000 
+#ifndef __wchar_t 
+#define __wchar_t 
+#endif 
+#ifndef __wint_t 
+#define __wint_t 
+#endif 
+#else 
+#ifndef _WCHAR_T 
+#define _WCHAR_T 
+#endif 
+#ifndef _WINT_T 
+#define _WINT_T 
+#endif 
+#endif 
+#endif 
+#endif 
+ 
 #if !defined(HAVE_CURSES_IS_PAD) && defined(WINDOW_HAS_FLAGS)
 /* The following definition is necessary for ncurses 5.7; without it,
    some of [n]curses.h set NCURSES_OPAQUE to 1, and then Python
@@ -46,132 +46,132 @@
 #define NCURSES_OPAQUE 0
 #endif
 
-#ifdef HAVE_NCURSES_H
-#include <ncurses.h>
-#else
-#include <curses.h>
-#endif
-
-#ifdef HAVE_NCURSES_H
-/* configure was checking <curses.h>, but we will
+#ifdef HAVE_NCURSES_H 
+#include <ncurses.h> 
+#else 
+#include <curses.h> 
+#endif 
+ 
+#ifdef HAVE_NCURSES_H 
+/* configure was checking <curses.h>, but we will 
    use <ncurses.h>, which has some or all these features. */
 #if !defined(WINDOW_HAS_FLAGS) && !(NCURSES_OPAQUE+0)
-#define WINDOW_HAS_FLAGS 1
-#endif
+#define WINDOW_HAS_FLAGS 1 
+#endif 
 #if !defined(HAVE_CURSES_IS_PAD) && NCURSES_VERSION_PATCH+0 >= 20090906
 #define HAVE_CURSES_IS_PAD 1
 #endif
-#ifndef MVWDELCH_IS_EXPRESSION
-#define MVWDELCH_IS_EXPRESSION 1
-#endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define PyCurses_API_pointers 4
-
-/* Type declarations */
-
-typedef struct {
+#ifndef MVWDELCH_IS_EXPRESSION 
+#define MVWDELCH_IS_EXPRESSION 1 
+#endif 
+#endif 
+ 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+#define PyCurses_API_pointers 4 
+ 
+/* Type declarations */ 
+ 
+typedef struct { 
     PyObject_HEAD
     WINDOW *win;
-} PyCursesWindowObject;
-
+} PyCursesWindowObject; 
+ 
 #define PyCursesWindow_Check(v)  (Py_TYPE(v) == &PyCursesWindow_Type)
-
-#define PyCurses_CAPSULE_NAME "_curses._C_API"
-
-
-#ifdef CURSES_MODULE
-/* This section is used when compiling _cursesmodule.c */
-
-#else
-/* This section is used in modules that use the _cursesmodule API */
-
-static void **PyCurses_API;
-
-#define PyCursesWindow_Type (*(PyTypeObject *) PyCurses_API[0])
-#define PyCursesSetupTermCalled  {if (! ((int (*)(void))PyCurses_API[1]) () ) return NULL;}
-#define PyCursesInitialised      {if (! ((int (*)(void))PyCurses_API[2]) () ) return NULL;}
-#define PyCursesInitialisedColor {if (! ((int (*)(void))PyCurses_API[3]) () ) return NULL;}
-
-#define import_curses() \
-    PyCurses_API = (void **)PyCapsule_Import(PyCurses_CAPSULE_NAME, 1);
-
-#endif
-
-/* general error messages */
-static char *catchall_ERR  = "curses function returned ERR";
-static char *catchall_NULL = "curses function returned NULL";
-
-/* Function Prototype Macros - They are ugly but very, very useful. ;-)
-
-   X - function name
-   TYPE - parameter Type
-   ERGSTR - format string for construction of the return value
-   PARSESTR - format string for argument parsing
-   */
-
-#define NoArgNoReturnFunction(X) \
-static PyObject *PyCurses_ ## X (PyObject *self) \
-{ \
-  PyCursesInitialised \
-  return PyCursesCheckERR(X(), # X); }
-
-#define NoArgOrFlagNoReturnFunction(X) \
-static PyObject *PyCurses_ ## X (PyObject *self, PyObject *args) \
-{ \
-  int flag = 0; \
-  PyCursesInitialised \
-  switch(PyTuple_Size(args)) { \
-  case 0: \
-    return PyCursesCheckERR(X(), # X); \
-  case 1: \
-    if (!PyArg_ParseTuple(args, "i;True(1) or False(0)", &flag)) return NULL; \
-    if (flag) return PyCursesCheckERR(X(), # X); \
-    else return PyCursesCheckERR(no ## X (), # X); \
-  default: \
-    PyErr_SetString(PyExc_TypeError, # X " requires 0 or 1 arguments"); \
-    return NULL; } }
-
-#define NoArgReturnIntFunction(X) \
-static PyObject *PyCurses_ ## X (PyObject *self) \
-{ \
- PyCursesInitialised \
- return PyInt_FromLong((long) X()); }
-
-
-#define NoArgReturnStringFunction(X) \
-static PyObject *PyCurses_ ## X (PyObject *self) \
-{ \
-  PyCursesInitialised \
-  return PyString_FromString(X()); }
-
-#define NoArgTrueFalseFunction(X) \
-static PyObject *PyCurses_ ## X (PyObject *self) \
-{ \
-  PyCursesInitialised \
-  if (X () == FALSE) { \
-    Py_INCREF(Py_False); \
-    return Py_False; \
-  } \
-  Py_INCREF(Py_True); \
-  return Py_True; }
-
-#define NoArgNoReturnVoidFunction(X) \
-static PyObject *PyCurses_ ## X (PyObject *self) \
-{ \
-  PyCursesInitialised \
-  X(); \
-  Py_INCREF(Py_None); \
-  return Py_None; }
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !defined(Py_CURSES_H) */
-
-
+ 
+#define PyCurses_CAPSULE_NAME "_curses._C_API" 
+ 
+ 
+#ifdef CURSES_MODULE 
+/* This section is used when compiling _cursesmodule.c */ 
+ 
+#else 
+/* This section is used in modules that use the _cursesmodule API */ 
+ 
+static void **PyCurses_API; 
+ 
+#define PyCursesWindow_Type (*(PyTypeObject *) PyCurses_API[0]) 
+#define PyCursesSetupTermCalled  {if (! ((int (*)(void))PyCurses_API[1]) () ) return NULL;} 
+#define PyCursesInitialised      {if (! ((int (*)(void))PyCurses_API[2]) () ) return NULL;} 
+#define PyCursesInitialisedColor {if (! ((int (*)(void))PyCurses_API[3]) () ) return NULL;} 
+ 
+#define import_curses() \ 
+    PyCurses_API = (void **)PyCapsule_Import(PyCurses_CAPSULE_NAME, 1); 
+ 
+#endif 
+ 
+/* general error messages */ 
+static char *catchall_ERR  = "curses function returned ERR"; 
+static char *catchall_NULL = "curses function returned NULL"; 
+ 
+/* Function Prototype Macros - They are ugly but very, very useful. ;-) 
+ 
+   X - function name 
+   TYPE - parameter Type 
+   ERGSTR - format string for construction of the return value 
+   PARSESTR - format string for argument parsing 
+   */ 
+ 
+#define NoArgNoReturnFunction(X) \ 
+static PyObject *PyCurses_ ## X (PyObject *self) \ 
+{ \ 
+  PyCursesInitialised \ 
+  return PyCursesCheckERR(X(), # X); } 
+ 
+#define NoArgOrFlagNoReturnFunction(X) \ 
+static PyObject *PyCurses_ ## X (PyObject *self, PyObject *args) \ 
+{ \ 
+  int flag = 0; \ 
+  PyCursesInitialised \ 
+  switch(PyTuple_Size(args)) { \ 
+  case 0: \ 
+    return PyCursesCheckERR(X(), # X); \ 
+  case 1: \ 
+    if (!PyArg_ParseTuple(args, "i;True(1) or False(0)", &flag)) return NULL; \ 
+    if (flag) return PyCursesCheckERR(X(), # X); \ 
+    else return PyCursesCheckERR(no ## X (), # X); \ 
+  default: \ 
+    PyErr_SetString(PyExc_TypeError, # X " requires 0 or 1 arguments"); \ 
+    return NULL; } } 
+ 
+#define NoArgReturnIntFunction(X) \ 
+static PyObject *PyCurses_ ## X (PyObject *self) \ 
+{ \ 
+ PyCursesInitialised \ 
+ return PyInt_FromLong((long) X()); } 
+ 
+ 
+#define NoArgReturnStringFunction(X) \ 
+static PyObject *PyCurses_ ## X (PyObject *self) \ 
+{ \ 
+  PyCursesInitialised \ 
+  return PyString_FromString(X()); } 
+ 
+#define NoArgTrueFalseFunction(X) \ 
+static PyObject *PyCurses_ ## X (PyObject *self) \ 
+{ \ 
+  PyCursesInitialised \ 
+  if (X () == FALSE) { \ 
+    Py_INCREF(Py_False); \ 
+    return Py_False; \ 
+  } \ 
+  Py_INCREF(Py_True); \ 
+  return Py_True; } 
+ 
+#define NoArgNoReturnVoidFunction(X) \ 
+static PyObject *PyCurses_ ## X (PyObject *self) \ 
+{ \ 
+  PyCursesInitialised \ 
+  X(); \ 
+  Py_INCREF(Py_None); \ 
+  return Py_None; } 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+ 
+#endif /* !defined(Py_CURSES_H) */ 
+ 
+ 
diff --git a/contrib/tools/python/src/Include/pyarena.h b/contrib/tools/python/src/Include/pyarena.h
index 5f193fecee..7431311212 100644
--- a/contrib/tools/python/src/Include/pyarena.h
+++ b/contrib/tools/python/src/Include/pyarena.h
@@ -1,62 +1,62 @@
-/* An arena-like memory interface for the compiler.
- */
-
-#ifndef Py_PYARENA_H
-#define Py_PYARENA_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-  typedef struct _arena PyArena;
-
-  /* PyArena_New() and PyArena_Free() create a new arena and free it,
-     respectively.  Once an arena has been created, it can be used
-     to allocate memory via PyArena_Malloc().  Pointers to PyObject can
-     also be registered with the arena via PyArena_AddPyObject(), and the
-     arena will ensure that the PyObjects stay alive at least until
-     PyArena_Free() is called.  When an arena is freed, all the memory it
-     allocated is freed, the arena releases internal references to registered
-     PyObject*, and none of its pointers are valid.
-     XXX (tim) What does "none of its pointers are valid" mean?  Does it
-     XXX mean that pointers previously obtained via PyArena_Malloc() are
-     XXX no longer valid?  (That's clearly true, but not sure that's what
-     XXX the text is trying to say.)
-
-     PyArena_New() returns an arena pointer.  On error, it
-     returns a negative number and sets an exception.
-     XXX (tim):  Not true.  On error, PyArena_New() actually returns NULL,
-     XXX and looks like it may or may not set an exception (e.g., if the
-     XXX internal PyList_New(0) returns NULL, PyArena_New() passes that on
-     XXX and an exception is set; OTOH, if the internal
-     XXX block_new(DEFAULT_BLOCK_SIZE) returns NULL, that's passed on but
-     XXX an exception is not set in that case).
-  */
-  PyAPI_FUNC(PyArena *) PyArena_New(void);
-  PyAPI_FUNC(void) PyArena_Free(PyArena *);
-
-  /* Mostly like malloc(), return the address of a block of memory spanning
-   * `size` bytes, or return NULL (without setting an exception) if enough
-   * new memory can't be obtained.  Unlike malloc(0), PyArena_Malloc() with
-   * size=0 does not guarantee to return a unique pointer (the pointer
-   * returned may equal one or more other pointers obtained from
-   * PyArena_Malloc()).
-   * Note that pointers obtained via PyArena_Malloc() must never be passed to
-   * the system free() or realloc(), or to any of Python's similar memory-
-   * management functions.  PyArena_Malloc()-obtained pointers remain valid
-   * until PyArena_Free(ar) is called, at which point all pointers obtained
-   * from the arena `ar` become invalid simultaneously.
-   */
-  PyAPI_FUNC(void *) PyArena_Malloc(PyArena *, size_t size);
-
-  /* This routine isn't a proper arena allocation routine.  It takes
-   * a PyObject* and records it so that it can be DECREFed when the
-   * arena is freed.
-   */
-  PyAPI_FUNC(int) PyArena_AddPyObject(PyArena *, PyObject *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !Py_PYARENA_H */
+/* An arena-like memory interface for the compiler. 
+ */ 
+ 
+#ifndef Py_PYARENA_H 
+#define Py_PYARENA_H 
+ 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+  typedef struct _arena PyArena; 
+ 
+  /* PyArena_New() and PyArena_Free() create a new arena and free it, 
+     respectively.  Once an arena has been created, it can be used 
+     to allocate memory via PyArena_Malloc().  Pointers to PyObject can 
+     also be registered with the arena via PyArena_AddPyObject(), and the 
+     arena will ensure that the PyObjects stay alive at least until 
+     PyArena_Free() is called.  When an arena is freed, all the memory it 
+     allocated is freed, the arena releases internal references to registered 
+     PyObject*, and none of its pointers are valid. 
+     XXX (tim) What does "none of its pointers are valid" mean?  Does it 
+     XXX mean that pointers previously obtained via PyArena_Malloc() are 
+     XXX no longer valid?  (That's clearly true, but not sure that's what 
+     XXX the text is trying to say.) 
+ 
+     PyArena_New() returns an arena pointer.  On error, it 
+     returns a negative number and sets an exception. 
+     XXX (tim):  Not true.  On error, PyArena_New() actually returns NULL, 
+     XXX and looks like it may or may not set an exception (e.g., if the 
+     XXX internal PyList_New(0) returns NULL, PyArena_New() passes that on 
+     XXX and an exception is set; OTOH, if the internal 
+     XXX block_new(DEFAULT_BLOCK_SIZE) returns NULL, that's passed on but 
+     XXX an exception is not set in that case). 
+  */ 
+  PyAPI_FUNC(PyArena *) PyArena_New(void); 
+  PyAPI_FUNC(void) PyArena_Free(PyArena *); 
+ 
+  /* Mostly like malloc(), return the address of a block of memory spanning 
+   * `size` bytes, or return NULL (without setting an exception) if enough 
+   * new memory can't be obtained.  Unlike malloc(0), PyArena_Malloc() with 
+   * size=0 does not guarantee to return a unique pointer (the pointer 
+   * returned may equal one or more other pointers obtained from 
+   * PyArena_Malloc()). 
+   * Note that pointers obtained via PyArena_Malloc() must never be passed to 
+   * the system free() or realloc(), or to any of Python's similar memory- 
+   * management functions.  PyArena_Malloc()-obtained pointers remain valid 
+   * until PyArena_Free(ar) is called, at which point all pointers obtained 
+   * from the arena `ar` become invalid simultaneously. 
+   */ 
+  PyAPI_FUNC(void *) PyArena_Malloc(PyArena *, size_t size); 
+ 
+  /* This routine isn't a proper arena allocation routine.  It takes 
+   * a PyObject* and records it so that it can be DECREFed when the 
+   * arena is freed. 
+   */ 
+  PyAPI_FUNC(int) PyArena_AddPyObject(PyArena *, PyObject *); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+ 
+#endif /* !Py_PYARENA_H */ 
diff --git a/contrib/tools/python/src/Include/pycapsule.h b/contrib/tools/python/src/Include/pycapsule.h
index cd682fc7de..418964f26e 100644
--- a/contrib/tools/python/src/Include/pycapsule.h
+++ b/contrib/tools/python/src/Include/pycapsule.h
@@ -1,56 +1,56 @@
-
-/* Capsule objects let you wrap a C "void *" pointer in a Python
-   object.  They're a way of passing data through the Python interpreter
-   without creating your own custom type.
-
-   Capsules are used for communication between extension modules.
-   They provide a way for an extension module to export a C interface
-   to other extension modules, so that extension modules can use the
-   Python import mechanism to link to one another.
-
-   For more information, please see "c-api/capsule.html" in the
-   documentation.
-*/
-
-#ifndef Py_CAPSULE_H
-#define Py_CAPSULE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_DATA(PyTypeObject) PyCapsule_Type;
-
-typedef void (*PyCapsule_Destructor)(PyObject *);
-
-#define PyCapsule_CheckExact(op) (Py_TYPE(op) == &PyCapsule_Type)
-
-
-PyAPI_FUNC(PyObject *) PyCapsule_New(
-    void *pointer,
-    const char *name,
-    PyCapsule_Destructor destructor);
-
-PyAPI_FUNC(void *) PyCapsule_GetPointer(PyObject *capsule, const char *name);
-
-PyAPI_FUNC(PyCapsule_Destructor) PyCapsule_GetDestructor(PyObject *capsule);
-
-PyAPI_FUNC(const char *) PyCapsule_GetName(PyObject *capsule);
-
-PyAPI_FUNC(void *) PyCapsule_GetContext(PyObject *capsule);
-
-PyAPI_FUNC(int) PyCapsule_IsValid(PyObject *capsule, const char *name);
-
-PyAPI_FUNC(int) PyCapsule_SetPointer(PyObject *capsule, void *pointer);
-
-PyAPI_FUNC(int) PyCapsule_SetDestructor(PyObject *capsule, PyCapsule_Destructor destructor);
-
-PyAPI_FUNC(int) PyCapsule_SetName(PyObject *capsule, const char *name);
-
-PyAPI_FUNC(int) PyCapsule_SetContext(PyObject *capsule, void *context);
-
-PyAPI_FUNC(void *) PyCapsule_Import(const char *name, int no_block);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_CAPSULE_H */
+ 
+/* Capsule objects let you wrap a C "void *" pointer in a Python 
+   object.  They're a way of passing data through the Python interpreter 
+   without creating your own custom type. 
+ 
+   Capsules are used for communication between extension modules. 
+   They provide a way for an extension module to export a C interface 
+   to other extension modules, so that extension modules can use the 
+   Python import mechanism to link to one another. 
+ 
+   For more information, please see "c-api/capsule.html" in the 
+   documentation. 
+*/ 
+ 
+#ifndef Py_CAPSULE_H 
+#define Py_CAPSULE_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+PyAPI_DATA(PyTypeObject) PyCapsule_Type; 
+ 
+typedef void (*PyCapsule_Destructor)(PyObject *); 
+ 
+#define PyCapsule_CheckExact(op) (Py_TYPE(op) == &PyCapsule_Type) 
+ 
+ 
+PyAPI_FUNC(PyObject *) PyCapsule_New( 
+    void *pointer, 
+    const char *name, 
+    PyCapsule_Destructor destructor); 
+ 
+PyAPI_FUNC(void *) PyCapsule_GetPointer(PyObject *capsule, const char *name); 
+ 
+PyAPI_FUNC(PyCapsule_Destructor) PyCapsule_GetDestructor(PyObject *capsule); 
+ 
+PyAPI_FUNC(const char *) PyCapsule_GetName(PyObject *capsule); 
+ 
+PyAPI_FUNC(void *) PyCapsule_GetContext(PyObject *capsule); 
+ 
+PyAPI_FUNC(int) PyCapsule_IsValid(PyObject *capsule, const char *name); 
+ 
+PyAPI_FUNC(int) PyCapsule_SetPointer(PyObject *capsule, void *pointer); 
+ 
+PyAPI_FUNC(int) PyCapsule_SetDestructor(PyObject *capsule, PyCapsule_Destructor destructor); 
+ 
+PyAPI_FUNC(int) PyCapsule_SetName(PyObject *capsule, const char *name); 
+ 
+PyAPI_FUNC(int) PyCapsule_SetContext(PyObject *capsule, void *context); 
+ 
+PyAPI_FUNC(void *) PyCapsule_Import(const char *name, int no_block); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_CAPSULE_H */ 
diff --git a/contrib/tools/python/src/Include/pyctype.h b/contrib/tools/python/src/Include/pyctype.h
index 673cf2eb00..a7d566558a 100644
--- a/contrib/tools/python/src/Include/pyctype.h
+++ b/contrib/tools/python/src/Include/pyctype.h
@@ -1,31 +1,31 @@
-#ifndef PYCTYPE_H
-#define PYCTYPE_H
-
-#define PY_CTF_LOWER  0x01
-#define PY_CTF_UPPER  0x02
-#define PY_CTF_ALPHA  (PY_CTF_LOWER|PY_CTF_UPPER)
-#define PY_CTF_DIGIT  0x04
-#define PY_CTF_ALNUM  (PY_CTF_ALPHA|PY_CTF_DIGIT)
-#define PY_CTF_SPACE  0x08
-#define PY_CTF_XDIGIT 0x10
-
-PyAPI_DATA(const unsigned int) _Py_ctype_table[256];
-
-/* Unlike their C counterparts, the following macros are not meant to
- * handle an int with any of the values [EOF, 0-UCHAR_MAX]. The argument
- * must be a signed/unsigned char. */
-#define Py_ISLOWER(c)  (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_LOWER)
-#define Py_ISUPPER(c)  (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_UPPER)
-#define Py_ISALPHA(c)  (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_ALPHA)
-#define Py_ISDIGIT(c)  (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_DIGIT)
-#define Py_ISXDIGIT(c) (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_XDIGIT)
-#define Py_ISALNUM(c)  (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_ALNUM)
-#define Py_ISSPACE(c)  (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_SPACE)
-
-PyAPI_DATA(const unsigned char) _Py_ctype_tolower[256];
-PyAPI_DATA(const unsigned char) _Py_ctype_toupper[256];
-
-#define Py_TOLOWER(c) (_Py_ctype_tolower[Py_CHARMASK(c)])
-#define Py_TOUPPER(c) (_Py_ctype_toupper[Py_CHARMASK(c)])
-
-#endif /* !PYCTYPE_H */
+#ifndef PYCTYPE_H 
+#define PYCTYPE_H 
+ 
+#define PY_CTF_LOWER  0x01 
+#define PY_CTF_UPPER  0x02 
+#define PY_CTF_ALPHA  (PY_CTF_LOWER|PY_CTF_UPPER) 
+#define PY_CTF_DIGIT  0x04 
+#define PY_CTF_ALNUM  (PY_CTF_ALPHA|PY_CTF_DIGIT) 
+#define PY_CTF_SPACE  0x08 
+#define PY_CTF_XDIGIT 0x10 
+ 
+PyAPI_DATA(const unsigned int) _Py_ctype_table[256]; 
+ 
+/* Unlike their C counterparts, the following macros are not meant to 
+ * handle an int with any of the values [EOF, 0-UCHAR_MAX]. The argument 
+ * must be a signed/unsigned char. */ 
+#define Py_ISLOWER(c)  (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_LOWER) 
+#define Py_ISUPPER(c)  (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_UPPER) 
+#define Py_ISALPHA(c)  (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_ALPHA) 
+#define Py_ISDIGIT(c)  (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_DIGIT) 
+#define Py_ISXDIGIT(c) (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_XDIGIT) 
+#define Py_ISALNUM(c)  (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_ALNUM) 
+#define Py_ISSPACE(c)  (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_SPACE) 
+ 
+PyAPI_DATA(const unsigned char) _Py_ctype_tolower[256]; 
+PyAPI_DATA(const unsigned char) _Py_ctype_toupper[256]; 
+ 
+#define Py_TOLOWER(c) (_Py_ctype_tolower[Py_CHARMASK(c)]) 
+#define Py_TOUPPER(c) (_Py_ctype_toupper[Py_CHARMASK(c)]) 
+ 
+#endif /* !PYCTYPE_H */ 
diff --git a/contrib/tools/python/src/Include/pydebug.h b/contrib/tools/python/src/Include/pydebug.h
index 0f45960f90..bb5f7fa4b9 100644
--- a/contrib/tools/python/src/Include/pydebug.h
+++ b/contrib/tools/python/src/Include/pydebug.h
@@ -1,41 +1,41 @@
-
-#ifndef Py_PYDEBUG_H
-#define Py_PYDEBUG_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_DATA(int) Py_DebugFlag;
-PyAPI_DATA(int) Py_VerboseFlag;
-PyAPI_DATA(int) Py_InteractiveFlag;
-PyAPI_DATA(int) Py_InspectFlag;
-PyAPI_DATA(int) Py_OptimizeFlag;
-PyAPI_DATA(int) Py_NoSiteFlag;
-PyAPI_DATA(int) Py_BytesWarningFlag;
-PyAPI_DATA(int) Py_UseClassExceptionsFlag;
-PyAPI_DATA(int) Py_FrozenFlag;
-PyAPI_DATA(int) Py_TabcheckFlag;
-PyAPI_DATA(int) Py_UnicodeFlag;
-PyAPI_DATA(int) Py_IgnoreEnvironmentFlag;
-PyAPI_DATA(int) Py_DivisionWarningFlag;
-PyAPI_DATA(int) Py_DontWriteBytecodeFlag;
-PyAPI_DATA(int) Py_NoUserSiteDirectory;
-/* _XXX Py_QnewFlag should go away in 3.0.  It's true iff -Qnew is passed,
-  on the command line, and is used in 2.2 by ceval.c to make all "/" divisions
-  true divisions (which they will be in 3.0). */
-PyAPI_DATA(int) _Py_QnewFlag;
-/* Warn about 3.x issues */
-PyAPI_DATA(int) Py_Py3kWarningFlag;
-PyAPI_DATA(int) Py_HashRandomizationFlag;
-
-/* this is a wrapper around getenv() that pays attention to
-   Py_IgnoreEnvironmentFlag.  It should be used for getting variables like
-   PYTHONPATH and PYTHONHOME from the environment */
-#define Py_GETENV(s) (Py_IgnoreEnvironmentFlag ? NULL : getenv(s))
-
-PyAPI_FUNC(void) Py_FatalError(const char *message);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_PYDEBUG_H */
+ 
+#ifndef Py_PYDEBUG_H 
+#define Py_PYDEBUG_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+PyAPI_DATA(int) Py_DebugFlag; 
+PyAPI_DATA(int) Py_VerboseFlag; 
+PyAPI_DATA(int) Py_InteractiveFlag; 
+PyAPI_DATA(int) Py_InspectFlag; 
+PyAPI_DATA(int) Py_OptimizeFlag; 
+PyAPI_DATA(int) Py_NoSiteFlag; 
+PyAPI_DATA(int) Py_BytesWarningFlag; 
+PyAPI_DATA(int) Py_UseClassExceptionsFlag; 
+PyAPI_DATA(int) Py_FrozenFlag; 
+PyAPI_DATA(int) Py_TabcheckFlag; 
+PyAPI_DATA(int) Py_UnicodeFlag; 
+PyAPI_DATA(int) Py_IgnoreEnvironmentFlag; 
+PyAPI_DATA(int) Py_DivisionWarningFlag; 
+PyAPI_DATA(int) Py_DontWriteBytecodeFlag; 
+PyAPI_DATA(int) Py_NoUserSiteDirectory; 
+/* _XXX Py_QnewFlag should go away in 3.0.  It's true iff -Qnew is passed, 
+  on the command line, and is used in 2.2 by ceval.c to make all "/" divisions 
+  true divisions (which they will be in 3.0). */ 
+PyAPI_DATA(int) _Py_QnewFlag; 
+/* Warn about 3.x issues */ 
+PyAPI_DATA(int) Py_Py3kWarningFlag; 
+PyAPI_DATA(int) Py_HashRandomizationFlag; 
+ 
+/* this is a wrapper around getenv() that pays attention to 
+   Py_IgnoreEnvironmentFlag.  It should be used for getting variables like 
+   PYTHONPATH and PYTHONHOME from the environment */ 
+#define Py_GETENV(s) (Py_IgnoreEnvironmentFlag ? NULL : getenv(s)) 
+ 
+PyAPI_FUNC(void) Py_FatalError(const char *message); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_PYDEBUG_H */ 
diff --git a/contrib/tools/python/src/Include/pyerrors.h b/contrib/tools/python/src/Include/pyerrors.h
index 51134ef7b2..179dc1164c 100644
--- a/contrib/tools/python/src/Include/pyerrors.h
+++ b/contrib/tools/python/src/Include/pyerrors.h
@@ -1,329 +1,329 @@
-#ifndef Py_ERRORS_H
-#define Py_ERRORS_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Error objects */
-
-typedef struct {
-    PyObject_HEAD
-    PyObject *dict;
-    PyObject *args;
-    PyObject *message;
-} PyBaseExceptionObject;
-
-typedef struct {
-    PyObject_HEAD
-    PyObject *dict;
-    PyObject *args;
-    PyObject *message;
-    PyObject *msg;
-    PyObject *filename;
-    PyObject *lineno;
-    PyObject *offset;
-    PyObject *text;
-    PyObject *print_file_and_line;
-} PySyntaxErrorObject;
-
-#ifdef Py_USING_UNICODE
-typedef struct {
-    PyObject_HEAD
-    PyObject *dict;
-    PyObject *args;
-    PyObject *message;
-    PyObject *encoding;
-    PyObject *object;
-    Py_ssize_t start;
-    Py_ssize_t end;
-    PyObject *reason;
-} PyUnicodeErrorObject;
-#endif
-
-typedef struct {
-    PyObject_HEAD
-    PyObject *dict;
-    PyObject *args;
-    PyObject *message;
-    PyObject *code;
-} PySystemExitObject;
-
-typedef struct {
-    PyObject_HEAD
-    PyObject *dict;
-    PyObject *args;
-    PyObject *message;
-    PyObject *myerrno;
-    PyObject *strerror;
-    PyObject *filename;
-} PyEnvironmentErrorObject;
-
-#ifdef MS_WINDOWS
-typedef struct {
-    PyObject_HEAD
-    PyObject *dict;
-    PyObject *args;
-    PyObject *message;
-    PyObject *myerrno;
-    PyObject *strerror;
-    PyObject *filename;
-    PyObject *winerror;
-} PyWindowsErrorObject;
-#endif
-
-/* Error handling definitions */
-
-PyAPI_FUNC(void) PyErr_SetNone(PyObject *);
-PyAPI_FUNC(void) PyErr_SetObject(PyObject *, PyObject *);
-PyAPI_FUNC(void) PyErr_SetString(PyObject *, const char *);
-PyAPI_FUNC(PyObject *) PyErr_Occurred(void);
-PyAPI_FUNC(void) PyErr_Clear(void);
-PyAPI_FUNC(void) PyErr_Fetch(PyObject **, PyObject **, PyObject **);
-PyAPI_FUNC(void) PyErr_Restore(PyObject *, PyObject *, PyObject *);
-
-#ifdef Py_DEBUG
-#define _PyErr_OCCURRED() PyErr_Occurred()
-#else
-#define _PyErr_OCCURRED() (_PyThreadState_Current->curexc_type)
-#endif
-
-/* Error testing and normalization */
-PyAPI_FUNC(int) PyErr_GivenExceptionMatches(PyObject *, PyObject *);
-PyAPI_FUNC(int) PyErr_ExceptionMatches(PyObject *);
-PyAPI_FUNC(void) PyErr_NormalizeException(PyObject**, PyObject**, PyObject**);
+#ifndef Py_ERRORS_H 
+#define Py_ERRORS_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+/* Error objects */ 
+ 
+typedef struct { 
+    PyObject_HEAD 
+    PyObject *dict; 
+    PyObject *args; 
+    PyObject *message; 
+} PyBaseExceptionObject; 
+ 
+typedef struct { 
+    PyObject_HEAD 
+    PyObject *dict; 
+    PyObject *args; 
+    PyObject *message; 
+    PyObject *msg; 
+    PyObject *filename; 
+    PyObject *lineno; 
+    PyObject *offset; 
+    PyObject *text; 
+    PyObject *print_file_and_line; 
+} PySyntaxErrorObject; 
+ 
+#ifdef Py_USING_UNICODE 
+typedef struct { 
+    PyObject_HEAD 
+    PyObject *dict; 
+    PyObject *args; 
+    PyObject *message; 
+    PyObject *encoding; 
+    PyObject *object; 
+    Py_ssize_t start; 
+    Py_ssize_t end; 
+    PyObject *reason; 
+} PyUnicodeErrorObject; 
+#endif 
+ 
+typedef struct { 
+    PyObject_HEAD 
+    PyObject *dict; 
+    PyObject *args; 
+    PyObject *message; 
+    PyObject *code; 
+} PySystemExitObject; 
+ 
+typedef struct { 
+    PyObject_HEAD 
+    PyObject *dict; 
+    PyObject *args; 
+    PyObject *message; 
+    PyObject *myerrno; 
+    PyObject *strerror; 
+    PyObject *filename; 
+} PyEnvironmentErrorObject; 
+ 
+#ifdef MS_WINDOWS 
+typedef struct { 
+    PyObject_HEAD 
+    PyObject *dict; 
+    PyObject *args; 
+    PyObject *message; 
+    PyObject *myerrno; 
+    PyObject *strerror; 
+    PyObject *filename; 
+    PyObject *winerror; 
+} PyWindowsErrorObject; 
+#endif 
+ 
+/* Error handling definitions */ 
+ 
+PyAPI_FUNC(void) PyErr_SetNone(PyObject *); 
+PyAPI_FUNC(void) PyErr_SetObject(PyObject *, PyObject *); 
+PyAPI_FUNC(void) PyErr_SetString(PyObject *, const char *); 
+PyAPI_FUNC(PyObject *) PyErr_Occurred(void); 
+PyAPI_FUNC(void) PyErr_Clear(void); 
+PyAPI_FUNC(void) PyErr_Fetch(PyObject **, PyObject **, PyObject **); 
+PyAPI_FUNC(void) PyErr_Restore(PyObject *, PyObject *, PyObject *); 
+ 
+#ifdef Py_DEBUG 
+#define _PyErr_OCCURRED() PyErr_Occurred() 
+#else 
+#define _PyErr_OCCURRED() (_PyThreadState_Current->curexc_type) 
+#endif 
+ 
+/* Error testing and normalization */ 
+PyAPI_FUNC(int) PyErr_GivenExceptionMatches(PyObject *, PyObject *); 
+PyAPI_FUNC(int) PyErr_ExceptionMatches(PyObject *); 
+PyAPI_FUNC(void) PyErr_NormalizeException(PyObject**, PyObject**, PyObject**); 
 PyAPI_FUNC(void) _PyErr_ReplaceException(PyObject *, PyObject *, PyObject *);
-
-/* */
-
-#define PyExceptionClass_Check(x)                                       \
-    (PyClass_Check((x)) || (PyType_Check((x)) &&                        \
-      PyType_FastSubclass((PyTypeObject*)(x), Py_TPFLAGS_BASE_EXC_SUBCLASS)))
-
-#define PyExceptionInstance_Check(x)                    \
-    (PyInstance_Check((x)) ||                           \
-     PyType_FastSubclass((x)->ob_type, Py_TPFLAGS_BASE_EXC_SUBCLASS))
-
-#define PyExceptionClass_Name(x)                                   \
-    (PyClass_Check((x))                                            \
-     ? PyString_AS_STRING(((PyClassObject*)(x))->cl_name)          \
-     : (char *)(((PyTypeObject*)(x))->tp_name))
-
-#define PyExceptionInstance_Class(x)                                    \
-    ((PyInstance_Check((x))                                             \
-      ? (PyObject*)((PyInstanceObject*)(x))->in_class                   \
-      : (PyObject*)((x)->ob_type)))
-
-
-/* Predefined exceptions */
-
-PyAPI_DATA(PyObject *) PyExc_BaseException;
-PyAPI_DATA(PyObject *) PyExc_Exception;
-PyAPI_DATA(PyObject *) PyExc_StopIteration;
-PyAPI_DATA(PyObject *) PyExc_GeneratorExit;
-PyAPI_DATA(PyObject *) PyExc_StandardError;
-PyAPI_DATA(PyObject *) PyExc_ArithmeticError;
-PyAPI_DATA(PyObject *) PyExc_LookupError;
-
-PyAPI_DATA(PyObject *) PyExc_AssertionError;
-PyAPI_DATA(PyObject *) PyExc_AttributeError;
-PyAPI_DATA(PyObject *) PyExc_EOFError;
-PyAPI_DATA(PyObject *) PyExc_FloatingPointError;
-PyAPI_DATA(PyObject *) PyExc_EnvironmentError;
-PyAPI_DATA(PyObject *) PyExc_IOError;
-PyAPI_DATA(PyObject *) PyExc_OSError;
-PyAPI_DATA(PyObject *) PyExc_ImportError;
-PyAPI_DATA(PyObject *) PyExc_IndexError;
-PyAPI_DATA(PyObject *) PyExc_KeyError;
-PyAPI_DATA(PyObject *) PyExc_KeyboardInterrupt;
-PyAPI_DATA(PyObject *) PyExc_MemoryError;
-PyAPI_DATA(PyObject *) PyExc_NameError;
-PyAPI_DATA(PyObject *) PyExc_OverflowError;
-PyAPI_DATA(PyObject *) PyExc_RuntimeError;
-PyAPI_DATA(PyObject *) PyExc_NotImplementedError;
-PyAPI_DATA(PyObject *) PyExc_SyntaxError;
-PyAPI_DATA(PyObject *) PyExc_IndentationError;
-PyAPI_DATA(PyObject *) PyExc_TabError;
-PyAPI_DATA(PyObject *) PyExc_ReferenceError;
-PyAPI_DATA(PyObject *) PyExc_SystemError;
-PyAPI_DATA(PyObject *) PyExc_SystemExit;
-PyAPI_DATA(PyObject *) PyExc_TypeError;
-PyAPI_DATA(PyObject *) PyExc_UnboundLocalError;
-PyAPI_DATA(PyObject *) PyExc_UnicodeError;
-PyAPI_DATA(PyObject *) PyExc_UnicodeEncodeError;
-PyAPI_DATA(PyObject *) PyExc_UnicodeDecodeError;
-PyAPI_DATA(PyObject *) PyExc_UnicodeTranslateError;
-PyAPI_DATA(PyObject *) PyExc_ValueError;
-PyAPI_DATA(PyObject *) PyExc_ZeroDivisionError;
-#ifdef MS_WINDOWS
-PyAPI_DATA(PyObject *) PyExc_WindowsError;
-#endif
-#ifdef __VMS
-PyAPI_DATA(PyObject *) PyExc_VMSError;
-#endif
-
-PyAPI_DATA(PyObject *) PyExc_BufferError;
-
-PyAPI_DATA(PyObject *) PyExc_MemoryErrorInst;
-PyAPI_DATA(PyObject *) PyExc_RecursionErrorInst;
-
-/* Predefined warning categories */
-PyAPI_DATA(PyObject *) PyExc_Warning;
-PyAPI_DATA(PyObject *) PyExc_UserWarning;
-PyAPI_DATA(PyObject *) PyExc_DeprecationWarning;
-PyAPI_DATA(PyObject *) PyExc_PendingDeprecationWarning;
-PyAPI_DATA(PyObject *) PyExc_SyntaxWarning;
-PyAPI_DATA(PyObject *) PyExc_RuntimeWarning;
-PyAPI_DATA(PyObject *) PyExc_FutureWarning;
-PyAPI_DATA(PyObject *) PyExc_ImportWarning;
-PyAPI_DATA(PyObject *) PyExc_UnicodeWarning;
-PyAPI_DATA(PyObject *) PyExc_BytesWarning;
-
-
-/* Convenience functions */
-
-PyAPI_FUNC(int) PyErr_BadArgument(void);
-PyAPI_FUNC(PyObject *) PyErr_NoMemory(void);
-PyAPI_FUNC(PyObject *) PyErr_SetFromErrno(PyObject *);
-PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithFilenameObject(
-    PyObject *, PyObject *);
-PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithFilename(
-    PyObject *, const char *);
-#ifdef MS_WINDOWS
-PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithUnicodeFilename(
-    PyObject *, const Py_UNICODE *);
-#endif /* MS_WINDOWS */
-
-PyAPI_FUNC(PyObject *) PyErr_Format(PyObject *, const char *, ...)
-                        Py_GCC_ATTRIBUTE((format(printf, 2, 3)));
-
-#ifdef MS_WINDOWS
-PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithFilenameObject(
-    int, const char *);
-PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithFilename(
-    int, const char *);
-PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithUnicodeFilename(
-    int, const Py_UNICODE *);
-PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErr(int);
-PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithFilenameObject(
-    PyObject *,int, PyObject *);
-PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithFilename(
-    PyObject *,int, const char *);
-PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithUnicodeFilename(
-    PyObject *,int, const Py_UNICODE *);
-PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErr(PyObject *, int);
-#endif /* MS_WINDOWS */
-
-/* Export the old function so that the existing API remains available: */
-PyAPI_FUNC(void) PyErr_BadInternalCall(void);
+ 
+/* */ 
+ 
+#define PyExceptionClass_Check(x)                                       \ 
+    (PyClass_Check((x)) || (PyType_Check((x)) &&                        \ 
+      PyType_FastSubclass((PyTypeObject*)(x), Py_TPFLAGS_BASE_EXC_SUBCLASS))) 
+ 
+#define PyExceptionInstance_Check(x)                    \ 
+    (PyInstance_Check((x)) ||                           \ 
+     PyType_FastSubclass((x)->ob_type, Py_TPFLAGS_BASE_EXC_SUBCLASS)) 
+ 
+#define PyExceptionClass_Name(x)                                   \ 
+    (PyClass_Check((x))                                            \ 
+     ? PyString_AS_STRING(((PyClassObject*)(x))->cl_name)          \ 
+     : (char *)(((PyTypeObject*)(x))->tp_name)) 
+ 
+#define PyExceptionInstance_Class(x)                                    \ 
+    ((PyInstance_Check((x))                                             \ 
+      ? (PyObject*)((PyInstanceObject*)(x))->in_class                   \ 
+      : (PyObject*)((x)->ob_type))) 
+ 
+ 
+/* Predefined exceptions */ 
+ 
+PyAPI_DATA(PyObject *) PyExc_BaseException; 
+PyAPI_DATA(PyObject *) PyExc_Exception; 
+PyAPI_DATA(PyObject *) PyExc_StopIteration; 
+PyAPI_DATA(PyObject *) PyExc_GeneratorExit; 
+PyAPI_DATA(PyObject *) PyExc_StandardError; 
+PyAPI_DATA(PyObject *) PyExc_ArithmeticError; 
+PyAPI_DATA(PyObject *) PyExc_LookupError; 
+ 
+PyAPI_DATA(PyObject *) PyExc_AssertionError; 
+PyAPI_DATA(PyObject *) PyExc_AttributeError; 
+PyAPI_DATA(PyObject *) PyExc_EOFError; 
+PyAPI_DATA(PyObject *) PyExc_FloatingPointError; 
+PyAPI_DATA(PyObject *) PyExc_EnvironmentError; 
+PyAPI_DATA(PyObject *) PyExc_IOError; 
+PyAPI_DATA(PyObject *) PyExc_OSError; 
+PyAPI_DATA(PyObject *) PyExc_ImportError; 
+PyAPI_DATA(PyObject *) PyExc_IndexError; 
+PyAPI_DATA(PyObject *) PyExc_KeyError; 
+PyAPI_DATA(PyObject *) PyExc_KeyboardInterrupt; 
+PyAPI_DATA(PyObject *) PyExc_MemoryError; 
+PyAPI_DATA(PyObject *) PyExc_NameError; 
+PyAPI_DATA(PyObject *) PyExc_OverflowError; 
+PyAPI_DATA(PyObject *) PyExc_RuntimeError; 
+PyAPI_DATA(PyObject *) PyExc_NotImplementedError; 
+PyAPI_DATA(PyObject *) PyExc_SyntaxError; 
+PyAPI_DATA(PyObject *) PyExc_IndentationError; 
+PyAPI_DATA(PyObject *) PyExc_TabError; 
+PyAPI_DATA(PyObject *) PyExc_ReferenceError; 
+PyAPI_DATA(PyObject *) PyExc_SystemError; 
+PyAPI_DATA(PyObject *) PyExc_SystemExit; 
+PyAPI_DATA(PyObject *) PyExc_TypeError; 
+PyAPI_DATA(PyObject *) PyExc_UnboundLocalError; 
+PyAPI_DATA(PyObject *) PyExc_UnicodeError; 
+PyAPI_DATA(PyObject *) PyExc_UnicodeEncodeError; 
+PyAPI_DATA(PyObject *) PyExc_UnicodeDecodeError; 
+PyAPI_DATA(PyObject *) PyExc_UnicodeTranslateError; 
+PyAPI_DATA(PyObject *) PyExc_ValueError; 
+PyAPI_DATA(PyObject *) PyExc_ZeroDivisionError; 
+#ifdef MS_WINDOWS 
+PyAPI_DATA(PyObject *) PyExc_WindowsError; 
+#endif 
+#ifdef __VMS 
+PyAPI_DATA(PyObject *) PyExc_VMSError; 
+#endif 
+ 
+PyAPI_DATA(PyObject *) PyExc_BufferError; 
+ 
+PyAPI_DATA(PyObject *) PyExc_MemoryErrorInst; 
+PyAPI_DATA(PyObject *) PyExc_RecursionErrorInst; 
+ 
+/* Predefined warning categories */ 
+PyAPI_DATA(PyObject *) PyExc_Warning; 
+PyAPI_DATA(PyObject *) PyExc_UserWarning; 
+PyAPI_DATA(PyObject *) PyExc_DeprecationWarning; 
+PyAPI_DATA(PyObject *) PyExc_PendingDeprecationWarning; 
+PyAPI_DATA(PyObject *) PyExc_SyntaxWarning; 
+PyAPI_DATA(PyObject *) PyExc_RuntimeWarning; 
+PyAPI_DATA(PyObject *) PyExc_FutureWarning; 
+PyAPI_DATA(PyObject *) PyExc_ImportWarning; 
+PyAPI_DATA(PyObject *) PyExc_UnicodeWarning; 
+PyAPI_DATA(PyObject *) PyExc_BytesWarning; 
+ 
+ 
+/* Convenience functions */ 
+ 
+PyAPI_FUNC(int) PyErr_BadArgument(void); 
+PyAPI_FUNC(PyObject *) PyErr_NoMemory(void); 
+PyAPI_FUNC(PyObject *) PyErr_SetFromErrno(PyObject *); 
+PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithFilenameObject( 
+    PyObject *, PyObject *); 
+PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithFilename( 
+    PyObject *, const char *); 
+#ifdef MS_WINDOWS 
+PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithUnicodeFilename( 
+    PyObject *, const Py_UNICODE *); 
+#endif /* MS_WINDOWS */ 
+ 
+PyAPI_FUNC(PyObject *) PyErr_Format(PyObject *, const char *, ...) 
+                        Py_GCC_ATTRIBUTE((format(printf, 2, 3))); 
+ 
+#ifdef MS_WINDOWS 
+PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithFilenameObject( 
+    int, const char *); 
+PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithFilename( 
+    int, const char *); 
+PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithUnicodeFilename( 
+    int, const Py_UNICODE *); 
+PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErr(int); 
+PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithFilenameObject( 
+    PyObject *,int, PyObject *); 
+PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithFilename( 
+    PyObject *,int, const char *); 
+PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithUnicodeFilename( 
+    PyObject *,int, const Py_UNICODE *); 
+PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErr(PyObject *, int); 
+#endif /* MS_WINDOWS */ 
+ 
+/* Export the old function so that the existing API remains available: */ 
+PyAPI_FUNC(void) PyErr_BadInternalCall(void); 
 PyAPI_FUNC(void) _PyErr_BadInternalCall(const char *filename, int lineno);
-/* Mask the old API with a call to the new API for code compiled under
-   Python 2.0: */
-#define PyErr_BadInternalCall() _PyErr_BadInternalCall(__FILE__, __LINE__)
-
-/* Function to create a new exception */
-PyAPI_FUNC(PyObject *) PyErr_NewException(
-    char *name, PyObject *base, PyObject *dict);
-PyAPI_FUNC(PyObject *) PyErr_NewExceptionWithDoc(
-    char *name, char *doc, PyObject *base, PyObject *dict);
-PyAPI_FUNC(void) PyErr_WriteUnraisable(PyObject *);
-
-/* In sigcheck.c or signalmodule.c */
-PyAPI_FUNC(int) PyErr_CheckSignals(void);
-PyAPI_FUNC(void) PyErr_SetInterrupt(void);
-
-/* In signalmodule.c */
-int PySignal_SetWakeupFd(int fd);
-
-/* Support for adding program text to SyntaxErrors */
-PyAPI_FUNC(void) PyErr_SyntaxLocation(const char *, int);
-PyAPI_FUNC(PyObject *) PyErr_ProgramText(const char *, int);
-
-#ifdef Py_USING_UNICODE
-/* The following functions are used to create and modify unicode
-   exceptions from C */
-
-/* create a UnicodeDecodeError object */
-PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_Create(
-    const char *, const char *, Py_ssize_t, Py_ssize_t, Py_ssize_t, const char *);
-
-/* create a UnicodeEncodeError object */
-PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_Create(
-    const char *, const Py_UNICODE *, Py_ssize_t, Py_ssize_t, Py_ssize_t, const char *);
-
-/* create a UnicodeTranslateError object */
-PyAPI_FUNC(PyObject *) PyUnicodeTranslateError_Create(
-    const Py_UNICODE *, Py_ssize_t, Py_ssize_t, Py_ssize_t, const char *);
-
-/* get the encoding attribute */
-PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_GetEncoding(PyObject *);
-PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_GetEncoding(PyObject *);
-
-/* get the object attribute */
-PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_GetObject(PyObject *);
-PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_GetObject(PyObject *);
-PyAPI_FUNC(PyObject *) PyUnicodeTranslateError_GetObject(PyObject *);
-
-/* get the value of the start attribute (the int * may not be NULL)
-   return 0 on success, -1 on failure */
-PyAPI_FUNC(int) PyUnicodeEncodeError_GetStart(PyObject *, Py_ssize_t *);
-PyAPI_FUNC(int) PyUnicodeDecodeError_GetStart(PyObject *, Py_ssize_t *);
-PyAPI_FUNC(int) PyUnicodeTranslateError_GetStart(PyObject *, Py_ssize_t *);
-
-/* assign a new value to the start attribute
-   return 0 on success, -1 on failure */
-PyAPI_FUNC(int) PyUnicodeEncodeError_SetStart(PyObject *, Py_ssize_t);
-PyAPI_FUNC(int) PyUnicodeDecodeError_SetStart(PyObject *, Py_ssize_t);
-PyAPI_FUNC(int) PyUnicodeTranslateError_SetStart(PyObject *, Py_ssize_t);
-
-/* get the value of the end attribute (the int *may not be NULL)
- return 0 on success, -1 on failure */
-PyAPI_FUNC(int) PyUnicodeEncodeError_GetEnd(PyObject *, Py_ssize_t *);
-PyAPI_FUNC(int) PyUnicodeDecodeError_GetEnd(PyObject *, Py_ssize_t *);
-PyAPI_FUNC(int) PyUnicodeTranslateError_GetEnd(PyObject *, Py_ssize_t *);
-
-/* assign a new value to the end attribute
-   return 0 on success, -1 on failure */
-PyAPI_FUNC(int) PyUnicodeEncodeError_SetEnd(PyObject *, Py_ssize_t);
-PyAPI_FUNC(int) PyUnicodeDecodeError_SetEnd(PyObject *, Py_ssize_t);
-PyAPI_FUNC(int) PyUnicodeTranslateError_SetEnd(PyObject *, Py_ssize_t);
-
-/* get the value of the reason attribute */
-PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_GetReason(PyObject *);
-PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_GetReason(PyObject *);
-PyAPI_FUNC(PyObject *) PyUnicodeTranslateError_GetReason(PyObject *);
-
-/* assign a new value to the reason attribute
-   return 0 on success, -1 on failure */
-PyAPI_FUNC(int) PyUnicodeEncodeError_SetReason(
-    PyObject *, const char *);
-PyAPI_FUNC(int) PyUnicodeDecodeError_SetReason(
-    PyObject *, const char *);
-PyAPI_FUNC(int) PyUnicodeTranslateError_SetReason(
-    PyObject *, const char *);
-#endif
-
-
-/* These APIs aren't really part of the error implementation, but
-   often needed to format error messages; the native C lib APIs are
-   not available on all platforms, which is why we provide emulations
-   for those platforms in Python/mysnprintf.c,
-   WARNING:  The return value of snprintf varies across platforms; do
-   not rely on any particular behavior; eventually the C99 defn may
-   be reliable.
-*/
-#if defined(MS_WIN32) && !defined(HAVE_SNPRINTF)
-# define HAVE_SNPRINTF
-# define snprintf _snprintf
-# define vsnprintf _vsnprintf
-#endif
-
-#include <stdarg.h>
-PyAPI_FUNC(int) PyOS_snprintf(char *str, size_t size, const char  *format, ...)
-                        Py_GCC_ATTRIBUTE((format(printf, 3, 4)));
-PyAPI_FUNC(int) PyOS_vsnprintf(char *str, size_t size, const char  *format, va_list va)
-                        Py_GCC_ATTRIBUTE((format(printf, 3, 0)));
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_ERRORS_H */
+/* Mask the old API with a call to the new API for code compiled under 
+   Python 2.0: */ 
+#define PyErr_BadInternalCall() _PyErr_BadInternalCall(__FILE__, __LINE__) 
+ 
+/* Function to create a new exception */ 
+PyAPI_FUNC(PyObject *) PyErr_NewException( 
+    char *name, PyObject *base, PyObject *dict); 
+PyAPI_FUNC(PyObject *) PyErr_NewExceptionWithDoc( 
+    char *name, char *doc, PyObject *base, PyObject *dict); 
+PyAPI_FUNC(void) PyErr_WriteUnraisable(PyObject *); 
+ 
+/* In sigcheck.c or signalmodule.c */ 
+PyAPI_FUNC(int) PyErr_CheckSignals(void); 
+PyAPI_FUNC(void) PyErr_SetInterrupt(void); 
+ 
+/* In signalmodule.c */ 
+int PySignal_SetWakeupFd(int fd); 
+ 
+/* Support for adding program text to SyntaxErrors */ 
+PyAPI_FUNC(void) PyErr_SyntaxLocation(const char *, int); 
+PyAPI_FUNC(PyObject *) PyErr_ProgramText(const char *, int); 
+ 
+#ifdef Py_USING_UNICODE 
+/* The following functions are used to create and modify unicode 
+   exceptions from C */ 
+ 
+/* create a UnicodeDecodeError object */ 
+PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_Create( 
+    const char *, const char *, Py_ssize_t, Py_ssize_t, Py_ssize_t, const char *); 
+ 
+/* create a UnicodeEncodeError object */ 
+PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_Create( 
+    const char *, const Py_UNICODE *, Py_ssize_t, Py_ssize_t, Py_ssize_t, const char *); 
+ 
+/* create a UnicodeTranslateError object */ 
+PyAPI_FUNC(PyObject *) PyUnicodeTranslateError_Create( 
+    const Py_UNICODE *, Py_ssize_t, Py_ssize_t, Py_ssize_t, const char *); 
+ 
+/* get the encoding attribute */ 
+PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_GetEncoding(PyObject *); 
+PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_GetEncoding(PyObject *); 
+ 
+/* get the object attribute */ 
+PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_GetObject(PyObject *); 
+PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_GetObject(PyObject *); 
+PyAPI_FUNC(PyObject *) PyUnicodeTranslateError_GetObject(PyObject *); 
+ 
+/* get the value of the start attribute (the int * may not be NULL) 
+   return 0 on success, -1 on failure */ 
+PyAPI_FUNC(int) PyUnicodeEncodeError_GetStart(PyObject *, Py_ssize_t *); 
+PyAPI_FUNC(int) PyUnicodeDecodeError_GetStart(PyObject *, Py_ssize_t *); 
+PyAPI_FUNC(int) PyUnicodeTranslateError_GetStart(PyObject *, Py_ssize_t *); 
+ 
+/* assign a new value to the start attribute 
+   return 0 on success, -1 on failure */ 
+PyAPI_FUNC(int) PyUnicodeEncodeError_SetStart(PyObject *, Py_ssize_t); 
+PyAPI_FUNC(int) PyUnicodeDecodeError_SetStart(PyObject *, Py_ssize_t); 
+PyAPI_FUNC(int) PyUnicodeTranslateError_SetStart(PyObject *, Py_ssize_t); 
+ 
+/* get the value of the end attribute (the int *may not be NULL) 
+ return 0 on success, -1 on failure */ 
+PyAPI_FUNC(int) PyUnicodeEncodeError_GetEnd(PyObject *, Py_ssize_t *); 
+PyAPI_FUNC(int) PyUnicodeDecodeError_GetEnd(PyObject *, Py_ssize_t *); 
+PyAPI_FUNC(int) PyUnicodeTranslateError_GetEnd(PyObject *, Py_ssize_t *); 
+ 
+/* assign a new value to the end attribute 
+   return 0 on success, -1 on failure */ 
+PyAPI_FUNC(int) PyUnicodeEncodeError_SetEnd(PyObject *, Py_ssize_t); 
+PyAPI_FUNC(int) PyUnicodeDecodeError_SetEnd(PyObject *, Py_ssize_t); 
+PyAPI_FUNC(int) PyUnicodeTranslateError_SetEnd(PyObject *, Py_ssize_t); 
+ 
+/* get the value of the reason attribute */ 
+PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_GetReason(PyObject *); 
+PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_GetReason(PyObject *); 
+PyAPI_FUNC(PyObject *) PyUnicodeTranslateError_GetReason(PyObject *); 
+ 
+/* assign a new value to the reason attribute 
+   return 0 on success, -1 on failure */ 
+PyAPI_FUNC(int) PyUnicodeEncodeError_SetReason( 
+    PyObject *, const char *); 
+PyAPI_FUNC(int) PyUnicodeDecodeError_SetReason( 
+    PyObject *, const char *); 
+PyAPI_FUNC(int) PyUnicodeTranslateError_SetReason( 
+    PyObject *, const char *); 
+#endif 
+ 
+ 
+/* These APIs aren't really part of the error implementation, but 
+   often needed to format error messages; the native C lib APIs are 
+   not available on all platforms, which is why we provide emulations 
+   for those platforms in Python/mysnprintf.c, 
+   WARNING:  The return value of snprintf varies across platforms; do 
+   not rely on any particular behavior; eventually the C99 defn may 
+   be reliable. 
+*/ 
+#if defined(MS_WIN32) && !defined(HAVE_SNPRINTF) 
+# define HAVE_SNPRINTF 
+# define snprintf _snprintf 
+# define vsnprintf _vsnprintf 
+#endif 
+ 
+#include <stdarg.h> 
+PyAPI_FUNC(int) PyOS_snprintf(char *str, size_t size, const char  *format, ...) 
+                        Py_GCC_ATTRIBUTE((format(printf, 3, 4))); 
+PyAPI_FUNC(int) PyOS_vsnprintf(char *str, size_t size, const char  *format, va_list va) 
+                        Py_GCC_ATTRIBUTE((format(printf, 3, 0))); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_ERRORS_H */ 
diff --git a/contrib/tools/python/src/Include/pyexpat.h b/contrib/tools/python/src/Include/pyexpat.h
index 3fc5fa54da..99d98f52b1 100644
--- a/contrib/tools/python/src/Include/pyexpat.h
+++ b/contrib/tools/python/src/Include/pyexpat.h
@@ -1,50 +1,50 @@
-/* Stuff to export relevant 'expat' entry points from pyexpat to other
- * parser modules, such as cElementTree. */
-
-/* note: you must import expat.h before importing this module! */
-
+/* Stuff to export relevant 'expat' entry points from pyexpat to other 
+ * parser modules, such as cElementTree. */ 
+ 
+/* note: you must import expat.h before importing this module! */ 
+ 
 #define PyExpat_CAPI_MAGIC  "pyexpat.expat_CAPI 1.1"
-#define PyExpat_CAPSULE_NAME "pyexpat.expat_CAPI"
-
-struct PyExpat_CAPI 
-{
-    char* magic; /* set to PyExpat_CAPI_MAGIC */
-    int size; /* set to sizeof(struct PyExpat_CAPI) */
-    int MAJOR_VERSION;
-    int MINOR_VERSION;
-    int MICRO_VERSION;
-    /* pointers to selected expat functions.  add new functions at
-       the end, if needed */
-    const XML_LChar * (*ErrorString)(enum XML_Error code);
-    enum XML_Error (*GetErrorCode)(XML_Parser parser);
-    XML_Size (*GetErrorColumnNumber)(XML_Parser parser);
-    XML_Size (*GetErrorLineNumber)(XML_Parser parser);
-    enum XML_Status (*Parse)(
-        XML_Parser parser, const char *s, int len, int isFinal);
-    XML_Parser (*ParserCreate_MM)(
-        const XML_Char *encoding, const XML_Memory_Handling_Suite *memsuite,
-        const XML_Char *namespaceSeparator);
-    void (*ParserFree)(XML_Parser parser);
-    void (*SetCharacterDataHandler)(
-        XML_Parser parser, XML_CharacterDataHandler handler);
-    void (*SetCommentHandler)(
-        XML_Parser parser, XML_CommentHandler handler);
-    void (*SetDefaultHandlerExpand)(
-        XML_Parser parser, XML_DefaultHandler handler);
-    void (*SetElementHandler)(
-        XML_Parser parser, XML_StartElementHandler start,
-        XML_EndElementHandler end);
-    void (*SetNamespaceDeclHandler)(
-        XML_Parser parser, XML_StartNamespaceDeclHandler start,
-        XML_EndNamespaceDeclHandler end);
-    void (*SetProcessingInstructionHandler)(
-        XML_Parser parser, XML_ProcessingInstructionHandler handler);
-    void (*SetUnknownEncodingHandler)(
-        XML_Parser parser, XML_UnknownEncodingHandler handler,
-        void *encodingHandlerData);
-    void (*SetUserData)(XML_Parser parser, void *userData);
+#define PyExpat_CAPSULE_NAME "pyexpat.expat_CAPI" 
+ 
+struct PyExpat_CAPI  
+{ 
+    char* magic; /* set to PyExpat_CAPI_MAGIC */ 
+    int size; /* set to sizeof(struct PyExpat_CAPI) */ 
+    int MAJOR_VERSION; 
+    int MINOR_VERSION; 
+    int MICRO_VERSION; 
+    /* pointers to selected expat functions.  add new functions at 
+       the end, if needed */ 
+    const XML_LChar * (*ErrorString)(enum XML_Error code); 
+    enum XML_Error (*GetErrorCode)(XML_Parser parser); 
+    XML_Size (*GetErrorColumnNumber)(XML_Parser parser); 
+    XML_Size (*GetErrorLineNumber)(XML_Parser parser); 
+    enum XML_Status (*Parse)( 
+        XML_Parser parser, const char *s, int len, int isFinal); 
+    XML_Parser (*ParserCreate_MM)( 
+        const XML_Char *encoding, const XML_Memory_Handling_Suite *memsuite, 
+        const XML_Char *namespaceSeparator); 
+    void (*ParserFree)(XML_Parser parser); 
+    void (*SetCharacterDataHandler)( 
+        XML_Parser parser, XML_CharacterDataHandler handler); 
+    void (*SetCommentHandler)( 
+        XML_Parser parser, XML_CommentHandler handler); 
+    void (*SetDefaultHandlerExpand)( 
+        XML_Parser parser, XML_DefaultHandler handler); 
+    void (*SetElementHandler)( 
+        XML_Parser parser, XML_StartElementHandler start, 
+        XML_EndElementHandler end); 
+    void (*SetNamespaceDeclHandler)( 
+        XML_Parser parser, XML_StartNamespaceDeclHandler start, 
+        XML_EndNamespaceDeclHandler end); 
+    void (*SetProcessingInstructionHandler)( 
+        XML_Parser parser, XML_ProcessingInstructionHandler handler); 
+    void (*SetUnknownEncodingHandler)( 
+        XML_Parser parser, XML_UnknownEncodingHandler handler, 
+        void *encodingHandlerData); 
+    void (*SetUserData)(XML_Parser parser, void *userData); 
     /* might be none for expat < 2.1.0 */
     int (*SetHashSalt)(XML_Parser parser, unsigned long hash_salt);
-    /* always add new stuff to the end! */
-};
-
+    /* always add new stuff to the end! */ 
+}; 
+ 
diff --git a/contrib/tools/python/src/Include/pyfpe.h b/contrib/tools/python/src/Include/pyfpe.h
index f9a15e622b..b8cbfd7067 100644
--- a/contrib/tools/python/src/Include/pyfpe.h
+++ b/contrib/tools/python/src/Include/pyfpe.h
@@ -1,176 +1,176 @@
-#ifndef Py_PYFPE_H
-#define Py_PYFPE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
+#ifndef Py_PYFPE_H 
+#define Py_PYFPE_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+/* 
      ---------------------------------------------------------------------
     /                       Copyright (c) 1996.                           \
-   |          The Regents of the University of California.                 |
-   |                        All rights reserved.                           |
-   |                                                                       |
-   |   Permission to use, copy, modify, and distribute this software for   |
-   |   any purpose without fee is hereby granted, provided that this en-   |
-   |   tire notice is included in all copies of any software which is or   |
-   |   includes  a  copy  or  modification  of  this software and in all   |
-   |   copies of the supporting documentation for such software.           |
-   |                                                                       |
-   |   This  work was produced at the University of California, Lawrence   |
-   |   Livermore National Laboratory under  contract  no.  W-7405-ENG-48   |
-   |   between  the  U.S.  Department  of  Energy and The Regents of the   |
-   |   University of California for the operation of UC LLNL.              |
-   |                                                                       |
-   |                              DISCLAIMER                               |
-   |                                                                       |
-   |   This  software was prepared as an account of work sponsored by an   |
-   |   agency of the United States Government. Neither the United States   |
-   |   Government  nor the University of California nor any of their em-   |
-   |   ployees, makes any warranty, express or implied, or  assumes  any   |
-   |   liability  or  responsibility  for the accuracy, completeness, or   |
-   |   usefulness of any information,  apparatus,  product,  or  process   |
-   |   disclosed,   or  represents  that  its  use  would  not  infringe   |
-   |   privately-owned rights. Reference herein to any specific  commer-   |
-   |   cial  products,  process,  or  service  by trade name, trademark,   |
-   |   manufacturer, or otherwise, does not  necessarily  constitute  or   |
-   |   imply  its endorsement, recommendation, or favoring by the United   |
-   |   States Government or the University of California. The views  and   |
-   |   opinions  of authors expressed herein do not necessarily state or   |
-   |   reflect those of the United States Government or  the  University   |
-   |   of  California,  and shall not be used for advertising or product   |
+   |          The Regents of the University of California.                 | 
+   |                        All rights reserved.                           | 
+   |                                                                       | 
+   |   Permission to use, copy, modify, and distribute this software for   | 
+   |   any purpose without fee is hereby granted, provided that this en-   | 
+   |   tire notice is included in all copies of any software which is or   | 
+   |   includes  a  copy  or  modification  of  this software and in all   | 
+   |   copies of the supporting documentation for such software.           | 
+   |                                                                       | 
+   |   This  work was produced at the University of California, Lawrence   | 
+   |   Livermore National Laboratory under  contract  no.  W-7405-ENG-48   | 
+   |   between  the  U.S.  Department  of  Energy and The Regents of the   | 
+   |   University of California for the operation of UC LLNL.              | 
+   |                                                                       | 
+   |                              DISCLAIMER                               | 
+   |                                                                       | 
+   |   This  software was prepared as an account of work sponsored by an   | 
+   |   agency of the United States Government. Neither the United States   | 
+   |   Government  nor the University of California nor any of their em-   | 
+   |   ployees, makes any warranty, express or implied, or  assumes  any   | 
+   |   liability  or  responsibility  for the accuracy, completeness, or   | 
+   |   usefulness of any information,  apparatus,  product,  or  process   | 
+   |   disclosed,   or  represents  that  its  use  would  not  infringe   | 
+   |   privately-owned rights. Reference herein to any specific  commer-   | 
+   |   cial  products,  process,  or  service  by trade name, trademark,   | 
+   |   manufacturer, or otherwise, does not  necessarily  constitute  or   | 
+   |   imply  its endorsement, recommendation, or favoring by the United   | 
+   |   States Government or the University of California. The views  and   | 
+   |   opinions  of authors expressed herein do not necessarily state or   | 
+   |   reflect those of the United States Government or  the  University   | 
+   |   of  California,  and shall not be used for advertising or product   | 
     \  endorsement purposes.                                              /
      ---------------------------------------------------------------------
-*/
-
-/*
- *       Define macros for handling SIGFPE.
- *       Lee Busby, LLNL, November, 1996
- *       busby1@llnl.gov
- *
- *********************************************
- * Overview of the system for handling SIGFPE:
- *
- * This file (Include/pyfpe.h) defines a couple of "wrapper" macros for
- * insertion into your Python C code of choice. Their proper use is
- * discussed below. The file Python/pyfpe.c defines a pair of global
- * variables PyFPE_jbuf and PyFPE_counter which are used by the signal
- * handler for SIGFPE to decide if a particular exception was protected
- * by the macros. The signal handler itself, and code for enabling the
- * generation of SIGFPE in the first place, is in a (new) Python module
- * named fpectl. This module is standard in every respect. It can be loaded
- * either statically or dynamically as you choose, and like any other
- * Python module, has no effect until you import it.
- *
- * In the general case, there are three steps toward handling SIGFPE in any
- * Python code:
- *
- * 1) Add the *_PROTECT macros to your C code as required to protect
- *    dangerous floating point sections.
- *
- * 2) Turn on the inclusion of the code by adding the ``--with-fpectl''
- *    flag at the time you run configure.  If the fpectl or other modules
- *    which use the *_PROTECT macros are to be dynamically loaded, be
- *    sure they are compiled with WANT_SIGFPE_HANDLER defined.
- *
- * 3) When python is built and running, import fpectl, and execute
- *    fpectl.turnon_sigfpe(). This sets up the signal handler and enables
- *    generation of SIGFPE whenever an exception occurs. From this point
- *    on, any properly trapped SIGFPE should result in the Python
- *    FloatingPointError exception.
- *
- * Step 1 has been done already for the Python kernel code, and should be
- * done soon for the NumPy array package.  Step 2 is usually done once at
- * python install time. Python's behavior with respect to SIGFPE is not
- * changed unless you also do step 3. Thus you can control this new
- * facility at compile time, or run time, or both.
+*/ 
+ 
+/* 
+ *       Define macros for handling SIGFPE. 
+ *       Lee Busby, LLNL, November, 1996 
+ *       busby1@llnl.gov 
+ *
+ ********************************************* 
+ * Overview of the system for handling SIGFPE: 
+ *
+ * This file (Include/pyfpe.h) defines a couple of "wrapper" macros for 
+ * insertion into your Python C code of choice. Their proper use is 
+ * discussed below. The file Python/pyfpe.c defines a pair of global 
+ * variables PyFPE_jbuf and PyFPE_counter which are used by the signal 
+ * handler for SIGFPE to decide if a particular exception was protected 
+ * by the macros. The signal handler itself, and code for enabling the 
+ * generation of SIGFPE in the first place, is in a (new) Python module 
+ * named fpectl. This module is standard in every respect. It can be loaded 
+ * either statically or dynamically as you choose, and like any other 
+ * Python module, has no effect until you import it. 
+ *
+ * In the general case, there are three steps toward handling SIGFPE in any 
+ * Python code: 
+ *
+ * 1) Add the *_PROTECT macros to your C code as required to protect 
+ *    dangerous floating point sections. 
+ *
+ * 2) Turn on the inclusion of the code by adding the ``--with-fpectl'' 
+ *    flag at the time you run configure.  If the fpectl or other modules 
+ *    which use the *_PROTECT macros are to be dynamically loaded, be 
+ *    sure they are compiled with WANT_SIGFPE_HANDLER defined. 
+ *
+ * 3) When python is built and running, import fpectl, and execute 
+ *    fpectl.turnon_sigfpe(). This sets up the signal handler and enables 
+ *    generation of SIGFPE whenever an exception occurs. From this point 
+ *    on, any properly trapped SIGFPE should result in the Python 
+ *    FloatingPointError exception. 
+ *
+ * Step 1 has been done already for the Python kernel code, and should be 
+ * done soon for the NumPy array package.  Step 2 is usually done once at 
+ * python install time. Python's behavior with respect to SIGFPE is not 
+ * changed unless you also do step 3. Thus you can control this new 
+ * facility at compile time, or run time, or both. 
  *
  ********************************
- * Using the macros in your code:
- *
- * static PyObject *foobar(PyObject *self,PyObject *args)
- * {
- *     ....
- *     PyFPE_START_PROTECT("Error in foobar", return 0)
- *     result = dangerous_op(somearg1, somearg2, ...);
- *     PyFPE_END_PROTECT(result)
- *     ....
- * }
- *
- * If a floating point error occurs in dangerous_op, foobar returns 0 (NULL),
- * after setting the associated value of the FloatingPointError exception to
- * "Error in foobar". ``Dangerous_op'' can be a single operation, or a block
- * of code, function calls, or any combination, so long as no alternate
- * return is possible before the PyFPE_END_PROTECT macro is reached.
- *
- * The macros can only be used in a function context where an error return
- * can be recognized as signaling a Python exception. (Generally, most
- * functions that return a PyObject * will qualify.)
- *
- * Guido's original design suggestion for PyFPE_START_PROTECT and
- * PyFPE_END_PROTECT had them open and close a local block, with a locally
- * defined jmp_buf and jmp_buf pointer. This would allow recursive nesting
- * of the macros. The Ansi C standard makes it clear that such local
- * variables need to be declared with the "volatile" type qualifier to keep
- * setjmp from corrupting their values. Some current implementations seem
- * to be more restrictive. For example, the HPUX man page for setjmp says
- *
- *   Upon the return from a setjmp() call caused by a longjmp(), the
- *   values of any non-static local variables belonging to the routine
- *   from which setjmp() was called are undefined. Code which depends on
- *   such values is not guaranteed to be portable.
- *
- * I therefore decided on a more limited form of nesting, using a counter
- * variable (PyFPE_counter) to keep track of any recursion.  If an exception
- * occurs in an ``inner'' pair of macros, the return will apparently
- * come from the outermost level.
- *
- */
-
-#ifdef WANT_SIGFPE_HANDLER
-#include <signal.h>
-#include <setjmp.h>
-#include <math.h>
-extern jmp_buf PyFPE_jbuf;
-extern int PyFPE_counter;
-extern double PyFPE_dummy(void *);
-
-#define PyFPE_START_PROTECT(err_string, leave_stmt) \
-if (!PyFPE_counter++ && setjmp(PyFPE_jbuf)) { \
-	PyErr_SetString(PyExc_FloatingPointError, err_string); \
-	PyFPE_counter = 0; \
-	leave_stmt; \
-}
-
-/*
- * This (following) is a heck of a way to decrement a counter. However,
- * unless the macro argument is provided, code optimizers will sometimes move
- * this statement so that it gets executed *before* the unsafe expression
- * which we're trying to protect.  That pretty well messes things up,
- * of course.
- *
- * If the expression(s) you're trying to protect don't happen to return a
- * value, you will need to manufacture a dummy result just to preserve the
- * correct ordering of statements.  Note that the macro passes the address
- * of its argument (so you need to give it something which is addressable).
- * If your expression returns multiple results, pass the last such result
- * to PyFPE_END_PROTECT.
- *
- * Note that PyFPE_dummy returns a double, which is cast to int.
- * This seeming insanity is to tickle the Floating Point Unit (FPU).
- * If an exception has occurred in a preceding floating point operation,
- * some architectures (notably Intel 80x86) will not deliver the interrupt
- * until the *next* floating point operation.  This is painful if you've
- * already decremented PyFPE_counter.
- */
-#define PyFPE_END_PROTECT(v) PyFPE_counter -= (int)PyFPE_dummy(&(v));
-
-#else
-
-#define PyFPE_START_PROTECT(err_string, leave_stmt)
-#define PyFPE_END_PROTECT(v)
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_PYFPE_H */
+ * Using the macros in your code: 
+ *
+ * static PyObject *foobar(PyObject *self,PyObject *args) 
+ * { 
+ *     .... 
+ *     PyFPE_START_PROTECT("Error in foobar", return 0) 
+ *     result = dangerous_op(somearg1, somearg2, ...); 
+ *     PyFPE_END_PROTECT(result) 
+ *     .... 
+ * } 
+ *
+ * If a floating point error occurs in dangerous_op, foobar returns 0 (NULL), 
+ * after setting the associated value of the FloatingPointError exception to 
+ * "Error in foobar". ``Dangerous_op'' can be a single operation, or a block 
+ * of code, function calls, or any combination, so long as no alternate 
+ * return is possible before the PyFPE_END_PROTECT macro is reached. 
+ *
+ * The macros can only be used in a function context where an error return 
+ * can be recognized as signaling a Python exception. (Generally, most 
+ * functions that return a PyObject * will qualify.) 
+ *
+ * Guido's original design suggestion for PyFPE_START_PROTECT and 
+ * PyFPE_END_PROTECT had them open and close a local block, with a locally 
+ * defined jmp_buf and jmp_buf pointer. This would allow recursive nesting 
+ * of the macros. The Ansi C standard makes it clear that such local 
+ * variables need to be declared with the "volatile" type qualifier to keep 
+ * setjmp from corrupting their values. Some current implementations seem 
+ * to be more restrictive. For example, the HPUX man page for setjmp says 
+ *
+ *   Upon the return from a setjmp() call caused by a longjmp(), the 
+ *   values of any non-static local variables belonging to the routine 
+ *   from which setjmp() was called are undefined. Code which depends on 
+ *   such values is not guaranteed to be portable. 
+ *
+ * I therefore decided on a more limited form of nesting, using a counter 
+ * variable (PyFPE_counter) to keep track of any recursion.  If an exception 
+ * occurs in an ``inner'' pair of macros, the return will apparently 
+ * come from the outermost level. 
+ *
+ */ 
+ 
+#ifdef WANT_SIGFPE_HANDLER 
+#include <signal.h> 
+#include <setjmp.h> 
+#include <math.h> 
+extern jmp_buf PyFPE_jbuf; 
+extern int PyFPE_counter; 
+extern double PyFPE_dummy(void *); 
+ 
+#define PyFPE_START_PROTECT(err_string, leave_stmt) \ 
+if (!PyFPE_counter++ && setjmp(PyFPE_jbuf)) { \ 
+	PyErr_SetString(PyExc_FloatingPointError, err_string); \ 
+	PyFPE_counter = 0; \ 
+	leave_stmt; \ 
+} 
+ 
+/* 
+ * This (following) is a heck of a way to decrement a counter. However, 
+ * unless the macro argument is provided, code optimizers will sometimes move 
+ * this statement so that it gets executed *before* the unsafe expression 
+ * which we're trying to protect.  That pretty well messes things up, 
+ * of course. 
+ *
+ * If the expression(s) you're trying to protect don't happen to return a 
+ * value, you will need to manufacture a dummy result just to preserve the 
+ * correct ordering of statements.  Note that the macro passes the address 
+ * of its argument (so you need to give it something which is addressable). 
+ * If your expression returns multiple results, pass the last such result 
+ * to PyFPE_END_PROTECT. 
+ *
+ * Note that PyFPE_dummy returns a double, which is cast to int. 
+ * This seeming insanity is to tickle the Floating Point Unit (FPU). 
+ * If an exception has occurred in a preceding floating point operation, 
+ * some architectures (notably Intel 80x86) will not deliver the interrupt 
+ * until the *next* floating point operation.  This is painful if you've 
+ * already decremented PyFPE_counter. 
+ */ 
+#define PyFPE_END_PROTECT(v) PyFPE_counter -= (int)PyFPE_dummy(&(v)); 
+ 
+#else 
+ 
+#define PyFPE_START_PROTECT(err_string, leave_stmt) 
+#define PyFPE_END_PROTECT(v) 
+ 
+#endif 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_PYFPE_H */ 
diff --git a/contrib/tools/python/src/Include/pygetopt.h b/contrib/tools/python/src/Include/pygetopt.h
index 9860d360e1..68739b5a27 100644
--- a/contrib/tools/python/src/Include/pygetopt.h
+++ b/contrib/tools/python/src/Include/pygetopt.h
@@ -1,18 +1,18 @@
-
-#ifndef Py_PYGETOPT_H
-#define Py_PYGETOPT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_DATA(int) _PyOS_opterr;
-PyAPI_DATA(int) _PyOS_optind;
-PyAPI_DATA(char *) _PyOS_optarg;
-
-PyAPI_FUNC(void) _PyOS_ResetGetOpt(void);
-PyAPI_FUNC(int) _PyOS_GetOpt(int argc, char **argv, char *optstring);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_PYGETOPT_H */
+ 
+#ifndef Py_PYGETOPT_H 
+#define Py_PYGETOPT_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+PyAPI_DATA(int) _PyOS_opterr; 
+PyAPI_DATA(int) _PyOS_optind; 
+PyAPI_DATA(char *) _PyOS_optarg; 
+ 
+PyAPI_FUNC(void) _PyOS_ResetGetOpt(void); 
+PyAPI_FUNC(int) _PyOS_GetOpt(int argc, char **argv, char *optstring); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_PYGETOPT_H */ 
diff --git a/contrib/tools/python/src/Include/pymacconfig.h b/contrib/tools/python/src/Include/pymacconfig.h
index 9dde11bd58..c37ec95711 100644
--- a/contrib/tools/python/src/Include/pymacconfig.h
+++ b/contrib/tools/python/src/Include/pymacconfig.h
@@ -1,102 +1,102 @@
-#ifndef PYMACCONFIG_H
-#define PYMACCONFIG_H
-     /*
-      * This file moves some of the autoconf magic to compile-time
-      * when building on MacOSX. This is needed for building 4-way
-      * universal binaries and for 64-bit universal binaries because
-      * the values redefined below aren't configure-time constant but
-      * only compile-time constant in these scenarios.
-      */
-
-#if defined(__APPLE__)
-
-# undef SIZEOF_LONG
-# undef SIZEOF_PTHREAD_T
-# undef SIZEOF_SIZE_T
-# undef SIZEOF_TIME_T
-# undef SIZEOF_VOID_P
-# undef SIZEOF__BOOL
-# undef SIZEOF_UINTPTR_T
-# undef SIZEOF_PTHREAD_T
-# undef WORDS_BIGENDIAN
-# undef DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754
-# undef DOUBLE_IS_BIG_ENDIAN_IEEE754
-# undef DOUBLE_IS_LITTLE_ENDIAN_IEEE754
-# undef HAVE_GCC_ASM_FOR_X87
-
-#    undef VA_LIST_IS_ARRAY
-#    if defined(__LP64__) && defined(__x86_64__)
-#        define VA_LIST_IS_ARRAY 1
-#    endif
-
-#    undef HAVE_LARGEFILE_SUPPORT
-#    ifndef __LP64__
-#         define HAVE_LARGEFILE_SUPPORT 1
-#    endif
-
-#    undef SIZEOF_LONG
-#    ifdef __LP64__
-#        define SIZEOF__BOOL            1
-#        define SIZEOF__BOOL            1
-#        define SIZEOF_LONG             8
-#        define SIZEOF_PTHREAD_T        8
-#        define SIZEOF_SIZE_T           8
-#        define SIZEOF_TIME_T           8
-#        define SIZEOF_VOID_P           8
-#        define SIZEOF_UINTPTR_T        8
-#        define SIZEOF_PTHREAD_T        8
-#    else
-#        ifdef __ppc__
-#           define SIZEOF__BOOL         4
-#        else
-#           define SIZEOF__BOOL         1
-#        endif
-#        define SIZEOF_LONG             4
-#        define SIZEOF_PTHREAD_T        4
-#        define SIZEOF_SIZE_T           4
-#        define SIZEOF_TIME_T           4
-#        define SIZEOF_VOID_P           4
-#        define SIZEOF_UINTPTR_T        4
-#        define SIZEOF_PTHREAD_T        4
-#    endif
-
-#    if defined(__LP64__)
-     /* MacOSX 10.4 (the first release to support 64-bit code
-      * at all) only supports 64-bit in the UNIX layer.
+#ifndef PYMACCONFIG_H 
+#define PYMACCONFIG_H 
+     /* 
+      * This file moves some of the autoconf magic to compile-time 
+      * when building on MacOSX. This is needed for building 4-way 
+      * universal binaries and for 64-bit universal binaries because 
+      * the values redefined below aren't configure-time constant but 
+      * only compile-time constant in these scenarios. 
+      */ 
+ 
+#if defined(__APPLE__) 
+ 
+# undef SIZEOF_LONG 
+# undef SIZEOF_PTHREAD_T 
+# undef SIZEOF_SIZE_T 
+# undef SIZEOF_TIME_T 
+# undef SIZEOF_VOID_P 
+# undef SIZEOF__BOOL 
+# undef SIZEOF_UINTPTR_T 
+# undef SIZEOF_PTHREAD_T 
+# undef WORDS_BIGENDIAN 
+# undef DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754 
+# undef DOUBLE_IS_BIG_ENDIAN_IEEE754 
+# undef DOUBLE_IS_LITTLE_ENDIAN_IEEE754 
+# undef HAVE_GCC_ASM_FOR_X87 
+ 
+#    undef VA_LIST_IS_ARRAY 
+#    if defined(__LP64__) && defined(__x86_64__) 
+#        define VA_LIST_IS_ARRAY 1 
+#    endif 
+ 
+#    undef HAVE_LARGEFILE_SUPPORT 
+#    ifndef __LP64__ 
+#         define HAVE_LARGEFILE_SUPPORT 1 
+#    endif 
+ 
+#    undef SIZEOF_LONG 
+#    ifdef __LP64__ 
+#        define SIZEOF__BOOL            1 
+#        define SIZEOF__BOOL            1 
+#        define SIZEOF_LONG             8 
+#        define SIZEOF_PTHREAD_T        8 
+#        define SIZEOF_SIZE_T           8 
+#        define SIZEOF_TIME_T           8 
+#        define SIZEOF_VOID_P           8 
+#        define SIZEOF_UINTPTR_T        8 
+#        define SIZEOF_PTHREAD_T        8 
+#    else 
+#        ifdef __ppc__ 
+#           define SIZEOF__BOOL         4 
+#        else 
+#           define SIZEOF__BOOL         1 
+#        endif 
+#        define SIZEOF_LONG             4 
+#        define SIZEOF_PTHREAD_T        4 
+#        define SIZEOF_SIZE_T           4 
+#        define SIZEOF_TIME_T           4 
+#        define SIZEOF_VOID_P           4 
+#        define SIZEOF_UINTPTR_T        4 
+#        define SIZEOF_PTHREAD_T        4 
+#    endif 
+ 
+#    if defined(__LP64__) 
+     /* MacOSX 10.4 (the first release to support 64-bit code 
+      * at all) only supports 64-bit in the UNIX layer. 
       * Therefore suppress the toolbox-glue in 64-bit mode.
-      */
-
+      */ 
+ 
     /* In 64-bit mode setpgrp always has no arguments, in 32-bit
-     * mode that depends on the compilation environment
-     */
-#       undef SETPGRP_HAVE_ARG
-
-#    endif
-
-#ifdef __BIG_ENDIAN__
-#define WORDS_BIGENDIAN 1
-#define DOUBLE_IS_BIG_ENDIAN_IEEE754
-#else
-#define DOUBLE_IS_LITTLE_ENDIAN_IEEE754
-#endif /* __BIG_ENDIAN */
-
-#ifdef __i386__
-# define HAVE_GCC_ASM_FOR_X87
-#endif
-
-    /*
-     * The definition in pyconfig.h is only valid on the OS release
-     * where configure ran on and not necessarily for all systems where
-     * the executable can be used on.
-     *
-     * Specifically: OSX 10.4 has limited supported for '%zd', while
-     * 10.5 has full support for '%zd'. A binary built on 10.5 won't
+     * mode that depends on the compilation environment 
+     */ 
+#       undef SETPGRP_HAVE_ARG 
+ 
+#    endif 
+ 
+#ifdef __BIG_ENDIAN__ 
+#define WORDS_BIGENDIAN 1 
+#define DOUBLE_IS_BIG_ENDIAN_IEEE754 
+#else 
+#define DOUBLE_IS_LITTLE_ENDIAN_IEEE754 
+#endif /* __BIG_ENDIAN */ 
+ 
+#ifdef __i386__ 
+# define HAVE_GCC_ASM_FOR_X87 
+#endif 
+ 
+    /* 
+     * The definition in pyconfig.h is only valid on the OS release 
+     * where configure ran on and not necessarily for all systems where 
+     * the executable can be used on. 
+     * 
+     * Specifically: OSX 10.4 has limited supported for '%zd', while 
+     * 10.5 has full support for '%zd'. A binary built on 10.5 won't 
      * work properly on 10.4 unless we suppress the definition
-     * of PY_FORMAT_SIZE_T
-     */
-#undef  PY_FORMAT_SIZE_T
-
-
-#endif /* defined(_APPLE__) */
-
-#endif /* PYMACCONFIG_H */
+     * of PY_FORMAT_SIZE_T 
+     */ 
+#undef  PY_FORMAT_SIZE_T 
+ 
+ 
+#endif /* defined(_APPLE__) */ 
+ 
+#endif /* PYMACCONFIG_H */ 
diff --git a/contrib/tools/python/src/Include/pymactoolbox.h b/contrib/tools/python/src/Include/pymactoolbox.h
index 6e48ca36a2..e7a9de993a 100644
--- a/contrib/tools/python/src/Include/pymactoolbox.h
+++ b/contrib/tools/python/src/Include/pymactoolbox.h
@@ -1,14 +1,14 @@
-/*
-** pymactoolbox.h - globals defined in mactoolboxglue.c
-*/
-#ifndef Py_PYMACTOOLBOX_H
-#define Py_PYMACTOOLBOX_H
-#ifdef __cplusplus
-	extern "C" {
-#endif
-
-#include <Carbon/Carbon.h>
-
+/* 
+** pymactoolbox.h - globals defined in mactoolboxglue.c 
+*/ 
+#ifndef Py_PYMACTOOLBOX_H 
+#define Py_PYMACTOOLBOX_H 
+#ifdef __cplusplus 
+	extern "C" { 
+#endif 
+ 
+#include <Carbon/Carbon.h> 
+ 
 /*
 ** Issue #27806: Workaround for gcc 4.x which does not have _has_include.
 */
@@ -25,208 +25,208 @@
 #endif
 
 #if APPLE_SUPPORTS_QUICKTIME
-#include <QuickTime/QuickTime.h>
+#include <QuickTime/QuickTime.h> 
 #endif /* APPLE_SUPPORTS_QUICKTIME */
-
-/*
-** Helper routines for error codes and such.
-*/
-char *PyMac_StrError(int);			/* strerror with mac errors */
-extern PyObject *PyMac_OSErrException;		/* Exception for OSErr */
-PyObject *PyMac_GetOSErrException(void);	/* Initialize & return it */
-PyObject *PyErr_Mac(PyObject *, int);		/* Exception with a mac error */
-PyObject *PyMac_Error(OSErr);			/* Uses PyMac_GetOSErrException */
+ 
+/* 
+** Helper routines for error codes and such. 
+*/ 
+char *PyMac_StrError(int);			/* strerror with mac errors */ 
+extern PyObject *PyMac_OSErrException;		/* Exception for OSErr */ 
+PyObject *PyMac_GetOSErrException(void);	/* Initialize & return it */ 
+PyObject *PyErr_Mac(PyObject *, int);		/* Exception with a mac error */ 
+PyObject *PyMac_Error(OSErr);			/* Uses PyMac_GetOSErrException */ 
 #if APPLE_SUPPORTS_QUICKTIME
-extern OSErr PyMac_GetFullPathname(FSSpec *, char *, int); /* convert
-							      fsspec->path */
+extern OSErr PyMac_GetFullPathname(FSSpec *, char *, int); /* convert 
+							      fsspec->path */ 
 #endif /* APPLE_SUPPORTS_QUICKTIME */
-
-/*
-** These conversion routines are defined in mactoolboxglue.c itself.
-*/
-int PyMac_GetOSType(PyObject *, OSType *);	/* argument parser for OSType */
-PyObject *PyMac_BuildOSType(OSType);		/* Convert OSType to PyObject */
-
-PyObject *PyMac_BuildNumVersion(NumVersion);/* Convert NumVersion to PyObject */
-
-int PyMac_GetStr255(PyObject *, Str255);	/* argument parser for Str255 */
-PyObject *PyMac_BuildStr255(Str255);		/* Convert Str255 to PyObject */
-PyObject *PyMac_BuildOptStr255(Str255);		/* Convert Str255 to PyObject,
-						   NULL to None */
-
-int PyMac_GetRect(PyObject *, Rect *);		/* argument parser for Rect */
-PyObject *PyMac_BuildRect(Rect *);		/* Convert Rect to PyObject */
-
-int PyMac_GetPoint(PyObject *, Point *);	/* argument parser for Point */
-PyObject *PyMac_BuildPoint(Point);		/* Convert Point to PyObject */
-
-int PyMac_GetEventRecord(PyObject *, EventRecord *); /* argument parser for
-							EventRecord */
-PyObject *PyMac_BuildEventRecord(EventRecord *); /* Convert EventRecord to
-						    PyObject */
-
-int PyMac_GetFixed(PyObject *, Fixed *);	/* argument parser for Fixed */
-PyObject *PyMac_BuildFixed(Fixed);		/* Convert Fixed to PyObject */
-int PyMac_Getwide(PyObject *, wide *);		/* argument parser for wide */
-PyObject *PyMac_Buildwide(wide *);		/* Convert wide to PyObject */
-
-/*
-** The rest of the routines are implemented by extension modules. If they are
-** dynamically loaded mactoolboxglue will contain a stub implementation of the
-** routine, which imports the module, whereupon the module's init routine will
-** communicate the routine pointer back to the stub.
-** If USE_TOOLBOX_OBJECT_GLUE is not defined there is no glue code, and the
-** extension modules simply declare the routine. This is the case for static
-** builds (and could be the case for MacPython CFM builds, because CFM extension
-** modules can reference each other without problems).
-*/
-
-#ifdef USE_TOOLBOX_OBJECT_GLUE
-/*
-** These macros are used in the module init code. If we use toolbox object glue
-** it sets the function pointer to point to the real function.
-*/
-#define PyMac_INIT_TOOLBOX_OBJECT_NEW(object, rtn) { \
-	extern PyObject *(*PyMacGluePtr_##rtn)(object); \
-	PyMacGluePtr_##rtn = _##rtn; \
-}
-#define PyMac_INIT_TOOLBOX_OBJECT_CONVERT(object, rtn) { \
-	extern int (*PyMacGluePtr_##rtn)(PyObject *, object *); \
-	PyMacGluePtr_##rtn = _##rtn; \
-}
-#else
-/*
-** If we don't use toolbox object glue the init macros are empty. Moreover, we define
-** _xxx_New to be the same as xxx_New, and the code in mactoolboxglue isn't included.
-*/
-#define PyMac_INIT_TOOLBOX_OBJECT_NEW(object, rtn)
-#define PyMac_INIT_TOOLBOX_OBJECT_CONVERT(object, rtn)
-#endif /* USE_TOOLBOX_OBJECT_GLUE */
-
-/* macfs exports */
-#ifndef __LP64__
-int PyMac_GetFSSpec(PyObject *, FSSpec *);	/* argument parser for FSSpec */
-PyObject *PyMac_BuildFSSpec(FSSpec *);		/* Convert FSSpec to PyObject */
-#endif /* !__LP64__ */
-
-int PyMac_GetFSRef(PyObject *, FSRef *);	/* argument parser for FSRef */
-PyObject *PyMac_BuildFSRef(FSRef *);		/* Convert FSRef to PyObject */
-
-/* AE exports */
-extern PyObject *AEDesc_New(AppleEvent *); /* XXXX Why passed by address?? */
-extern PyObject *AEDesc_NewBorrowed(AppleEvent *);
-extern int AEDesc_Convert(PyObject *, AppleEvent *);
-
-/* Cm exports */
-extern PyObject *CmpObj_New(Component);
-extern int CmpObj_Convert(PyObject *, Component *);
-extern PyObject *CmpInstObj_New(ComponentInstance);
-extern int CmpInstObj_Convert(PyObject *, ComponentInstance *);
-
-/* Ctl exports */
+ 
+/* 
+** These conversion routines are defined in mactoolboxglue.c itself. 
+*/ 
+int PyMac_GetOSType(PyObject *, OSType *);	/* argument parser for OSType */ 
+PyObject *PyMac_BuildOSType(OSType);		/* Convert OSType to PyObject */ 
+ 
+PyObject *PyMac_BuildNumVersion(NumVersion);/* Convert NumVersion to PyObject */ 
+ 
+int PyMac_GetStr255(PyObject *, Str255);	/* argument parser for Str255 */ 
+PyObject *PyMac_BuildStr255(Str255);		/* Convert Str255 to PyObject */ 
+PyObject *PyMac_BuildOptStr255(Str255);		/* Convert Str255 to PyObject, 
+						   NULL to None */ 
+ 
+int PyMac_GetRect(PyObject *, Rect *);		/* argument parser for Rect */ 
+PyObject *PyMac_BuildRect(Rect *);		/* Convert Rect to PyObject */ 
+ 
+int PyMac_GetPoint(PyObject *, Point *);	/* argument parser for Point */ 
+PyObject *PyMac_BuildPoint(Point);		/* Convert Point to PyObject */ 
+ 
+int PyMac_GetEventRecord(PyObject *, EventRecord *); /* argument parser for 
+							EventRecord */ 
+PyObject *PyMac_BuildEventRecord(EventRecord *); /* Convert EventRecord to 
+						    PyObject */ 
+ 
+int PyMac_GetFixed(PyObject *, Fixed *);	/* argument parser for Fixed */ 
+PyObject *PyMac_BuildFixed(Fixed);		/* Convert Fixed to PyObject */ 
+int PyMac_Getwide(PyObject *, wide *);		/* argument parser for wide */ 
+PyObject *PyMac_Buildwide(wide *);		/* Convert wide to PyObject */ 
+ 
+/* 
+** The rest of the routines are implemented by extension modules. If they are 
+** dynamically loaded mactoolboxglue will contain a stub implementation of the 
+** routine, which imports the module, whereupon the module's init routine will 
+** communicate the routine pointer back to the stub. 
+** If USE_TOOLBOX_OBJECT_GLUE is not defined there is no glue code, and the 
+** extension modules simply declare the routine. This is the case for static 
+** builds (and could be the case for MacPython CFM builds, because CFM extension 
+** modules can reference each other without problems). 
+*/ 
+ 
+#ifdef USE_TOOLBOX_OBJECT_GLUE 
+/* 
+** These macros are used in the module init code. If we use toolbox object glue 
+** it sets the function pointer to point to the real function. 
+*/ 
+#define PyMac_INIT_TOOLBOX_OBJECT_NEW(object, rtn) { \ 
+	extern PyObject *(*PyMacGluePtr_##rtn)(object); \ 
+	PyMacGluePtr_##rtn = _##rtn; \ 
+} 
+#define PyMac_INIT_TOOLBOX_OBJECT_CONVERT(object, rtn) { \ 
+	extern int (*PyMacGluePtr_##rtn)(PyObject *, object *); \ 
+	PyMacGluePtr_##rtn = _##rtn; \ 
+} 
+#else 
+/* 
+** If we don't use toolbox object glue the init macros are empty. Moreover, we define 
+** _xxx_New to be the same as xxx_New, and the code in mactoolboxglue isn't included. 
+*/ 
+#define PyMac_INIT_TOOLBOX_OBJECT_NEW(object, rtn) 
+#define PyMac_INIT_TOOLBOX_OBJECT_CONVERT(object, rtn) 
+#endif /* USE_TOOLBOX_OBJECT_GLUE */ 
+ 
+/* macfs exports */ 
+#ifndef __LP64__ 
+int PyMac_GetFSSpec(PyObject *, FSSpec *);	/* argument parser for FSSpec */ 
+PyObject *PyMac_BuildFSSpec(FSSpec *);		/* Convert FSSpec to PyObject */ 
+#endif /* !__LP64__ */ 
+ 
+int PyMac_GetFSRef(PyObject *, FSRef *);	/* argument parser for FSRef */ 
+PyObject *PyMac_BuildFSRef(FSRef *);		/* Convert FSRef to PyObject */ 
+ 
+/* AE exports */ 
+extern PyObject *AEDesc_New(AppleEvent *); /* XXXX Why passed by address?? */ 
+extern PyObject *AEDesc_NewBorrowed(AppleEvent *); 
+extern int AEDesc_Convert(PyObject *, AppleEvent *); 
+ 
+/* Cm exports */ 
+extern PyObject *CmpObj_New(Component); 
+extern int CmpObj_Convert(PyObject *, Component *); 
+extern PyObject *CmpInstObj_New(ComponentInstance); 
+extern int CmpInstObj_Convert(PyObject *, ComponentInstance *); 
+ 
+/* Ctl exports */ 
 #if APPLE_SUPPORTS_QUICKTIME
-extern PyObject *CtlObj_New(ControlHandle);
-extern int CtlObj_Convert(PyObject *, ControlHandle *);
+extern PyObject *CtlObj_New(ControlHandle); 
+extern int CtlObj_Convert(PyObject *, ControlHandle *); 
 #endif /* APPLE_SUPPORTS_QUICKTIME */
-
-/* Dlg exports */
+ 
+/* Dlg exports */ 
 #if APPLE_SUPPORTS_QUICKTIME
-extern PyObject *DlgObj_New(DialogPtr);
-extern int DlgObj_Convert(PyObject *, DialogPtr *);
-extern PyObject *DlgObj_WhichDialog(DialogPtr);
+extern PyObject *DlgObj_New(DialogPtr); 
+extern int DlgObj_Convert(PyObject *, DialogPtr *); 
+extern PyObject *DlgObj_WhichDialog(DialogPtr); 
 #endif /* APPLE_SUPPORTS_QUICKTIME */
-
-/* Drag exports */
+ 
+/* Drag exports */ 
 #if APPLE_SUPPORTS_QUICKTIME
-extern PyObject *DragObj_New(DragReference);
-extern int DragObj_Convert(PyObject *, DragReference *);
+extern PyObject *DragObj_New(DragReference); 
+extern int DragObj_Convert(PyObject *, DragReference *); 
 #endif /* APPLE_SUPPORTS_QUICKTIME */
-
-/* List exports */
+ 
+/* List exports */ 
 #if APPLE_SUPPORTS_QUICKTIME
-extern PyObject *ListObj_New(ListHandle);
-extern int ListObj_Convert(PyObject *, ListHandle *);
+extern PyObject *ListObj_New(ListHandle); 
+extern int ListObj_Convert(PyObject *, ListHandle *); 
 #endif /* APPLE_SUPPORTS_QUICKTIME */
-
-/* Menu exports */
+ 
+/* Menu exports */ 
 #if APPLE_SUPPORTS_QUICKTIME
-extern PyObject *MenuObj_New(MenuHandle);
-extern int MenuObj_Convert(PyObject *, MenuHandle *);
+extern PyObject *MenuObj_New(MenuHandle); 
+extern int MenuObj_Convert(PyObject *, MenuHandle *); 
 #endif /* APPLE_SUPPORTS_QUICKTIME */
-
-/* Qd exports */
+ 
+/* Qd exports */ 
 #if APPLE_SUPPORTS_QUICKTIME
-extern PyObject *GrafObj_New(GrafPtr);
-extern int GrafObj_Convert(PyObject *, GrafPtr *);
-extern PyObject *BMObj_New(BitMapPtr);
-extern int BMObj_Convert(PyObject *, BitMapPtr *);
-extern PyObject *QdRGB_New(RGBColor *);
-extern int QdRGB_Convert(PyObject *, RGBColor *);
+extern PyObject *GrafObj_New(GrafPtr); 
+extern int GrafObj_Convert(PyObject *, GrafPtr *); 
+extern PyObject *BMObj_New(BitMapPtr); 
+extern int BMObj_Convert(PyObject *, BitMapPtr *); 
+extern PyObject *QdRGB_New(RGBColor *); 
+extern int QdRGB_Convert(PyObject *, RGBColor *); 
 #endif /* APPLE_SUPPORTS_QUICKTIME */
-
-/* Qdoffs exports */
+ 
+/* Qdoffs exports */ 
 #if APPLE_SUPPORTS_QUICKTIME
-extern PyObject *GWorldObj_New(GWorldPtr);
-extern int GWorldObj_Convert(PyObject *, GWorldPtr *);
+extern PyObject *GWorldObj_New(GWorldPtr); 
+extern int GWorldObj_Convert(PyObject *, GWorldPtr *); 
 #endif /* APPLE_SUPPORTS_QUICKTIME */
-
-/* Qt exports */
+ 
+/* Qt exports */ 
 #if APPLE_SUPPORTS_QUICKTIME
-extern PyObject *TrackObj_New(Track);
-extern int TrackObj_Convert(PyObject *, Track *);
-extern PyObject *MovieObj_New(Movie);
-extern int MovieObj_Convert(PyObject *, Movie *);
-extern PyObject *MovieCtlObj_New(MovieController);
-extern int MovieCtlObj_Convert(PyObject *, MovieController *);
-extern PyObject *TimeBaseObj_New(TimeBase);
-extern int TimeBaseObj_Convert(PyObject *, TimeBase *);
-extern PyObject *UserDataObj_New(UserData);
-extern int UserDataObj_Convert(PyObject *, UserData *);
-extern PyObject *MediaObj_New(Media);
-extern int MediaObj_Convert(PyObject *, Media *);
+extern PyObject *TrackObj_New(Track); 
+extern int TrackObj_Convert(PyObject *, Track *); 
+extern PyObject *MovieObj_New(Movie); 
+extern int MovieObj_Convert(PyObject *, Movie *); 
+extern PyObject *MovieCtlObj_New(MovieController); 
+extern int MovieCtlObj_Convert(PyObject *, MovieController *); 
+extern PyObject *TimeBaseObj_New(TimeBase); 
+extern int TimeBaseObj_Convert(PyObject *, TimeBase *); 
+extern PyObject *UserDataObj_New(UserData); 
+extern int UserDataObj_Convert(PyObject *, UserData *); 
+extern PyObject *MediaObj_New(Media); 
+extern int MediaObj_Convert(PyObject *, Media *); 
 #endif /* APPLE_SUPPORTS_QUICKTIME */
-
-/* Res exports */
-extern PyObject *ResObj_New(Handle);
-extern int ResObj_Convert(PyObject *, Handle *);
-extern PyObject *OptResObj_New(Handle);
-extern int OptResObj_Convert(PyObject *, Handle *);
-
-/* TE exports */
+ 
+/* Res exports */ 
+extern PyObject *ResObj_New(Handle); 
+extern int ResObj_Convert(PyObject *, Handle *); 
+extern PyObject *OptResObj_New(Handle); 
+extern int OptResObj_Convert(PyObject *, Handle *); 
+ 
+/* TE exports */ 
 #if APPLE_SUPPORTS_QUICKTIME
-extern PyObject *TEObj_New(TEHandle);
-extern int TEObj_Convert(PyObject *, TEHandle *);
+extern PyObject *TEObj_New(TEHandle); 
+extern int TEObj_Convert(PyObject *, TEHandle *); 
 #endif /* APPLE_SUPPORTS_QUICKTIME */
-
-/* Win exports */
+ 
+/* Win exports */ 
 #if APPLE_SUPPORTS_QUICKTIME
-extern PyObject *WinObj_New(WindowPtr);
-extern int WinObj_Convert(PyObject *, WindowPtr *);
-extern PyObject *WinObj_WhichWindow(WindowPtr);
+extern PyObject *WinObj_New(WindowPtr); 
+extern int WinObj_Convert(PyObject *, WindowPtr *); 
+extern PyObject *WinObj_WhichWindow(WindowPtr); 
 #endif /* APPLE_SUPPORTS_QUICKTIME */
-
-/* CF exports */
-extern PyObject *CFObj_New(CFTypeRef);
-extern int CFObj_Convert(PyObject *, CFTypeRef *);
-extern PyObject *CFTypeRefObj_New(CFTypeRef);
-extern int CFTypeRefObj_Convert(PyObject *, CFTypeRef *);
-extern PyObject *CFStringRefObj_New(CFStringRef);
-extern int CFStringRefObj_Convert(PyObject *, CFStringRef *);
-extern PyObject *CFMutableStringRefObj_New(CFMutableStringRef);
-extern int CFMutableStringRefObj_Convert(PyObject *, CFMutableStringRef *);
-extern PyObject *CFArrayRefObj_New(CFArrayRef);
-extern int CFArrayRefObj_Convert(PyObject *, CFArrayRef *);
-extern PyObject *CFMutableArrayRefObj_New(CFMutableArrayRef);
-extern int CFMutableArrayRefObj_Convert(PyObject *, CFMutableArrayRef *);
-extern PyObject *CFDictionaryRefObj_New(CFDictionaryRef);
-extern int CFDictionaryRefObj_Convert(PyObject *, CFDictionaryRef *);
-extern PyObject *CFMutableDictionaryRefObj_New(CFMutableDictionaryRef);
-extern int CFMutableDictionaryRefObj_Convert(PyObject *, CFMutableDictionaryRef *);
-extern PyObject *CFURLRefObj_New(CFURLRef);
-extern int CFURLRefObj_Convert(PyObject *, CFURLRef *);
-extern int OptionalCFURLRefObj_Convert(PyObject *, CFURLRef *);
-
-#ifdef __cplusplus
-	}
-#endif
-#endif
+ 
+/* CF exports */ 
+extern PyObject *CFObj_New(CFTypeRef); 
+extern int CFObj_Convert(PyObject *, CFTypeRef *); 
+extern PyObject *CFTypeRefObj_New(CFTypeRef); 
+extern int CFTypeRefObj_Convert(PyObject *, CFTypeRef *); 
+extern PyObject *CFStringRefObj_New(CFStringRef); 
+extern int CFStringRefObj_Convert(PyObject *, CFStringRef *); 
+extern PyObject *CFMutableStringRefObj_New(CFMutableStringRef); 
+extern int CFMutableStringRefObj_Convert(PyObject *, CFMutableStringRef *); 
+extern PyObject *CFArrayRefObj_New(CFArrayRef); 
+extern int CFArrayRefObj_Convert(PyObject *, CFArrayRef *); 
+extern PyObject *CFMutableArrayRefObj_New(CFMutableArrayRef); 
+extern int CFMutableArrayRefObj_Convert(PyObject *, CFMutableArrayRef *); 
+extern PyObject *CFDictionaryRefObj_New(CFDictionaryRef); 
+extern int CFDictionaryRefObj_Convert(PyObject *, CFDictionaryRef *); 
+extern PyObject *CFMutableDictionaryRefObj_New(CFMutableDictionaryRef); 
+extern int CFMutableDictionaryRefObj_Convert(PyObject *, CFMutableDictionaryRef *); 
+extern PyObject *CFURLRefObj_New(CFURLRef); 
+extern int CFURLRefObj_Convert(PyObject *, CFURLRef *); 
+extern int OptionalCFURLRefObj_Convert(PyObject *, CFURLRef *); 
+ 
+#ifdef __cplusplus 
+	} 
+#endif 
+#endif 
diff --git a/contrib/tools/python/src/Include/pymath.h b/contrib/tools/python/src/Include/pymath.h
index b234f973f5..f78c4eb3b7 100644
--- a/contrib/tools/python/src/Include/pymath.h
+++ b/contrib/tools/python/src/Include/pymath.h
@@ -1,157 +1,157 @@
-#ifndef Py_PYMATH_H
-#define Py_PYMATH_H
-
-#include "pyconfig.h" /* include for defines */
-
-/**************************************************************************
-Symbols and macros to supply platform-independent interfaces to mathematical
-functions and constants
-**************************************************************************/
-
-/* Python provides implementations for copysign, round and hypot in
- * Python/pymath.c just in case your math library doesn't provide the
- * functions.
- *
- *Note: PC/pyconfig.h defines copysign as _copysign
- */
-#ifndef HAVE_COPYSIGN
-extern double copysign(double, double);
-#endif
-
-#ifndef HAVE_ROUND
-extern double round(double);
-#endif
-
-#ifndef HAVE_HYPOT
-extern double hypot(double, double);
-#endif
-
-/* extra declarations */
-#ifndef _MSC_VER
-#ifndef __STDC__
-extern double fmod (double, double);
-extern double frexp (double, int *);
-extern double ldexp (double, int);
-extern double modf (double, double *);
-extern double pow(double, double);
-#endif /* __STDC__ */
-#endif /* _MSC_VER */
-
-#ifdef _OSF_SOURCE
-/* OSF1 5.1 doesn't make these available with XOPEN_SOURCE_EXTENDED defined */
-extern int finite(double);
-extern double copysign(double, double);
-#endif
-
+#ifndef Py_PYMATH_H 
+#define Py_PYMATH_H 
+ 
+#include "pyconfig.h" /* include for defines */ 
+ 
+/************************************************************************** 
+Symbols and macros to supply platform-independent interfaces to mathematical 
+functions and constants 
+**************************************************************************/ 
+ 
+/* Python provides implementations for copysign, round and hypot in 
+ * Python/pymath.c just in case your math library doesn't provide the 
+ * functions. 
+ * 
+ *Note: PC/pyconfig.h defines copysign as _copysign 
+ */ 
+#ifndef HAVE_COPYSIGN 
+extern double copysign(double, double); 
+#endif 
+ 
+#ifndef HAVE_ROUND 
+extern double round(double); 
+#endif 
+ 
+#ifndef HAVE_HYPOT 
+extern double hypot(double, double); 
+#endif 
+ 
+/* extra declarations */ 
+#ifndef _MSC_VER 
+#ifndef __STDC__ 
+extern double fmod (double, double); 
+extern double frexp (double, int *); 
+extern double ldexp (double, int); 
+extern double modf (double, double *); 
+extern double pow(double, double); 
+#endif /* __STDC__ */ 
+#endif /* _MSC_VER */ 
+ 
+#ifdef _OSF_SOURCE 
+/* OSF1 5.1 doesn't make these available with XOPEN_SOURCE_EXTENDED defined */ 
+extern int finite(double); 
+extern double copysign(double, double); 
+#endif 
+ 
 /* High precision definition of pi and e (Euler)
- * The values are taken from libc6's math.h.
- */
-#ifndef Py_MATH_PIl
-#define Py_MATH_PIl 3.1415926535897932384626433832795029L
-#endif
-#ifndef Py_MATH_PI
-#define Py_MATH_PI 3.14159265358979323846
-#endif
-
-#ifndef Py_MATH_El
-#define Py_MATH_El 2.7182818284590452353602874713526625L
-#endif
-
-#ifndef Py_MATH_E
-#define Py_MATH_E 2.7182818284590452354
-#endif
-
-/* On x86, Py_FORCE_DOUBLE forces a floating-point number out of an x87 FPU
-   register and into a 64-bit memory location, rounding from extended
-   precision to double precision in the process.  On other platforms it does
-   nothing. */
-
-/* we take double rounding as evidence of x87 usage */
-#ifndef Py_FORCE_DOUBLE
-#  ifdef X87_DOUBLE_ROUNDING
-PyAPI_FUNC(double) _Py_force_double(double);
-#    define Py_FORCE_DOUBLE(X) (_Py_force_double(X))
-#  else
-#    define Py_FORCE_DOUBLE(X) (X)
-#  endif
-#endif
-
-#ifdef HAVE_GCC_ASM_FOR_X87
-PyAPI_FUNC(unsigned short) _Py_get_387controlword(void);
-PyAPI_FUNC(void) _Py_set_387controlword(unsigned short);
-#endif
-
-/* Py_IS_NAN(X)
- * Return 1 if float or double arg is a NaN, else 0.
- * Caution:
- *     X is evaluated more than once.
- *     This may not work on all platforms.  Each platform has *some*
- *     way to spell this, though -- override in pyconfig.h if you have
- *     a platform where it doesn't work.
- * Note: PC/pyconfig.h defines Py_IS_NAN as _isnan
- */
-#ifndef Py_IS_NAN
-#if defined HAVE_DECL_ISNAN && HAVE_DECL_ISNAN == 1
-#define Py_IS_NAN(X) isnan(X)
-#else
-#define Py_IS_NAN(X) ((X) != (X))
-#endif
-#endif
-
-/* Py_IS_INFINITY(X)
- * Return 1 if float or double arg is an infinity, else 0.
- * Caution:
- *    X is evaluated more than once.
- *    This implementation may set the underflow flag if |X| is very small;
- *    it really can't be implemented correctly (& easily) before C99.
- *    Override in pyconfig.h if you have a better spelling on your platform.
- *  Py_FORCE_DOUBLE is used to avoid getting false negatives from a
- *    non-infinite value v sitting in an 80-bit x87 register such that
- *    v becomes infinite when spilled from the register to 64-bit memory.
- * Note: PC/pyconfig.h defines Py_IS_INFINITY as _isinf
- */
-#ifndef Py_IS_INFINITY
-#  if defined HAVE_DECL_ISINF && HAVE_DECL_ISINF == 1
-#    define Py_IS_INFINITY(X) isinf(X)
-#  else
-#    define Py_IS_INFINITY(X) ((X) &&                                   \
-                               (Py_FORCE_DOUBLE(X)*0.5 == Py_FORCE_DOUBLE(X)))
-#  endif
-#endif
-
-/* Py_IS_FINITE(X)
- * Return 1 if float or double arg is neither infinite nor NAN, else 0.
- * Some compilers (e.g. VisualStudio) have intrisics for this, so a special
- * macro for this particular test is useful
- * Note: PC/pyconfig.h defines Py_IS_FINITE as _finite
- */
-#ifndef Py_IS_FINITE
-#if defined HAVE_DECL_ISFINITE && HAVE_DECL_ISFINITE == 1
-#define Py_IS_FINITE(X) isfinite(X)
-#elif defined HAVE_FINITE
-#define Py_IS_FINITE(X) finite(X)
-#else
-#define Py_IS_FINITE(X) (!Py_IS_INFINITY(X) && !Py_IS_NAN(X))
-#endif
-#endif
-
-/* HUGE_VAL is supposed to expand to a positive double infinity.  Python
- * uses Py_HUGE_VAL instead because some platforms are broken in this
- * respect.  We used to embed code in pyport.h to try to worm around that,
- * but different platforms are broken in conflicting ways.  If you're on
- * a platform where HUGE_VAL is defined incorrectly, fiddle your Python
- * config to #define Py_HUGE_VAL to something that works on your platform.
- */
-#ifndef Py_HUGE_VAL
-#define Py_HUGE_VAL HUGE_VAL
-#endif
-
-/* Py_NAN
- * A value that evaluates to a NaN. On IEEE 754 platforms INF*0 or
- * INF/INF works. Define Py_NO_NAN in pyconfig.h if your platform
- * doesn't support NaNs.
- */
-#if !defined(Py_NAN) && !defined(Py_NO_NAN)
+ * The values are taken from libc6's math.h. 
+ */ 
+#ifndef Py_MATH_PIl 
+#define Py_MATH_PIl 3.1415926535897932384626433832795029L 
+#endif 
+#ifndef Py_MATH_PI 
+#define Py_MATH_PI 3.14159265358979323846 
+#endif 
+ 
+#ifndef Py_MATH_El 
+#define Py_MATH_El 2.7182818284590452353602874713526625L 
+#endif 
+ 
+#ifndef Py_MATH_E 
+#define Py_MATH_E 2.7182818284590452354 
+#endif 
+ 
+/* On x86, Py_FORCE_DOUBLE forces a floating-point number out of an x87 FPU 
+   register and into a 64-bit memory location, rounding from extended 
+   precision to double precision in the process.  On other platforms it does 
+   nothing. */ 
+ 
+/* we take double rounding as evidence of x87 usage */ 
+#ifndef Py_FORCE_DOUBLE 
+#  ifdef X87_DOUBLE_ROUNDING 
+PyAPI_FUNC(double) _Py_force_double(double); 
+#    define Py_FORCE_DOUBLE(X) (_Py_force_double(X)) 
+#  else 
+#    define Py_FORCE_DOUBLE(X) (X) 
+#  endif 
+#endif 
+ 
+#ifdef HAVE_GCC_ASM_FOR_X87 
+PyAPI_FUNC(unsigned short) _Py_get_387controlword(void); 
+PyAPI_FUNC(void) _Py_set_387controlword(unsigned short); 
+#endif 
+ 
+/* Py_IS_NAN(X) 
+ * Return 1 if float or double arg is a NaN, else 0. 
+ * Caution: 
+ *     X is evaluated more than once. 
+ *     This may not work on all platforms.  Each platform has *some* 
+ *     way to spell this, though -- override in pyconfig.h if you have 
+ *     a platform where it doesn't work. 
+ * Note: PC/pyconfig.h defines Py_IS_NAN as _isnan 
+ */ 
+#ifndef Py_IS_NAN 
+#if defined HAVE_DECL_ISNAN && HAVE_DECL_ISNAN == 1 
+#define Py_IS_NAN(X) isnan(X) 
+#else 
+#define Py_IS_NAN(X) ((X) != (X)) 
+#endif 
+#endif 
+ 
+/* Py_IS_INFINITY(X) 
+ * Return 1 if float or double arg is an infinity, else 0. 
+ * Caution: 
+ *    X is evaluated more than once. 
+ *    This implementation may set the underflow flag if |X| is very small; 
+ *    it really can't be implemented correctly (& easily) before C99. 
+ *    Override in pyconfig.h if you have a better spelling on your platform. 
+ *  Py_FORCE_DOUBLE is used to avoid getting false negatives from a 
+ *    non-infinite value v sitting in an 80-bit x87 register such that 
+ *    v becomes infinite when spilled from the register to 64-bit memory. 
+ * Note: PC/pyconfig.h defines Py_IS_INFINITY as _isinf 
+ */ 
+#ifndef Py_IS_INFINITY 
+#  if defined HAVE_DECL_ISINF && HAVE_DECL_ISINF == 1 
+#    define Py_IS_INFINITY(X) isinf(X) 
+#  else 
+#    define Py_IS_INFINITY(X) ((X) &&                                   \ 
+                               (Py_FORCE_DOUBLE(X)*0.5 == Py_FORCE_DOUBLE(X))) 
+#  endif 
+#endif 
+ 
+/* Py_IS_FINITE(X) 
+ * Return 1 if float or double arg is neither infinite nor NAN, else 0. 
+ * Some compilers (e.g. VisualStudio) have intrisics for this, so a special 
+ * macro for this particular test is useful 
+ * Note: PC/pyconfig.h defines Py_IS_FINITE as _finite 
+ */ 
+#ifndef Py_IS_FINITE 
+#if defined HAVE_DECL_ISFINITE && HAVE_DECL_ISFINITE == 1 
+#define Py_IS_FINITE(X) isfinite(X) 
+#elif defined HAVE_FINITE 
+#define Py_IS_FINITE(X) finite(X) 
+#else 
+#define Py_IS_FINITE(X) (!Py_IS_INFINITY(X) && !Py_IS_NAN(X)) 
+#endif 
+#endif 
+ 
+/* HUGE_VAL is supposed to expand to a positive double infinity.  Python 
+ * uses Py_HUGE_VAL instead because some platforms are broken in this 
+ * respect.  We used to embed code in pyport.h to try to worm around that, 
+ * but different platforms are broken in conflicting ways.  If you're on 
+ * a platform where HUGE_VAL is defined incorrectly, fiddle your Python 
+ * config to #define Py_HUGE_VAL to something that works on your platform. 
+ */ 
+#ifndef Py_HUGE_VAL 
+#define Py_HUGE_VAL HUGE_VAL 
+#endif 
+ 
+/* Py_NAN 
+ * A value that evaluates to a NaN. On IEEE 754 platforms INF*0 or 
+ * INF/INF works. Define Py_NO_NAN in pyconfig.h if your platform 
+ * doesn't support NaNs. 
+ */ 
+#if !defined(Py_NAN) && !defined(Py_NO_NAN) 
 #if !defined(__INTEL_COMPILER)
     #define Py_NAN (Py_HUGE_VAL * 0.)
 #else /* __INTEL_COMPILER */
@@ -175,40 +175,40 @@ PyAPI_FUNC(void) _Py_set_387controlword(unsigned short);
         #define Py_NAN (__nan_store.__icc_nan)
     #endif /* ICC_NAN_STRICT */
 #endif /* __INTEL_COMPILER */
-#endif
-
-/* Py_OVERFLOWED(X)
- * Return 1 iff a libm function overflowed.  Set errno to 0 before calling
- * a libm function, and invoke this macro after, passing the function
- * result.
- * Caution:
- *    This isn't reliable.  C99 no longer requires libm to set errno under
- *	  any exceptional condition, but does require +- HUGE_VAL return
- *	  values on overflow.  A 754 box *probably* maps HUGE_VAL to a
- *	  double infinity, and we're cool if that's so, unless the input
- *	  was an infinity and an infinity is the expected result.  A C89
- *	  system sets errno to ERANGE, so we check for that too.  We're
- *	  out of luck if a C99 754 box doesn't map HUGE_VAL to +Inf, or
- *	  if the returned result is a NaN, or if a C89 box returns HUGE_VAL
- *	  in non-overflow cases.
- *    X is evaluated more than once.
- * Some platforms have better way to spell this, so expect some #ifdef'ery.
- *
- * OpenBSD uses 'isinf()' because a compiler bug on that platform causes
- * the longer macro version to be mis-compiled. This isn't optimal, and
- * should be removed once a newer compiler is available on that platform.
- * The system that had the failure was running OpenBSD 3.2 on Intel, with
- * gcc 2.95.3.
- *
- * According to Tim's checkin, the FreeBSD systems use isinf() to work
- * around a FPE bug on that platform.
- */
-#if defined(__FreeBSD__) || defined(__OpenBSD__)
-#define Py_OVERFLOWED(X) isinf(X)
-#else
-#define Py_OVERFLOWED(X) ((X) != 0.0 && (errno == ERANGE ||    \
-					 (X) == Py_HUGE_VAL || \
-					 (X) == -Py_HUGE_VAL))
-#endif
-
-#endif /* Py_PYMATH_H */
+#endif 
+ 
+/* Py_OVERFLOWED(X) 
+ * Return 1 iff a libm function overflowed.  Set errno to 0 before calling 
+ * a libm function, and invoke this macro after, passing the function 
+ * result. 
+ * Caution: 
+ *    This isn't reliable.  C99 no longer requires libm to set errno under 
+ *	  any exceptional condition, but does require +- HUGE_VAL return 
+ *	  values on overflow.  A 754 box *probably* maps HUGE_VAL to a 
+ *	  double infinity, and we're cool if that's so, unless the input 
+ *	  was an infinity and an infinity is the expected result.  A C89 
+ *	  system sets errno to ERANGE, so we check for that too.  We're 
+ *	  out of luck if a C99 754 box doesn't map HUGE_VAL to +Inf, or 
+ *	  if the returned result is a NaN, or if a C89 box returns HUGE_VAL 
+ *	  in non-overflow cases. 
+ *    X is evaluated more than once. 
+ * Some platforms have better way to spell this, so expect some #ifdef'ery. 
+ * 
+ * OpenBSD uses 'isinf()' because a compiler bug on that platform causes 
+ * the longer macro version to be mis-compiled. This isn't optimal, and 
+ * should be removed once a newer compiler is available on that platform. 
+ * The system that had the failure was running OpenBSD 3.2 on Intel, with 
+ * gcc 2.95.3. 
+ * 
+ * According to Tim's checkin, the FreeBSD systems use isinf() to work 
+ * around a FPE bug on that platform. 
+ */ 
+#if defined(__FreeBSD__) || defined(__OpenBSD__) 
+#define Py_OVERFLOWED(X) isinf(X) 
+#else 
+#define Py_OVERFLOWED(X) ((X) != 0.0 && (errno == ERANGE ||    \ 
+					 (X) == Py_HUGE_VAL || \ 
+					 (X) == -Py_HUGE_VAL)) 
+#endif 
+ 
+#endif /* Py_PYMATH_H */ 
diff --git a/contrib/tools/python/src/Include/pymem.h b/contrib/tools/python/src/Include/pymem.h
index 0d7e48afab..0c247d7f41 100644
--- a/contrib/tools/python/src/Include/pymem.h
+++ b/contrib/tools/python/src/Include/pymem.h
@@ -1,117 +1,117 @@
-/* The PyMem_ family:  low-level memory allocation interfaces.
-   See objimpl.h for the PyObject_ memory family.
-*/
-
-#ifndef Py_PYMEM_H
-#define Py_PYMEM_H
-
-#include "pyport.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
+/* The PyMem_ family:  low-level memory allocation interfaces. 
+   See objimpl.h for the PyObject_ memory family. 
+*/ 
+ 
+#ifndef Py_PYMEM_H 
+#define Py_PYMEM_H 
+ 
+#include "pyport.h" 
+ 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
 PyAPI_FUNC(void *) PyMem_RawMalloc(size_t size);
 PyAPI_FUNC(void *) PyMem_RawRealloc(void *ptr, size_t new_size);
 PyAPI_FUNC(void) PyMem_RawFree(void *ptr);
 
 
-/* BEWARE:
-
-   Each interface exports both functions and macros.  Extension modules should
-   use the functions, to ensure binary compatibility across Python versions.
-   Because the Python implementation is free to change internal details, and
-   the macros may (or may not) expose details for speed, if you do use the
-   macros you must recompile your extensions with each Python release.
-
-   Never mix calls to PyMem_ with calls to the platform malloc/realloc/
-   calloc/free.  For example, on Windows different DLLs may end up using
-   different heaps, and if you use PyMem_Malloc you'll get the memory from the
-   heap used by the Python DLL; it could be a disaster if you free()'ed that
-   directly in your own extension.  Using PyMem_Free instead ensures Python
-   can return the memory to the proper heap.  As another example, in
-   PYMALLOC_DEBUG mode, Python wraps all calls to all PyMem_ and PyObject_
-   memory functions in special debugging wrappers that add additional
-   debugging info to dynamic memory blocks.  The system routines have no idea
-   what to do with that stuff, and the Python wrappers have no idea what to do
-   with raw blocks obtained directly by the system routines then.
-
-   The GIL must be held when using these APIs.
-*/
-
-/*
- * Raw memory interface
- * ====================
- */
-
-/* Functions
-
-   Functions supplying platform-independent semantics for malloc/realloc/
-   free.  These functions make sure that allocating 0 bytes returns a distinct
-   non-NULL pointer (whenever possible -- if we're flat out of memory, NULL
-   may be returned), even if the platform malloc and realloc don't.
-   Returned pointers must be checked for NULL explicitly.  No action is
-   performed on failure (no exception is set, no warning is printed, etc).
-*/
-
+/* BEWARE: 
+ 
+   Each interface exports both functions and macros.  Extension modules should 
+   use the functions, to ensure binary compatibility across Python versions. 
+   Because the Python implementation is free to change internal details, and 
+   the macros may (or may not) expose details for speed, if you do use the 
+   macros you must recompile your extensions with each Python release. 
+ 
+   Never mix calls to PyMem_ with calls to the platform malloc/realloc/ 
+   calloc/free.  For example, on Windows different DLLs may end up using 
+   different heaps, and if you use PyMem_Malloc you'll get the memory from the 
+   heap used by the Python DLL; it could be a disaster if you free()'ed that 
+   directly in your own extension.  Using PyMem_Free instead ensures Python 
+   can return the memory to the proper heap.  As another example, in 
+   PYMALLOC_DEBUG mode, Python wraps all calls to all PyMem_ and PyObject_ 
+   memory functions in special debugging wrappers that add additional 
+   debugging info to dynamic memory blocks.  The system routines have no idea 
+   what to do with that stuff, and the Python wrappers have no idea what to do 
+   with raw blocks obtained directly by the system routines then. 
+ 
+   The GIL must be held when using these APIs. 
+*/ 
+ 
+/* 
+ * Raw memory interface 
+ * ==================== 
+ */ 
+ 
+/* Functions 
+ 
+   Functions supplying platform-independent semantics for malloc/realloc/ 
+   free.  These functions make sure that allocating 0 bytes returns a distinct 
+   non-NULL pointer (whenever possible -- if we're flat out of memory, NULL 
+   may be returned), even if the platform malloc and realloc don't. 
+   Returned pointers must be checked for NULL explicitly.  No action is 
+   performed on failure (no exception is set, no warning is printed, etc). 
+*/ 
+ 
 PyAPI_FUNC(void *) PyMem_Malloc(size_t size);
 PyAPI_FUNC(void *) PyMem_Realloc(void *ptr, size_t new_size);
 PyAPI_FUNC(void) PyMem_Free(void *ptr);
-
+ 
 PyAPI_FUNC(char *) _PyMem_RawStrdup(const char *str);
 PyAPI_FUNC(char *) _PyMem_Strdup(const char *str);
 
-/* Starting from Python 1.6, the wrappers Py_{Malloc,Realloc,Free} are
-   no longer supported. They used to call PyErr_NoMemory() on failure. */
-
-/* Macros. */
-
-/* PyMem_MALLOC(0) means malloc(1). Some systems would return NULL
-   for malloc(0), which would be treated as an error. Some platforms
-   would return a pointer with no memory behind it, which would break
-   pymalloc. To solve these problems, allocate an extra byte. */
-/* Returns NULL to indicate error if a negative size or size larger than
-   Py_ssize_t can represent is supplied.  Helps prevents security holes. */
+/* Starting from Python 1.6, the wrappers Py_{Malloc,Realloc,Free} are 
+   no longer supported. They used to call PyErr_NoMemory() on failure. */ 
+ 
+/* Macros. */ 
+ 
+/* PyMem_MALLOC(0) means malloc(1). Some systems would return NULL 
+   for malloc(0), which would be treated as an error. Some platforms 
+   would return a pointer with no memory behind it, which would break 
+   pymalloc. To solve these problems, allocate an extra byte. */ 
+/* Returns NULL to indicate error if a negative size or size larger than 
+   Py_ssize_t can represent is supplied.  Helps prevents security holes. */ 
 #define PyMem_MALLOC(n)         PyMem_Malloc(n)
 #define PyMem_REALLOC(p, n)     PyMem_Realloc(p, n)
 #define PyMem_FREE(p)           PyMem_Free(p)
-
-/*
- * Type-oriented memory interface
- * ==============================
- *
- * Allocate memory for n objects of the given type.  Returns a new pointer
- * or NULL if the request was too large or memory allocation failed.  Use
- * these macros rather than doing the multiplication yourself so that proper
- * overflow checking is always done.
- */
-
-#define PyMem_New(type, n) \
-  ( ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL :	\
-	( (type *) PyMem_Malloc((n) * sizeof(type)) ) )
-#define PyMem_NEW(type, n) \
-  ( ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL :	\
-	( (type *) PyMem_MALLOC((n) * sizeof(type)) ) )
-
-/*
- * The value of (p) is always clobbered by this macro regardless of success.
- * The caller MUST check if (p) is NULL afterwards and deal with the memory
- * error if so.  This means the original value of (p) MUST be saved for the
- * caller's memory error handler to not lose track of it.
- */
-#define PyMem_Resize(p, type, n) \
-  ( (p) = ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL :	\
-	(type *) PyMem_Realloc((p), (n) * sizeof(type)) )
-#define PyMem_RESIZE(p, type, n) \
-  ( (p) = ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL :	\
-	(type *) PyMem_REALLOC((p), (n) * sizeof(type)) )
-
-/* PyMem{Del,DEL} are left over from ancient days, and shouldn't be used
- * anymore.  They're just confusing aliases for PyMem_{Free,FREE} now.
- */
-#define PyMem_Del		PyMem_Free
-#define PyMem_DEL		PyMem_FREE
-
+ 
+/* 
+ * Type-oriented memory interface 
+ * ============================== 
+ * 
+ * Allocate memory for n objects of the given type.  Returns a new pointer 
+ * or NULL if the request was too large or memory allocation failed.  Use 
+ * these macros rather than doing the multiplication yourself so that proper 
+ * overflow checking is always done. 
+ */ 
+ 
+#define PyMem_New(type, n) \ 
+  ( ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL :	\ 
+	( (type *) PyMem_Malloc((n) * sizeof(type)) ) ) 
+#define PyMem_NEW(type, n) \ 
+  ( ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL :	\ 
+	( (type *) PyMem_MALLOC((n) * sizeof(type)) ) ) 
+ 
+/* 
+ * The value of (p) is always clobbered by this macro regardless of success. 
+ * The caller MUST check if (p) is NULL afterwards and deal with the memory 
+ * error if so.  This means the original value of (p) MUST be saved for the 
+ * caller's memory error handler to not lose track of it. 
+ */ 
+#define PyMem_Resize(p, type, n) \ 
+  ( (p) = ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL :	\ 
+	(type *) PyMem_Realloc((p), (n) * sizeof(type)) ) 
+#define PyMem_RESIZE(p, type, n) \ 
+  ( (p) = ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL :	\ 
+	(type *) PyMem_REALLOC((p), (n) * sizeof(type)) ) 
+ 
+/* PyMem{Del,DEL} are left over from ancient days, and shouldn't be used 
+ * anymore.  They're just confusing aliases for PyMem_{Free,FREE} now. 
+ */ 
+#define PyMem_Del		PyMem_Free 
+#define PyMem_DEL		PyMem_FREE 
+ 
 typedef enum {
     /* PyMem_RawMalloc(), PyMem_RawRealloc() and PyMem_RawFree() */
     PYMEM_DOMAIN_RAW,
@@ -173,8 +173,8 @@ PyAPI_FUNC(void) PyMem_SetAllocator(PyMemAllocatorDomain domain,
    The function does nothing if Python is not compiled is debug mode. */
 PyAPI_FUNC(void) PyMem_SetupDebugHooks(void);
 
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !Py_PYMEM_H */
+#ifdef __cplusplus 
+} 
+#endif 
+ 
+#endif /* !Py_PYMEM_H */ 
diff --git a/contrib/tools/python/src/Include/pyport.h b/contrib/tools/python/src/Include/pyport.h
index ad2ff5929a..8633efc629 100644
--- a/contrib/tools/python/src/Include/pyport.h
+++ b/contrib/tools/python/src/Include/pyport.h
@@ -1,567 +1,567 @@
-#ifndef Py_PYPORT_H
-#define Py_PYPORT_H
-
-#include "pyconfig.h" /* include for defines */
-
-/* Some versions of HP-UX & Solaris need inttypes.h for int32_t,
-   INT32_MAX, etc. */
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-
-/**************************************************************************
-Symbols and macros to supply platform-independent interfaces to basic
-C language & library operations whose spellings vary across platforms.
-
-Please try to make documentation here as clear as possible:  by definition,
-the stuff here is trying to illuminate C's darkest corners.
-
-Config #defines referenced here:
-
-SIGNED_RIGHT_SHIFT_ZERO_FILLS
-Meaning:  To be defined iff i>>j does not extend the sign bit when i is a
-          signed integral type and i < 0.
-Used in:  Py_ARITHMETIC_RIGHT_SHIFT
-
-Py_DEBUG
-Meaning:  Extra checks compiled in for debug mode.
-Used in:  Py_SAFE_DOWNCAST
-
-HAVE_UINTPTR_T
-Meaning:  The C9X type uintptr_t is supported by the compiler
-Used in:  Py_uintptr_t
-
-HAVE_LONG_LONG
-Meaning:  The compiler supports the C type "long long"
-Used in:  PY_LONG_LONG
-
-**************************************************************************/
-
-
-/* For backward compatibility only. Obsolete, do not use. */
-#ifdef HAVE_PROTOTYPES
-#define Py_PROTO(x) x
-#else
-#define Py_PROTO(x) ()
-#endif
-#ifndef Py_FPROTO
-#define Py_FPROTO(x) Py_PROTO(x)
-#endif
-
-/* typedefs for some C9X-defined synonyms for integral types.
- *
- * The names in Python are exactly the same as the C9X names, except with a
- * Py_ prefix.  Until C9X is universally implemented, this is the only way
- * to ensure that Python gets reliable names that don't conflict with names
- * in non-Python code that are playing their own tricks to define the C9X
- * names.
- *
- * NOTE: don't go nuts here!  Python has no use for *most* of the C9X
- * integral synonyms.  Only define the ones we actually need.
- */
-
-#ifdef HAVE_LONG_LONG
-#ifndef PY_LONG_LONG
-#define PY_LONG_LONG long long
-#if defined(LLONG_MAX)
-/* If LLONG_MAX is defined in limits.h, use that. */
-#define PY_LLONG_MIN LLONG_MIN
-#define PY_LLONG_MAX LLONG_MAX
-#define PY_ULLONG_MAX ULLONG_MAX
-#elif defined(__LONG_LONG_MAX__)
-/* Otherwise, if GCC has a builtin define, use that. */
-#define PY_LLONG_MAX __LONG_LONG_MAX__
-#define PY_LLONG_MIN (-PY_LLONG_MAX-1)
-#define PY_ULLONG_MAX (__LONG_LONG_MAX__*2ULL + 1ULL)
-#else
-/* Otherwise, rely on two's complement. */
-#define PY_ULLONG_MAX (~0ULL)
-#define PY_LLONG_MAX  ((long long)(PY_ULLONG_MAX>>1))
-#define PY_LLONG_MIN (-PY_LLONG_MAX-1)
-#endif /* LLONG_MAX */
-#endif
-#endif /* HAVE_LONG_LONG */
-
-/* a build with 30-bit digits for Python long integers needs an exact-width
- * 32-bit unsigned integer type to store those digits.  (We could just use
- * type 'unsigned long', but that would be wasteful on a system where longs
- * are 64-bits.)  On Unix systems, the autoconf macro AC_TYPE_UINT32_T defines
- * uint32_t to be such a type unless stdint.h or inttypes.h defines uint32_t.
- * However, it doesn't set HAVE_UINT32_T, so we do that here.
- */
+#ifndef Py_PYPORT_H 
+#define Py_PYPORT_H 
+ 
+#include "pyconfig.h" /* include for defines */ 
+ 
+/* Some versions of HP-UX & Solaris need inttypes.h for int32_t, 
+   INT32_MAX, etc. */ 
+#ifdef HAVE_INTTYPES_H 
+#include <inttypes.h> 
+#endif 
+ 
+#ifdef HAVE_STDINT_H 
+#include <stdint.h> 
+#endif 
+ 
+/************************************************************************** 
+Symbols and macros to supply platform-independent interfaces to basic 
+C language & library operations whose spellings vary across platforms. 
+ 
+Please try to make documentation here as clear as possible:  by definition, 
+the stuff here is trying to illuminate C's darkest corners. 
+ 
+Config #defines referenced here: 
+ 
+SIGNED_RIGHT_SHIFT_ZERO_FILLS 
+Meaning:  To be defined iff i>>j does not extend the sign bit when i is a 
+          signed integral type and i < 0. 
+Used in:  Py_ARITHMETIC_RIGHT_SHIFT 
+ 
+Py_DEBUG 
+Meaning:  Extra checks compiled in for debug mode. 
+Used in:  Py_SAFE_DOWNCAST 
+ 
+HAVE_UINTPTR_T 
+Meaning:  The C9X type uintptr_t is supported by the compiler 
+Used in:  Py_uintptr_t 
+ 
+HAVE_LONG_LONG 
+Meaning:  The compiler supports the C type "long long" 
+Used in:  PY_LONG_LONG 
+ 
+**************************************************************************/ 
+ 
+ 
+/* For backward compatibility only. Obsolete, do not use. */ 
+#ifdef HAVE_PROTOTYPES 
+#define Py_PROTO(x) x 
+#else 
+#define Py_PROTO(x) () 
+#endif 
+#ifndef Py_FPROTO 
+#define Py_FPROTO(x) Py_PROTO(x) 
+#endif 
+ 
+/* typedefs for some C9X-defined synonyms for integral types. 
+ * 
+ * The names in Python are exactly the same as the C9X names, except with a 
+ * Py_ prefix.  Until C9X is universally implemented, this is the only way 
+ * to ensure that Python gets reliable names that don't conflict with names 
+ * in non-Python code that are playing their own tricks to define the C9X 
+ * names. 
+ * 
+ * NOTE: don't go nuts here!  Python has no use for *most* of the C9X 
+ * integral synonyms.  Only define the ones we actually need. 
+ */ 
+ 
+#ifdef HAVE_LONG_LONG 
+#ifndef PY_LONG_LONG 
+#define PY_LONG_LONG long long 
+#if defined(LLONG_MAX) 
+/* If LLONG_MAX is defined in limits.h, use that. */ 
+#define PY_LLONG_MIN LLONG_MIN 
+#define PY_LLONG_MAX LLONG_MAX 
+#define PY_ULLONG_MAX ULLONG_MAX 
+#elif defined(__LONG_LONG_MAX__) 
+/* Otherwise, if GCC has a builtin define, use that. */ 
+#define PY_LLONG_MAX __LONG_LONG_MAX__ 
+#define PY_LLONG_MIN (-PY_LLONG_MAX-1) 
+#define PY_ULLONG_MAX (__LONG_LONG_MAX__*2ULL + 1ULL) 
+#else 
+/* Otherwise, rely on two's complement. */ 
+#define PY_ULLONG_MAX (~0ULL) 
+#define PY_LLONG_MAX  ((long long)(PY_ULLONG_MAX>>1)) 
+#define PY_LLONG_MIN (-PY_LLONG_MAX-1) 
+#endif /* LLONG_MAX */ 
+#endif 
+#endif /* HAVE_LONG_LONG */ 
+ 
+/* a build with 30-bit digits for Python long integers needs an exact-width 
+ * 32-bit unsigned integer type to store those digits.  (We could just use 
+ * type 'unsigned long', but that would be wasteful on a system where longs 
+ * are 64-bits.)  On Unix systems, the autoconf macro AC_TYPE_UINT32_T defines 
+ * uint32_t to be such a type unless stdint.h or inttypes.h defines uint32_t. 
+ * However, it doesn't set HAVE_UINT32_T, so we do that here. 
+ */ 
 #ifdef uint32_t
 #define HAVE_UINT32_T 1
 #endif
 
 #ifdef HAVE_UINT32_T
-#ifndef PY_UINT32_T
-#define PY_UINT32_T uint32_t
-#endif
-#endif
-
-/* Macros for a 64-bit unsigned integer type; used for type 'twodigits' in the
- * long integer implementation, when 30-bit digits are enabled.
- */
+#ifndef PY_UINT32_T 
+#define PY_UINT32_T uint32_t 
+#endif 
+#endif 
+ 
+/* Macros for a 64-bit unsigned integer type; used for type 'twodigits' in the 
+ * long integer implementation, when 30-bit digits are enabled. 
+ */ 
 #ifdef uint64_t
 #define HAVE_UINT64_T 1
 #endif
 
 #ifdef HAVE_UINT64_T
-#ifndef PY_UINT64_T
-#define PY_UINT64_T uint64_t
-#endif
-#endif
-
-/* Signed variants of the above */
+#ifndef PY_UINT64_T 
+#define PY_UINT64_T uint64_t 
+#endif 
+#endif 
+ 
+/* Signed variants of the above */ 
 #ifdef int32_t
 #define HAVE_INT32_T 1
 #endif
 
 #ifdef HAVE_INT32_T
-#ifndef PY_INT32_T
-#define PY_INT32_T int32_t
-#endif
-#endif
+#ifndef PY_INT32_T 
+#define PY_INT32_T int32_t 
+#endif 
+#endif 
 
 #ifdef int64_t
 #define HAVE_INT64_T 1
 #endif
 
 #ifdef HAVE_INT64_T
-#ifndef PY_INT64_T
-#define PY_INT64_T int64_t
-#endif
-#endif
-
-/* If PYLONG_BITS_IN_DIGIT is not defined then we'll use 30-bit digits if all
-   the necessary integer types are available, and we're on a 64-bit platform
-   (as determined by SIZEOF_VOID_P); otherwise we use 15-bit digits. */
-
-#ifndef PYLONG_BITS_IN_DIGIT
-#if (defined HAVE_UINT64_T && defined HAVE_INT64_T && \
-     defined HAVE_UINT32_T && defined HAVE_INT32_T && SIZEOF_VOID_P >= 8)
-#define PYLONG_BITS_IN_DIGIT 30
-#else
-#define PYLONG_BITS_IN_DIGIT 15
-#endif
-#endif
-
-/* uintptr_t is the C9X name for an unsigned integral type such that a
- * legitimate void* can be cast to uintptr_t and then back to void* again
- * without loss of information.  Similarly for intptr_t, wrt a signed
- * integral type.
- */
-#ifdef HAVE_UINTPTR_T
-typedef uintptr_t       Py_uintptr_t;
-typedef intptr_t        Py_intptr_t;
-
-#elif SIZEOF_VOID_P <= SIZEOF_INT
-typedef unsigned int    Py_uintptr_t;
-typedef int             Py_intptr_t;
-
-#elif SIZEOF_VOID_P <= SIZEOF_LONG
-typedef unsigned long   Py_uintptr_t;
-typedef long            Py_intptr_t;
-
-#elif defined(HAVE_LONG_LONG) && (SIZEOF_VOID_P <= SIZEOF_LONG_LONG)
-typedef unsigned PY_LONG_LONG   Py_uintptr_t;
-typedef PY_LONG_LONG            Py_intptr_t;
-
-#else
-#   error "Python needs a typedef for Py_uintptr_t in pyport.h."
-#endif /* HAVE_UINTPTR_T */
-
-/* Py_ssize_t is a signed integral type such that sizeof(Py_ssize_t) ==
- * sizeof(size_t).  C99 doesn't define such a thing directly (size_t is an
- * unsigned integral type).  See PEP 353 for details.
- */
-#ifdef HAVE_SSIZE_T
-typedef ssize_t         Py_ssize_t;
-#elif SIZEOF_VOID_P == SIZEOF_SIZE_T
-typedef Py_intptr_t     Py_ssize_t;
-#else
-#   error "Python needs a typedef for Py_ssize_t in pyport.h."
-#endif
-
-/* Largest possible value of size_t.
-   SIZE_MAX is part of C99, so it might be defined on some
-   platforms. If it is not defined, (size_t)-1 is a portable
-   definition for C89, due to the way signed->unsigned
-   conversion is defined. */
-#ifdef SIZE_MAX
-#define PY_SIZE_MAX SIZE_MAX
-#else
-#define PY_SIZE_MAX ((size_t)-1)
-#endif
-
-/* Largest positive value of type Py_ssize_t. */
-#define PY_SSIZE_T_MAX ((Py_ssize_t)(((size_t)-1)>>1))
-/* Smallest negative value of type Py_ssize_t. */
-#define PY_SSIZE_T_MIN (-PY_SSIZE_T_MAX-1)
-
-#if SIZEOF_PID_T > SIZEOF_LONG
-#   error "Python doesn't support sizeof(pid_t) > sizeof(long)"
-#endif
-
-/* PY_FORMAT_SIZE_T is a platform-specific modifier for use in a printf
- * format to convert an argument with the width of a size_t or Py_ssize_t.
- * C99 introduced "z" for this purpose, but not all platforms support that;
- * e.g., MS compilers use "I" instead.
- *
- * These "high level" Python format functions interpret "z" correctly on
- * all platforms (Python interprets the format string itself, and does whatever
- * the platform C requires to convert a size_t/Py_ssize_t argument):
- *
- *     PyString_FromFormat
- *     PyErr_Format
- *     PyString_FromFormatV
- *
- * Lower-level uses require that you interpolate the correct format modifier
- * yourself (e.g., calling printf, fprintf, sprintf, PyOS_snprintf); for
- * example,
- *
- *     Py_ssize_t index;
- *     fprintf(stderr, "index %" PY_FORMAT_SIZE_T "d sucks\n", index);
- *
- * That will expand to %ld, or %Id, or to something else correct for a
- * Py_ssize_t on the platform.
- */
-#ifndef PY_FORMAT_SIZE_T
-#   if SIZEOF_SIZE_T == SIZEOF_INT && !defined(__APPLE__)
-#       define PY_FORMAT_SIZE_T ""
-#   elif SIZEOF_SIZE_T == SIZEOF_LONG
-#       define PY_FORMAT_SIZE_T "l"
-#   elif defined(MS_WINDOWS)
-#       define PY_FORMAT_SIZE_T "I"
-#   else
-#       error "This platform's pyconfig.h needs to define PY_FORMAT_SIZE_T"
-#   endif
-#endif
-
-/* PY_FORMAT_LONG_LONG is analogous to PY_FORMAT_SIZE_T above, but for
- * the long long type instead of the size_t type.  It's only available
- * when HAVE_LONG_LONG is defined. The "high level" Python format
- * functions listed above will interpret "lld" or "llu" correctly on
- * all platforms.
- */
-#ifdef HAVE_LONG_LONG
-#   ifndef PY_FORMAT_LONG_LONG
-#       if defined(MS_WIN64) || defined(MS_WINDOWS)
-#           define PY_FORMAT_LONG_LONG "I64"
-#       else
-#           error "This platform's pyconfig.h needs to define PY_FORMAT_LONG_LONG"
-#       endif
-#   endif
-#endif
-
-/* Py_LOCAL can be used instead of static to get the fastest possible calling
- * convention for functions that are local to a given module.
- *
- * Py_LOCAL_INLINE does the same thing, and also explicitly requests inlining,
- * for platforms that support that.
- *
- * If PY_LOCAL_AGGRESSIVE is defined before python.h is included, more
+#ifndef PY_INT64_T 
+#define PY_INT64_T int64_t 
+#endif 
+#endif 
+ 
+/* If PYLONG_BITS_IN_DIGIT is not defined then we'll use 30-bit digits if all 
+   the necessary integer types are available, and we're on a 64-bit platform 
+   (as determined by SIZEOF_VOID_P); otherwise we use 15-bit digits. */ 
+ 
+#ifndef PYLONG_BITS_IN_DIGIT 
+#if (defined HAVE_UINT64_T && defined HAVE_INT64_T && \ 
+     defined HAVE_UINT32_T && defined HAVE_INT32_T && SIZEOF_VOID_P >= 8) 
+#define PYLONG_BITS_IN_DIGIT 30 
+#else 
+#define PYLONG_BITS_IN_DIGIT 15 
+#endif 
+#endif 
+ 
+/* uintptr_t is the C9X name for an unsigned integral type such that a 
+ * legitimate void* can be cast to uintptr_t and then back to void* again 
+ * without loss of information.  Similarly for intptr_t, wrt a signed 
+ * integral type. 
+ */ 
+#ifdef HAVE_UINTPTR_T 
+typedef uintptr_t       Py_uintptr_t; 
+typedef intptr_t        Py_intptr_t; 
+ 
+#elif SIZEOF_VOID_P <= SIZEOF_INT 
+typedef unsigned int    Py_uintptr_t; 
+typedef int             Py_intptr_t; 
+ 
+#elif SIZEOF_VOID_P <= SIZEOF_LONG 
+typedef unsigned long   Py_uintptr_t; 
+typedef long            Py_intptr_t; 
+ 
+#elif defined(HAVE_LONG_LONG) && (SIZEOF_VOID_P <= SIZEOF_LONG_LONG) 
+typedef unsigned PY_LONG_LONG   Py_uintptr_t; 
+typedef PY_LONG_LONG            Py_intptr_t; 
+ 
+#else 
+#   error "Python needs a typedef for Py_uintptr_t in pyport.h." 
+#endif /* HAVE_UINTPTR_T */ 
+ 
+/* Py_ssize_t is a signed integral type such that sizeof(Py_ssize_t) == 
+ * sizeof(size_t).  C99 doesn't define such a thing directly (size_t is an 
+ * unsigned integral type).  See PEP 353 for details. 
+ */ 
+#ifdef HAVE_SSIZE_T 
+typedef ssize_t         Py_ssize_t; 
+#elif SIZEOF_VOID_P == SIZEOF_SIZE_T 
+typedef Py_intptr_t     Py_ssize_t; 
+#else 
+#   error "Python needs a typedef for Py_ssize_t in pyport.h." 
+#endif 
+ 
+/* Largest possible value of size_t. 
+   SIZE_MAX is part of C99, so it might be defined on some 
+   platforms. If it is not defined, (size_t)-1 is a portable 
+   definition for C89, due to the way signed->unsigned 
+   conversion is defined. */ 
+#ifdef SIZE_MAX 
+#define PY_SIZE_MAX SIZE_MAX 
+#else 
+#define PY_SIZE_MAX ((size_t)-1) 
+#endif 
+ 
+/* Largest positive value of type Py_ssize_t. */ 
+#define PY_SSIZE_T_MAX ((Py_ssize_t)(((size_t)-1)>>1)) 
+/* Smallest negative value of type Py_ssize_t. */ 
+#define PY_SSIZE_T_MIN (-PY_SSIZE_T_MAX-1) 
+ 
+#if SIZEOF_PID_T > SIZEOF_LONG 
+#   error "Python doesn't support sizeof(pid_t) > sizeof(long)" 
+#endif 
+ 
+/* PY_FORMAT_SIZE_T is a platform-specific modifier for use in a printf 
+ * format to convert an argument with the width of a size_t or Py_ssize_t. 
+ * C99 introduced "z" for this purpose, but not all platforms support that; 
+ * e.g., MS compilers use "I" instead. 
+ * 
+ * These "high level" Python format functions interpret "z" correctly on 
+ * all platforms (Python interprets the format string itself, and does whatever 
+ * the platform C requires to convert a size_t/Py_ssize_t argument): 
+ * 
+ *     PyString_FromFormat 
+ *     PyErr_Format 
+ *     PyString_FromFormatV 
+ * 
+ * Lower-level uses require that you interpolate the correct format modifier 
+ * yourself (e.g., calling printf, fprintf, sprintf, PyOS_snprintf); for 
+ * example, 
+ * 
+ *     Py_ssize_t index; 
+ *     fprintf(stderr, "index %" PY_FORMAT_SIZE_T "d sucks\n", index); 
+ * 
+ * That will expand to %ld, or %Id, or to something else correct for a 
+ * Py_ssize_t on the platform. 
+ */ 
+#ifndef PY_FORMAT_SIZE_T 
+#   if SIZEOF_SIZE_T == SIZEOF_INT && !defined(__APPLE__) 
+#       define PY_FORMAT_SIZE_T "" 
+#   elif SIZEOF_SIZE_T == SIZEOF_LONG 
+#       define PY_FORMAT_SIZE_T "l" 
+#   elif defined(MS_WINDOWS) 
+#       define PY_FORMAT_SIZE_T "I" 
+#   else 
+#       error "This platform's pyconfig.h needs to define PY_FORMAT_SIZE_T" 
+#   endif 
+#endif 
+ 
+/* PY_FORMAT_LONG_LONG is analogous to PY_FORMAT_SIZE_T above, but for 
+ * the long long type instead of the size_t type.  It's only available 
+ * when HAVE_LONG_LONG is defined. The "high level" Python format 
+ * functions listed above will interpret "lld" or "llu" correctly on 
+ * all platforms. 
+ */ 
+#ifdef HAVE_LONG_LONG 
+#   ifndef PY_FORMAT_LONG_LONG 
+#       if defined(MS_WIN64) || defined(MS_WINDOWS) 
+#           define PY_FORMAT_LONG_LONG "I64" 
+#       else 
+#           error "This platform's pyconfig.h needs to define PY_FORMAT_LONG_LONG" 
+#       endif 
+#   endif 
+#endif 
+ 
+/* Py_LOCAL can be used instead of static to get the fastest possible calling 
+ * convention for functions that are local to a given module. 
+ * 
+ * Py_LOCAL_INLINE does the same thing, and also explicitly requests inlining, 
+ * for platforms that support that. 
+ * 
+ * If PY_LOCAL_AGGRESSIVE is defined before python.h is included, more 
  * "aggressive" inlining/optimization is enabled for the entire module.  This
- * may lead to code bloat, and may slow things down for those reasons.  It may
- * also lead to errors, if the code relies on pointer aliasing.  Use with
- * care.
- *
- * NOTE: You can only use this for functions that are entirely local to a
- * module; functions that are exported via method tables, callbacks, etc,
- * should keep using static.
- */
-
-#undef USE_INLINE /* XXX - set via configure? */
-
-#if defined(_MSC_VER)
-#if defined(PY_LOCAL_AGGRESSIVE)
-/* enable more aggressive optimization for visual studio */
-#pragma optimize("agtw", on)
-#endif
-/* ignore warnings if the compiler decides not to inline a function */
-#pragma warning(disable: 4710)
-/* fastest possible local call under MSVC */
-#define Py_LOCAL(type) static type __fastcall
-#define Py_LOCAL_INLINE(type) static __inline type __fastcall
-#elif defined(USE_INLINE)
-#define Py_LOCAL(type) static type
-#define Py_LOCAL_INLINE(type) static inline type
-#else
-#define Py_LOCAL(type) static type
-#define Py_LOCAL_INLINE(type) static type
-#endif
-
-/* Py_MEMCPY can be used instead of memcpy in cases where the copied blocks
- * are often very short.  While most platforms have highly optimized code for
- * large transfers, the setup costs for memcpy are often quite high.  MEMCPY
- * solves this by doing short copies "in line".
- */
-
-#if defined(_MSC_VER)
-#define Py_MEMCPY(target, source, length) do {                          \
-        size_t i_, n_ = (length);                                       \
-        char *t_ = (void*) (target);                                    \
-        const char *s_ = (void*) (source);                              \
-        if (n_ >= 16)                                                   \
-            memcpy(t_, s_, n_);                                         \
-        else                                                            \
-            for (i_ = 0; i_ < n_; i_++)                                 \
-                t_[i_] = s_[i_];                                        \
-    } while (0)
-#else
-#define Py_MEMCPY memcpy
-#endif
-
-#include <stdlib.h>
-
-#ifdef HAVE_IEEEFP_H
-#include <ieeefp.h>  /* needed for 'finite' declaration on some platforms */
-#endif
-
-#include <math.h> /* Moved here from the math section, before extern "C" */
-
-/********************************************
- * WRAPPER FOR <time.h> and/or <sys/time.h> *
- ********************************************/
-
-#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else /* !TIME_WITH_SYS_TIME */
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else /* !HAVE_SYS_TIME_H */
-#include <time.h>
-#endif /* !HAVE_SYS_TIME_H */
-#endif /* !TIME_WITH_SYS_TIME */
-
-
-/******************************
- * WRAPPER FOR <sys/select.h> *
- ******************************/
-
-/* NB caller must include <sys/types.h> */
-
-#ifdef HAVE_SYS_SELECT_H
-
-#include <sys/select.h>
-
-#endif /* !HAVE_SYS_SELECT_H */
-
-/*******************************
- * stat() and fstat() fiddling *
- *******************************/
-
-/* We expect that stat and fstat exist on most systems.
- *  It's confirmed on Unix, Mac and Windows.
- *  If you don't have them, add
- *      #define DONT_HAVE_STAT
- * and/or
- *      #define DONT_HAVE_FSTAT
- * to your pyconfig.h. Python code beyond this should check HAVE_STAT and
- * HAVE_FSTAT instead.
- * Also
- *      #define HAVE_SYS_STAT_H
- * if <sys/stat.h> exists on your platform, and
- *      #define HAVE_STAT_H
- * if <stat.h> does.
- */
-#ifndef DONT_HAVE_STAT
-#define HAVE_STAT
-#endif
-
-#ifndef DONT_HAVE_FSTAT
-#define HAVE_FSTAT
-#endif
-
-#ifdef RISCOS
-#include <sys/types.h>
-#include "unixstuff.h"
-#endif
-
-#ifdef HAVE_SYS_STAT_H
-#if defined(PYOS_OS2) && defined(PYCC_GCC)
-#include <sys/types.h>
-#endif
-#include <sys/stat.h>
-#elif defined(HAVE_STAT_H)
-#include <stat.h>
-#endif
-
-#if defined(PYCC_VACPP)
-/* VisualAge C/C++ Failed to Define MountType Field in sys/stat.h */
-#define S_IFMT (S_IFDIR|S_IFCHR|S_IFREG)
-#endif
-
-#ifndef S_ISREG
-#define S_ISREG(x) (((x) & S_IFMT) == S_IFREG)
-#endif
-
-#ifndef S_ISDIR
-#define S_ISDIR(x) (((x) & S_IFMT) == S_IFDIR)
-#endif
-
-
-#ifdef __cplusplus
-/* Move this down here since some C++ #include's don't like to be included
-   inside an extern "C" */
-extern "C" {
-#endif
-
-
-/* Py_ARITHMETIC_RIGHT_SHIFT
- * C doesn't define whether a right-shift of a signed integer sign-extends
- * or zero-fills.  Here a macro to force sign extension:
- * Py_ARITHMETIC_RIGHT_SHIFT(TYPE, I, J)
- *    Return I >> J, forcing sign extension.  Arithmetically, return the
- *    floor of I/2**J.
- * Requirements:
- *    I should have signed integer type.  In the terminology of C99, this can
- *    be either one of the five standard signed integer types (signed char,
- *    short, int, long, long long) or an extended signed integer type.
- *    J is an integer >= 0 and strictly less than the number of bits in the
- *    type of I (because C doesn't define what happens for J outside that
- *    range either).
- *    TYPE used to specify the type of I, but is now ignored.  It's been left
- *    in for backwards compatibility with versions <= 2.6 or 3.0.
- * Caution:
- *    I may be evaluated more than once.
- */
-#ifdef SIGNED_RIGHT_SHIFT_ZERO_FILLS
-#define Py_ARITHMETIC_RIGHT_SHIFT(TYPE, I, J) \
-    ((I) < 0 ? -1-((-1-(I)) >> (J)) : (I) >> (J))
-#else
-#define Py_ARITHMETIC_RIGHT_SHIFT(TYPE, I, J) ((I) >> (J))
-#endif
-
-/* Py_FORCE_EXPANSION(X)
- * "Simply" returns its argument.  However, macro expansions within the
- * argument are evaluated.  This unfortunate trickery is needed to get
- * token-pasting to work as desired in some cases.
- */
-#define Py_FORCE_EXPANSION(X) X
-
-/* Py_SAFE_DOWNCAST(VALUE, WIDE, NARROW)
- * Cast VALUE to type NARROW from type WIDE.  In Py_DEBUG mode, this
- * assert-fails if any information is lost.
- * Caution:
- *    VALUE may be evaluated more than once.
- */
-#ifdef Py_DEBUG
-#define Py_SAFE_DOWNCAST(VALUE, WIDE, NARROW) \
-    (assert((WIDE)(NARROW)(VALUE) == (VALUE)), (NARROW)(VALUE))
-#else
-#define Py_SAFE_DOWNCAST(VALUE, WIDE, NARROW) (NARROW)(VALUE)
-#endif
-
-/* Py_SET_ERRNO_ON_MATH_ERROR(x)
- * If a libm function did not set errno, but it looks like the result
- * overflowed or not-a-number, set errno to ERANGE or EDOM.  Set errno
- * to 0 before calling a libm function, and invoke this macro after,
- * passing the function result.
- * Caution:
- *    This isn't reliable.  See Py_OVERFLOWED comments.
- *    X is evaluated more than once.
- */
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || (defined(__hpux) && defined(__ia64))
-#define _Py_SET_EDOM_FOR_NAN(X) if (isnan(X)) errno = EDOM;
-#else
-#define _Py_SET_EDOM_FOR_NAN(X) ;
-#endif
-#define Py_SET_ERRNO_ON_MATH_ERROR(X) \
-    do { \
-        if (errno == 0) { \
-            if ((X) == Py_HUGE_VAL || (X) == -Py_HUGE_VAL) \
-                errno = ERANGE; \
-            else _Py_SET_EDOM_FOR_NAN(X) \
-        } \
-    } while(0)
-
-/* Py_SET_ERANGE_ON_OVERFLOW(x)
- * An alias of Py_SET_ERRNO_ON_MATH_ERROR for backward-compatibility.
- */
-#define Py_SET_ERANGE_IF_OVERFLOW(X) Py_SET_ERRNO_ON_MATH_ERROR(X)
-
-/* Py_ADJUST_ERANGE1(x)
- * Py_ADJUST_ERANGE2(x, y)
- * Set errno to 0 before calling a libm function, and invoke one of these
- * macros after, passing the function result(s) (Py_ADJUST_ERANGE2 is useful
- * for functions returning complex results).  This makes two kinds of
- * adjustments to errno:  (A) If it looks like the platform libm set
- * errno=ERANGE due to underflow, clear errno. (B) If it looks like the
- * platform libm overflowed but didn't set errno, force errno to ERANGE.  In
- * effect, we're trying to force a useful implementation of C89 errno
- * behavior.
- * Caution:
- *    This isn't reliable.  See Py_OVERFLOWED comments.
- *    X and Y may be evaluated more than once.
- */
-#define Py_ADJUST_ERANGE1(X)                                            \
-    do {                                                                \
-        if (errno == 0) {                                               \
-            if ((X) == Py_HUGE_VAL || (X) == -Py_HUGE_VAL)              \
-                errno = ERANGE;                                         \
-        }                                                               \
-        else if (errno == ERANGE && (X) == 0.0)                         \
-            errno = 0;                                                  \
-    } while(0)
-
-#define Py_ADJUST_ERANGE2(X, Y)                                         \
-    do {                                                                \
-        if ((X) == Py_HUGE_VAL || (X) == -Py_HUGE_VAL ||                \
-            (Y) == Py_HUGE_VAL || (Y) == -Py_HUGE_VAL) {                \
-                        if (errno == 0)                                 \
-                                errno = ERANGE;                         \
-        }                                                               \
-        else if (errno == ERANGE)                                       \
-            errno = 0;                                                  \
-    } while(0)
-
-/*  The functions _Py_dg_strtod and _Py_dg_dtoa in Python/dtoa.c (which are
- *  required to support the short float repr introduced in Python 3.1) require
- *  that the floating-point unit that's being used for arithmetic operations
- *  on C doubles is set to use 53-bit precision.  It also requires that the
- *  FPU rounding mode is round-half-to-even, but that's less often an issue.
- *
- *  If your FPU isn't already set to 53-bit precision/round-half-to-even, and
- *  you want to make use of _Py_dg_strtod and _Py_dg_dtoa, then you should
- *
- *     #define HAVE_PY_SET_53BIT_PRECISION 1
- *
- *  and also give appropriate definitions for the following three macros:
- *
- *    _PY_SET_53BIT_PRECISION_START : store original FPU settings, and
- *        set FPU to 53-bit precision/round-half-to-even
- *    _PY_SET_53BIT_PRECISION_END : restore original FPU settings
- *    _PY_SET_53BIT_PRECISION_HEADER : any variable declarations needed to
- *        use the two macros above.
- *
- * The macros are designed to be used within a single C function: see
- * Python/pystrtod.c for an example of their use.
- */
-
-/* get and set x87 control word for gcc/x86 */
-#ifdef HAVE_GCC_ASM_FOR_X87
-#define HAVE_PY_SET_53BIT_PRECISION 1
-/* _Py_get/set_387controlword functions are defined in Python/pymath.c */
-#define _Py_SET_53BIT_PRECISION_HEADER                          \
-    unsigned short old_387controlword, new_387controlword
-#define _Py_SET_53BIT_PRECISION_START                                   \
-    do {                                                                \
-        old_387controlword = _Py_get_387controlword();                  \
-        new_387controlword = (old_387controlword & ~0x0f00) | 0x0200; \
-        if (new_387controlword != old_387controlword)                   \
-            _Py_set_387controlword(new_387controlword);                 \
-    } while (0)
-#define _Py_SET_53BIT_PRECISION_END                             \
-    if (new_387controlword != old_387controlword)               \
-        _Py_set_387controlword(old_387controlword)
-#endif
-
+ * may lead to code bloat, and may slow things down for those reasons.  It may 
+ * also lead to errors, if the code relies on pointer aliasing.  Use with 
+ * care. 
+ * 
+ * NOTE: You can only use this for functions that are entirely local to a 
+ * module; functions that are exported via method tables, callbacks, etc, 
+ * should keep using static. 
+ */ 
+ 
+#undef USE_INLINE /* XXX - set via configure? */ 
+ 
+#if defined(_MSC_VER) 
+#if defined(PY_LOCAL_AGGRESSIVE) 
+/* enable more aggressive optimization for visual studio */ 
+#pragma optimize("agtw", on) 
+#endif 
+/* ignore warnings if the compiler decides not to inline a function */ 
+#pragma warning(disable: 4710) 
+/* fastest possible local call under MSVC */ 
+#define Py_LOCAL(type) static type __fastcall 
+#define Py_LOCAL_INLINE(type) static __inline type __fastcall 
+#elif defined(USE_INLINE) 
+#define Py_LOCAL(type) static type 
+#define Py_LOCAL_INLINE(type) static inline type 
+#else 
+#define Py_LOCAL(type) static type 
+#define Py_LOCAL_INLINE(type) static type 
+#endif 
+ 
+/* Py_MEMCPY can be used instead of memcpy in cases where the copied blocks 
+ * are often very short.  While most platforms have highly optimized code for 
+ * large transfers, the setup costs for memcpy are often quite high.  MEMCPY 
+ * solves this by doing short copies "in line". 
+ */ 
+ 
+#if defined(_MSC_VER) 
+#define Py_MEMCPY(target, source, length) do {                          \ 
+        size_t i_, n_ = (length);                                       \ 
+        char *t_ = (void*) (target);                                    \ 
+        const char *s_ = (void*) (source);                              \ 
+        if (n_ >= 16)                                                   \ 
+            memcpy(t_, s_, n_);                                         \ 
+        else                                                            \ 
+            for (i_ = 0; i_ < n_; i_++)                                 \ 
+                t_[i_] = s_[i_];                                        \ 
+    } while (0) 
+#else 
+#define Py_MEMCPY memcpy 
+#endif 
+ 
+#include <stdlib.h> 
+ 
+#ifdef HAVE_IEEEFP_H 
+#include <ieeefp.h>  /* needed for 'finite' declaration on some platforms */ 
+#endif 
+ 
+#include <math.h> /* Moved here from the math section, before extern "C" */ 
+ 
+/******************************************** 
+ * WRAPPER FOR <time.h> and/or <sys/time.h> * 
+ ********************************************/ 
+ 
+#ifdef TIME_WITH_SYS_TIME 
+#include <sys/time.h> 
+#include <time.h> 
+#else /* !TIME_WITH_SYS_TIME */ 
+#ifdef HAVE_SYS_TIME_H 
+#include <sys/time.h> 
+#else /* !HAVE_SYS_TIME_H */ 
+#include <time.h> 
+#endif /* !HAVE_SYS_TIME_H */ 
+#endif /* !TIME_WITH_SYS_TIME */ 
+ 
+ 
+/****************************** 
+ * WRAPPER FOR <sys/select.h> * 
+ ******************************/ 
+ 
+/* NB caller must include <sys/types.h> */ 
+ 
+#ifdef HAVE_SYS_SELECT_H 
+ 
+#include <sys/select.h> 
+ 
+#endif /* !HAVE_SYS_SELECT_H */ 
+ 
+/******************************* 
+ * stat() and fstat() fiddling * 
+ *******************************/ 
+ 
+/* We expect that stat and fstat exist on most systems. 
+ *  It's confirmed on Unix, Mac and Windows. 
+ *  If you don't have them, add 
+ *      #define DONT_HAVE_STAT 
+ * and/or 
+ *      #define DONT_HAVE_FSTAT 
+ * to your pyconfig.h. Python code beyond this should check HAVE_STAT and 
+ * HAVE_FSTAT instead. 
+ * Also 
+ *      #define HAVE_SYS_STAT_H 
+ * if <sys/stat.h> exists on your platform, and 
+ *      #define HAVE_STAT_H 
+ * if <stat.h> does. 
+ */ 
+#ifndef DONT_HAVE_STAT 
+#define HAVE_STAT 
+#endif 
+ 
+#ifndef DONT_HAVE_FSTAT 
+#define HAVE_FSTAT 
+#endif 
+ 
+#ifdef RISCOS 
+#include <sys/types.h> 
+#include "unixstuff.h" 
+#endif 
+ 
+#ifdef HAVE_SYS_STAT_H 
+#if defined(PYOS_OS2) && defined(PYCC_GCC) 
+#include <sys/types.h> 
+#endif 
+#include <sys/stat.h> 
+#elif defined(HAVE_STAT_H) 
+#include <stat.h> 
+#endif 
+ 
+#if defined(PYCC_VACPP) 
+/* VisualAge C/C++ Failed to Define MountType Field in sys/stat.h */ 
+#define S_IFMT (S_IFDIR|S_IFCHR|S_IFREG) 
+#endif 
+ 
+#ifndef S_ISREG 
+#define S_ISREG(x) (((x) & S_IFMT) == S_IFREG) 
+#endif 
+ 
+#ifndef S_ISDIR 
+#define S_ISDIR(x) (((x) & S_IFMT) == S_IFDIR) 
+#endif 
+ 
+ 
+#ifdef __cplusplus 
+/* Move this down here since some C++ #include's don't like to be included 
+   inside an extern "C" */ 
+extern "C" { 
+#endif 
+ 
+ 
+/* Py_ARITHMETIC_RIGHT_SHIFT 
+ * C doesn't define whether a right-shift of a signed integer sign-extends 
+ * or zero-fills.  Here a macro to force sign extension: 
+ * Py_ARITHMETIC_RIGHT_SHIFT(TYPE, I, J) 
+ *    Return I >> J, forcing sign extension.  Arithmetically, return the 
+ *    floor of I/2**J. 
+ * Requirements: 
+ *    I should have signed integer type.  In the terminology of C99, this can 
+ *    be either one of the five standard signed integer types (signed char, 
+ *    short, int, long, long long) or an extended signed integer type. 
+ *    J is an integer >= 0 and strictly less than the number of bits in the 
+ *    type of I (because C doesn't define what happens for J outside that 
+ *    range either). 
+ *    TYPE used to specify the type of I, but is now ignored.  It's been left 
+ *    in for backwards compatibility with versions <= 2.6 or 3.0. 
+ * Caution: 
+ *    I may be evaluated more than once. 
+ */ 
+#ifdef SIGNED_RIGHT_SHIFT_ZERO_FILLS 
+#define Py_ARITHMETIC_RIGHT_SHIFT(TYPE, I, J) \ 
+    ((I) < 0 ? -1-((-1-(I)) >> (J)) : (I) >> (J)) 
+#else 
+#define Py_ARITHMETIC_RIGHT_SHIFT(TYPE, I, J) ((I) >> (J)) 
+#endif 
+ 
+/* Py_FORCE_EXPANSION(X) 
+ * "Simply" returns its argument.  However, macro expansions within the 
+ * argument are evaluated.  This unfortunate trickery is needed to get 
+ * token-pasting to work as desired in some cases. 
+ */ 
+#define Py_FORCE_EXPANSION(X) X 
+ 
+/* Py_SAFE_DOWNCAST(VALUE, WIDE, NARROW) 
+ * Cast VALUE to type NARROW from type WIDE.  In Py_DEBUG mode, this 
+ * assert-fails if any information is lost. 
+ * Caution: 
+ *    VALUE may be evaluated more than once. 
+ */ 
+#ifdef Py_DEBUG 
+#define Py_SAFE_DOWNCAST(VALUE, WIDE, NARROW) \ 
+    (assert((WIDE)(NARROW)(VALUE) == (VALUE)), (NARROW)(VALUE)) 
+#else 
+#define Py_SAFE_DOWNCAST(VALUE, WIDE, NARROW) (NARROW)(VALUE) 
+#endif 
+ 
+/* Py_SET_ERRNO_ON_MATH_ERROR(x) 
+ * If a libm function did not set errno, but it looks like the result 
+ * overflowed or not-a-number, set errno to ERANGE or EDOM.  Set errno 
+ * to 0 before calling a libm function, and invoke this macro after, 
+ * passing the function result. 
+ * Caution: 
+ *    This isn't reliable.  See Py_OVERFLOWED comments. 
+ *    X is evaluated more than once. 
+ */ 
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || (defined(__hpux) && defined(__ia64)) 
+#define _Py_SET_EDOM_FOR_NAN(X) if (isnan(X)) errno = EDOM; 
+#else 
+#define _Py_SET_EDOM_FOR_NAN(X) ; 
+#endif 
+#define Py_SET_ERRNO_ON_MATH_ERROR(X) \ 
+    do { \ 
+        if (errno == 0) { \ 
+            if ((X) == Py_HUGE_VAL || (X) == -Py_HUGE_VAL) \ 
+                errno = ERANGE; \ 
+            else _Py_SET_EDOM_FOR_NAN(X) \ 
+        } \ 
+    } while(0) 
+ 
+/* Py_SET_ERANGE_ON_OVERFLOW(x) 
+ * An alias of Py_SET_ERRNO_ON_MATH_ERROR for backward-compatibility. 
+ */ 
+#define Py_SET_ERANGE_IF_OVERFLOW(X) Py_SET_ERRNO_ON_MATH_ERROR(X) 
+ 
+/* Py_ADJUST_ERANGE1(x) 
+ * Py_ADJUST_ERANGE2(x, y) 
+ * Set errno to 0 before calling a libm function, and invoke one of these 
+ * macros after, passing the function result(s) (Py_ADJUST_ERANGE2 is useful 
+ * for functions returning complex results).  This makes two kinds of 
+ * adjustments to errno:  (A) If it looks like the platform libm set 
+ * errno=ERANGE due to underflow, clear errno. (B) If it looks like the 
+ * platform libm overflowed but didn't set errno, force errno to ERANGE.  In 
+ * effect, we're trying to force a useful implementation of C89 errno 
+ * behavior. 
+ * Caution: 
+ *    This isn't reliable.  See Py_OVERFLOWED comments. 
+ *    X and Y may be evaluated more than once. 
+ */ 
+#define Py_ADJUST_ERANGE1(X)                                            \ 
+    do {                                                                \ 
+        if (errno == 0) {                                               \ 
+            if ((X) == Py_HUGE_VAL || (X) == -Py_HUGE_VAL)              \ 
+                errno = ERANGE;                                         \ 
+        }                                                               \ 
+        else if (errno == ERANGE && (X) == 0.0)                         \ 
+            errno = 0;                                                  \ 
+    } while(0) 
+ 
+#define Py_ADJUST_ERANGE2(X, Y)                                         \ 
+    do {                                                                \ 
+        if ((X) == Py_HUGE_VAL || (X) == -Py_HUGE_VAL ||                \ 
+            (Y) == Py_HUGE_VAL || (Y) == -Py_HUGE_VAL) {                \ 
+                        if (errno == 0)                                 \ 
+                                errno = ERANGE;                         \ 
+        }                                                               \ 
+        else if (errno == ERANGE)                                       \ 
+            errno = 0;                                                  \ 
+    } while(0) 
+ 
+/*  The functions _Py_dg_strtod and _Py_dg_dtoa in Python/dtoa.c (which are 
+ *  required to support the short float repr introduced in Python 3.1) require 
+ *  that the floating-point unit that's being used for arithmetic operations 
+ *  on C doubles is set to use 53-bit precision.  It also requires that the 
+ *  FPU rounding mode is round-half-to-even, but that's less often an issue. 
+ * 
+ *  If your FPU isn't already set to 53-bit precision/round-half-to-even, and 
+ *  you want to make use of _Py_dg_strtod and _Py_dg_dtoa, then you should 
+ * 
+ *     #define HAVE_PY_SET_53BIT_PRECISION 1 
+ * 
+ *  and also give appropriate definitions for the following three macros: 
+ * 
+ *    _PY_SET_53BIT_PRECISION_START : store original FPU settings, and 
+ *        set FPU to 53-bit precision/round-half-to-even 
+ *    _PY_SET_53BIT_PRECISION_END : restore original FPU settings 
+ *    _PY_SET_53BIT_PRECISION_HEADER : any variable declarations needed to 
+ *        use the two macros above. 
+ * 
+ * The macros are designed to be used within a single C function: see 
+ * Python/pystrtod.c for an example of their use. 
+ */ 
+ 
+/* get and set x87 control word for gcc/x86 */ 
+#ifdef HAVE_GCC_ASM_FOR_X87 
+#define HAVE_PY_SET_53BIT_PRECISION 1 
+/* _Py_get/set_387controlword functions are defined in Python/pymath.c */ 
+#define _Py_SET_53BIT_PRECISION_HEADER                          \ 
+    unsigned short old_387controlword, new_387controlword 
+#define _Py_SET_53BIT_PRECISION_START                                   \ 
+    do {                                                                \ 
+        old_387controlword = _Py_get_387controlword();                  \ 
+        new_387controlword = (old_387controlword & ~0x0f00) | 0x0200; \ 
+        if (new_387controlword != old_387controlword)                   \ 
+            _Py_set_387controlword(new_387controlword);                 \ 
+    } while (0) 
+#define _Py_SET_53BIT_PRECISION_END                             \ 
+    if (new_387controlword != old_387controlword)               \ 
+        _Py_set_387controlword(old_387controlword) 
+#endif 
+ 
 /* get and set x87 control word for VisualStudio/x86 */
 #if defined(_MSC_VER) && !defined(_WIN64) /* x87 not supported in 64-bit */
 #define HAVE_PY_SET_53BIT_PRECISION 1
@@ -586,183 +586,183 @@ extern "C" {
     } while (0)
 #endif
 
-/* default definitions are empty */
-#ifndef HAVE_PY_SET_53BIT_PRECISION
-#define _Py_SET_53BIT_PRECISION_HEADER
-#define _Py_SET_53BIT_PRECISION_START
-#define _Py_SET_53BIT_PRECISION_END
-#endif
-
-/* If we can't guarantee 53-bit precision, don't use the code
-   in Python/dtoa.c, but fall back to standard code.  This
-   means that repr of a float will be long (17 sig digits).
-
-   Realistically, there are two things that could go wrong:
-
-   (1) doubles aren't IEEE 754 doubles, or
-   (2) we're on x86 with the rounding precision set to 64-bits
-       (extended precision), and we don't know how to change
-       the rounding precision.
- */
-
-#if !defined(DOUBLE_IS_LITTLE_ENDIAN_IEEE754) && \
-    !defined(DOUBLE_IS_BIG_ENDIAN_IEEE754) && \
-    !defined(DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754)
-#define PY_NO_SHORT_FLOAT_REPR
-#endif
-
-/* double rounding is symptomatic of use of extended precision on x86.  If
-   we're seeing double rounding, and we don't have any mechanism available for
-   changing the FPU rounding precision, then don't use Python/dtoa.c. */
-#if defined(X87_DOUBLE_ROUNDING) && !defined(HAVE_PY_SET_53BIT_PRECISION)
-#define PY_NO_SHORT_FLOAT_REPR
-#endif
-
-/* Py_DEPRECATED(version)
- * Declare a variable, type, or function deprecated.
- * Usage:
- *    extern int old_var Py_DEPRECATED(2.3);
- *    typedef int T1 Py_DEPRECATED(2.4);
- *    extern int x() Py_DEPRECATED(2.5);
- */
-#if defined(__GNUC__) && ((__GNUC__ >= 4) || \
-              (__GNUC__ == 3) && (__GNUC_MINOR__ >= 1))
-#define Py_DEPRECATED(VERSION_UNUSED) __attribute__((__deprecated__))
-#else
-#define Py_DEPRECATED(VERSION_UNUSED)
-#endif
-
-/**************************************************************************
-Prototypes that are missing from the standard include files on some systems
-(and possibly only some versions of such systems.)
-
-Please be conservative with adding new ones, document them and enclose them
-in platform-specific #ifdefs.
-**************************************************************************/
-
-#ifdef SOLARIS
-/* Unchecked */
-extern int gethostname(char *, int);
-#endif
-
-#ifdef __BEOS__
-/* Unchecked */
-/* It's in the libs, but not the headers... - [cjh] */
-int shutdown( int, int );
-#endif
-
-#ifdef HAVE__GETPTY
-#include <sys/types.h>          /* we need to import mode_t */
-extern char * _getpty(int *, int, mode_t, int);
-#endif
-
-/* On QNX 6, struct termio must be declared by including sys/termio.h
-   if TCGETA, TCSETA, TCSETAW, or TCSETAF are used.  sys/termio.h must
-   be included before termios.h or it will generate an error. */
+/* default definitions are empty */ 
+#ifndef HAVE_PY_SET_53BIT_PRECISION 
+#define _Py_SET_53BIT_PRECISION_HEADER 
+#define _Py_SET_53BIT_PRECISION_START 
+#define _Py_SET_53BIT_PRECISION_END 
+#endif 
+ 
+/* If we can't guarantee 53-bit precision, don't use the code 
+   in Python/dtoa.c, but fall back to standard code.  This 
+   means that repr of a float will be long (17 sig digits). 
+ 
+   Realistically, there are two things that could go wrong: 
+ 
+   (1) doubles aren't IEEE 754 doubles, or 
+   (2) we're on x86 with the rounding precision set to 64-bits 
+       (extended precision), and we don't know how to change 
+       the rounding precision. 
+ */ 
+ 
+#if !defined(DOUBLE_IS_LITTLE_ENDIAN_IEEE754) && \ 
+    !defined(DOUBLE_IS_BIG_ENDIAN_IEEE754) && \ 
+    !defined(DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754) 
+#define PY_NO_SHORT_FLOAT_REPR 
+#endif 
+ 
+/* double rounding is symptomatic of use of extended precision on x86.  If 
+   we're seeing double rounding, and we don't have any mechanism available for 
+   changing the FPU rounding precision, then don't use Python/dtoa.c. */ 
+#if defined(X87_DOUBLE_ROUNDING) && !defined(HAVE_PY_SET_53BIT_PRECISION) 
+#define PY_NO_SHORT_FLOAT_REPR 
+#endif 
+ 
+/* Py_DEPRECATED(version) 
+ * Declare a variable, type, or function deprecated. 
+ * Usage: 
+ *    extern int old_var Py_DEPRECATED(2.3); 
+ *    typedef int T1 Py_DEPRECATED(2.4); 
+ *    extern int x() Py_DEPRECATED(2.5); 
+ */ 
+#if defined(__GNUC__) && ((__GNUC__ >= 4) || \ 
+              (__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)) 
+#define Py_DEPRECATED(VERSION_UNUSED) __attribute__((__deprecated__)) 
+#else 
+#define Py_DEPRECATED(VERSION_UNUSED) 
+#endif 
+ 
+/************************************************************************** 
+Prototypes that are missing from the standard include files on some systems 
+(and possibly only some versions of such systems.) 
+ 
+Please be conservative with adding new ones, document them and enclose them 
+in platform-specific #ifdefs. 
+**************************************************************************/ 
+ 
+#ifdef SOLARIS 
+/* Unchecked */ 
+extern int gethostname(char *, int); 
+#endif 
+ 
+#ifdef __BEOS__ 
+/* Unchecked */ 
+/* It's in the libs, but not the headers... - [cjh] */ 
+int shutdown( int, int ); 
+#endif 
+ 
+#ifdef HAVE__GETPTY 
+#include <sys/types.h>          /* we need to import mode_t */ 
+extern char * _getpty(int *, int, mode_t, int); 
+#endif 
+ 
+/* On QNX 6, struct termio must be declared by including sys/termio.h 
+   if TCGETA, TCSETA, TCSETAW, or TCSETAF are used.  sys/termio.h must 
+   be included before termios.h or it will generate an error. */ 
 #if defined(HAVE_SYS_TERMIO_H) && !defined(__hpux)
-#include <sys/termio.h>
-#endif
-
-#if defined(HAVE_OPENPTY) || defined(HAVE_FORKPTY)
-#if !defined(HAVE_PTY_H) && !defined(HAVE_LIBUTIL_H) && !defined(HAVE_UTIL_H)
-/* BSDI does not supply a prototype for the 'openpty' and 'forkpty'
-   functions, even though they are included in libutil. */
-#include <termios.h>
-extern int openpty(int *, int *, char *, struct termios *, struct winsize *);
-extern pid_t forkpty(int *, char *, struct termios *, struct winsize *);
-#endif /* !defined(HAVE_PTY_H) && !defined(HAVE_LIBUTIL_H) */
-#endif /* defined(HAVE_OPENPTY) || defined(HAVE_FORKPTY) */
-
-
-/* These are pulled from various places. It isn't obvious on what platforms
-   they are necessary, nor what the exact prototype should look like (which
-   is likely to vary between platforms!) If you find you need one of these
-   declarations, please move them to a platform-specific block and include
-   proper prototypes. */
-#if 0
-
-/* From Modules/resource.c */
-extern int getrusage();
-extern int getpagesize();
-
-/* From Python/sysmodule.c and Modules/posixmodule.c */
-extern int fclose(FILE *);
-
-/* From Modules/posixmodule.c */
-extern int fdatasync(int);
-#endif /* 0 */
-
-/* On 4.4BSD-descendants, ctype functions serves the whole range of
- * wchar_t character set rather than single byte code points only.
- * This characteristic can break some operations of string object
- * including str.upper() and str.split() on UTF-8 locales.  This
- * workaround was provided by Tim Robbins of FreeBSD project.
- */
-
-#ifdef __FreeBSD__
-#include <osreldate.h>
+#include <sys/termio.h> 
+#endif 
+ 
+#if defined(HAVE_OPENPTY) || defined(HAVE_FORKPTY) 
+#if !defined(HAVE_PTY_H) && !defined(HAVE_LIBUTIL_H) && !defined(HAVE_UTIL_H) 
+/* BSDI does not supply a prototype for the 'openpty' and 'forkpty' 
+   functions, even though they are included in libutil. */ 
+#include <termios.h> 
+extern int openpty(int *, int *, char *, struct termios *, struct winsize *); 
+extern pid_t forkpty(int *, char *, struct termios *, struct winsize *); 
+#endif /* !defined(HAVE_PTY_H) && !defined(HAVE_LIBUTIL_H) */ 
+#endif /* defined(HAVE_OPENPTY) || defined(HAVE_FORKPTY) */ 
+ 
+ 
+/* These are pulled from various places. It isn't obvious on what platforms 
+   they are necessary, nor what the exact prototype should look like (which 
+   is likely to vary between platforms!) If you find you need one of these 
+   declarations, please move them to a platform-specific block and include 
+   proper prototypes. */ 
+#if 0 
+ 
+/* From Modules/resource.c */ 
+extern int getrusage(); 
+extern int getpagesize(); 
+ 
+/* From Python/sysmodule.c and Modules/posixmodule.c */ 
+extern int fclose(FILE *); 
+ 
+/* From Modules/posixmodule.c */ 
+extern int fdatasync(int); 
+#endif /* 0 */ 
+ 
+/* On 4.4BSD-descendants, ctype functions serves the whole range of 
+ * wchar_t character set rather than single byte code points only. 
+ * This characteristic can break some operations of string object 
+ * including str.upper() and str.split() on UTF-8 locales.  This 
+ * workaround was provided by Tim Robbins of FreeBSD project. 
+ */ 
+ 
+#ifdef __FreeBSD__ 
+#include <osreldate.h> 
 #if (__FreeBSD_version >= 500040 && __FreeBSD_version < 602113) || \
     (__FreeBSD_version >= 700000 && __FreeBSD_version < 700054) || \
     (__FreeBSD_version >= 800000 && __FreeBSD_version < 800001)
-# define _PY_PORT_CTYPE_UTF8_ISSUE
-#endif
-#endif
-
-
-#if defined(__APPLE__)
-# define _PY_PORT_CTYPE_UTF8_ISSUE
-#endif
-
-#ifdef _PY_PORT_CTYPE_UTF8_ISSUE
+# define _PY_PORT_CTYPE_UTF8_ISSUE 
+#endif 
+#endif 
+ 
+ 
+#if defined(__APPLE__) 
+# define _PY_PORT_CTYPE_UTF8_ISSUE 
+#endif 
+ 
+#ifdef _PY_PORT_CTYPE_UTF8_ISSUE 
 #ifndef __cplusplus
    /* The workaround below is unsafe in C++ because
     * the <locale> defines these symbols as real functions,
     * with a slightly different signature.
     * See issue #10910
     */
-#include <ctype.h>
-#include <wctype.h>
-#undef isalnum
-#define isalnum(c) iswalnum(btowc(c))
-#undef isalpha
-#define isalpha(c) iswalpha(btowc(c))
-#undef islower
-#define islower(c) iswlower(btowc(c))
-#undef isspace
-#define isspace(c) iswspace(btowc(c))
-#undef isupper
-#define isupper(c) iswupper(btowc(c))
-#undef tolower
-#define tolower(c) towlower(btowc(c))
-#undef toupper
-#define toupper(c) towupper(btowc(c))
-#endif
-#endif
-
-
-/* Declarations for symbol visibility.
-
-  PyAPI_FUNC(type): Declares a public Python API function and return type
-  PyAPI_DATA(type): Declares public Python data and its type
-  PyMODINIT_FUNC:   A Python module init function.  If these functions are
-                    inside the Python core, they are private to the core.
-                    If in an extension module, it may be declared with
-                    external linkage depending on the platform.
-
-  As a number of platforms support/require "__declspec(dllimport/dllexport)",
-  we support a HAVE_DECLSPEC_DLL macro to save duplication.
-*/
-
-/*
-  All windows ports, except cygwin, are handled in PC/pyconfig.h.
-
-  BeOS and cygwin are the only other autoconf platform requiring special
-  linkage handling and both of these use __declspec().
-*/
+#include <ctype.h> 
+#include <wctype.h> 
+#undef isalnum 
+#define isalnum(c) iswalnum(btowc(c)) 
+#undef isalpha 
+#define isalpha(c) iswalpha(btowc(c)) 
+#undef islower 
+#define islower(c) iswlower(btowc(c)) 
+#undef isspace 
+#define isspace(c) iswspace(btowc(c)) 
+#undef isupper 
+#define isupper(c) iswupper(btowc(c)) 
+#undef tolower 
+#define tolower(c) towlower(btowc(c)) 
+#undef toupper 
+#define toupper(c) towupper(btowc(c)) 
+#endif 
+#endif
+ 
+ 
+/* Declarations for symbol visibility. 
+ 
+  PyAPI_FUNC(type): Declares a public Python API function and return type 
+  PyAPI_DATA(type): Declares public Python data and its type 
+  PyMODINIT_FUNC:   A Python module init function.  If these functions are 
+                    inside the Python core, they are private to the core. 
+                    If in an extension module, it may be declared with 
+                    external linkage depending on the platform. 
+ 
+  As a number of platforms support/require "__declspec(dllimport/dllexport)", 
+  we support a HAVE_DECLSPEC_DLL macro to save duplication. 
+*/ 
+ 
+/* 
+  All windows ports, except cygwin, are handled in PC/pyconfig.h. 
+ 
+  BeOS and cygwin are the only other autoconf platform requiring special 
+  linkage handling and both of these use __declspec(). 
+*/ 
 #if defined(__BEOS__)
-#       define HAVE_DECLSPEC_DLL
-#endif
-
+#       define HAVE_DECLSPEC_DLL 
+#endif 
+ 
 /*
  * GCC visibility support, introduced in GCC 4.0. Only matters when
  * compiling with gcc's -fvisibility=hidden argument.  This applies to all
@@ -773,37 +773,37 @@ extern int fdatasync(int);
 #       define HAVE_ATTRIBUTE_VISIBILITY
 #endif
 
-/* only get special linkage if built as shared or platform is Cygwin */
+/* only get special linkage if built as shared or platform is Cygwin */ 
 #if defined(Py_ENABLE_SHARED)
-#       if defined(HAVE_DECLSPEC_DLL)
-#               ifdef Py_BUILD_CORE
-#                       define PyAPI_FUNC(RTYPE) __declspec(dllexport) RTYPE
-#                       define PyAPI_DATA(RTYPE) extern __declspec(dllexport) RTYPE
-        /* module init functions inside the core need no external linkage */
-        /* except for Cygwin to handle embedding (FIXME: BeOS too?) */
-#                       if defined(__CYGWIN__)
-#                               define PyMODINIT_FUNC __declspec(dllexport) void
-#                       else /* __CYGWIN__ */
-#                               define PyMODINIT_FUNC void
-#                       endif /* __CYGWIN__ */
-#               else /* Py_BUILD_CORE */
-        /* Building an extension module, or an embedded situation */
-        /* public Python functions and data are imported */
-        /* Under Cygwin, auto-import functions to prevent compilation */
-        /* failures similar to those described at the bottom of 4.1: */
-        /* http://docs.python.org/extending/windows.html#a-cookbook-approach */
-#                       if !defined(__CYGWIN__)
-#                               define PyAPI_FUNC(RTYPE) __declspec(dllimport) RTYPE
-#                       endif /* !__CYGWIN__ */
-#                       define PyAPI_DATA(RTYPE) extern __declspec(dllimport) RTYPE
-        /* module init functions outside the core must be exported */
-#                       if defined(__cplusplus)
-#                               define PyMODINIT_FUNC extern "C" __declspec(dllexport) void
-#                       else /* __cplusplus */
-#                               define PyMODINIT_FUNC __declspec(dllexport) void
-#                       endif /* __cplusplus */
-#               endif /* Py_BUILD_CORE */
-#       endif /* HAVE_DECLSPEC */
+#       if defined(HAVE_DECLSPEC_DLL) 
+#               ifdef Py_BUILD_CORE 
+#                       define PyAPI_FUNC(RTYPE) __declspec(dllexport) RTYPE 
+#                       define PyAPI_DATA(RTYPE) extern __declspec(dllexport) RTYPE 
+        /* module init functions inside the core need no external linkage */ 
+        /* except for Cygwin to handle embedding (FIXME: BeOS too?) */ 
+#                       if defined(__CYGWIN__) 
+#                               define PyMODINIT_FUNC __declspec(dllexport) void 
+#                       else /* __CYGWIN__ */ 
+#                               define PyMODINIT_FUNC void 
+#                       endif /* __CYGWIN__ */ 
+#               else /* Py_BUILD_CORE */ 
+        /* Building an extension module, or an embedded situation */ 
+        /* public Python functions and data are imported */ 
+        /* Under Cygwin, auto-import functions to prevent compilation */ 
+        /* failures similar to those described at the bottom of 4.1: */ 
+        /* http://docs.python.org/extending/windows.html#a-cookbook-approach */ 
+#                       if !defined(__CYGWIN__) 
+#                               define PyAPI_FUNC(RTYPE) __declspec(dllimport) RTYPE 
+#                       endif /* !__CYGWIN__ */ 
+#                       define PyAPI_DATA(RTYPE) extern __declspec(dllimport) RTYPE 
+        /* module init functions outside the core must be exported */ 
+#                       if defined(__cplusplus) 
+#                               define PyMODINIT_FUNC extern "C" __declspec(dllexport) void 
+#                       else /* __cplusplus */ 
+#                               define PyMODINIT_FUNC __declspec(dllexport) void 
+#                       endif /* __cplusplus */ 
+#               endif /* Py_BUILD_CORE */ 
+#       endif /* HAVE_DECLSPEC */ 
 #elif defined(HAVE_ATTRIBUTE_VISIBILITY)
 #       define PyAPI_FUNC(RTYPE) __attribute__((visibility("default"))) RTYPE
 #       define PyAPI_DATA(RTYPE) extern __attribute__((visibility("default"))) RTYPE
@@ -814,156 +814,156 @@ extern int fdatasync(int);
 #       else /* __cplusplus */
 #               define PyMODINIT_FUNC __attribute__((visibility("default"))) void
 #       endif /* Py_BUILD_CORE */
-#endif /* Py_ENABLE_SHARED */
-
-/* If no external linkage macros defined by now, create defaults */
-#ifndef PyAPI_FUNC
-#       define PyAPI_FUNC(RTYPE) RTYPE
-#endif
-#ifndef PyAPI_DATA
-#       define PyAPI_DATA(RTYPE) extern RTYPE
-#endif
-#ifndef PyMODINIT_FUNC
-#       if defined(__cplusplus)
-#               define PyMODINIT_FUNC extern "C" void
-#       else /* __cplusplus */
-#               define PyMODINIT_FUNC void
-#       endif /* __cplusplus */
-#endif
-
-/* Deprecated DL_IMPORT and DL_EXPORT macros */
-#if defined(Py_ENABLE_SHARED) && defined (HAVE_DECLSPEC_DLL)
-#       if defined(Py_BUILD_CORE)
-#               define DL_IMPORT(RTYPE) __declspec(dllexport) RTYPE
-#               define DL_EXPORT(RTYPE) __declspec(dllexport) RTYPE
-#       else
-#               define DL_IMPORT(RTYPE) __declspec(dllimport) RTYPE
-#               define DL_EXPORT(RTYPE) __declspec(dllexport) RTYPE
-#       endif
-#endif
-#ifndef DL_EXPORT
-#       define DL_EXPORT(RTYPE) RTYPE
-#endif
-#ifndef DL_IMPORT
-#       define DL_IMPORT(RTYPE) RTYPE
-#endif
-/* End of deprecated DL_* macros */
-
-/* If the fd manipulation macros aren't defined,
-   here is a set that should do the job */
-
-#if 0 /* disabled and probably obsolete */
-
-#ifndef FD_SETSIZE
-#define FD_SETSIZE      256
-#endif
-
-#ifndef FD_SET
-
-typedef long fd_mask;
-
-#define NFDBITS (sizeof(fd_mask) * NBBY)        /* bits per mask */
-#ifndef howmany
-#define howmany(x, y)   (((x)+((y)-1))/(y))
-#endif /* howmany */
-
-typedef struct fd_set {
-    fd_mask     fds_bits[howmany(FD_SETSIZE, NFDBITS)];
-} fd_set;
-
-#define FD_SET(n, p)    ((p)->fds_bits[(n)/NFDBITS] |= (1 << ((n) % NFDBITS)))
-#define FD_CLR(n, p)    ((p)->fds_bits[(n)/NFDBITS] &= ~(1 << ((n) % NFDBITS)))
-#define FD_ISSET(n, p)  ((p)->fds_bits[(n)/NFDBITS] & (1 << ((n) % NFDBITS)))
-#define FD_ZERO(p)      memset((char *)(p), '\0', sizeof(*(p)))
-
-#endif /* FD_SET */
-
-#endif /* fd manipulation macros */
-
-
-/* limits.h constants that may be missing */
-
-#ifndef INT_MAX
-#define INT_MAX 2147483647
-#endif
-
-#ifndef LONG_MAX
-#if SIZEOF_LONG == 4
-#define LONG_MAX 0X7FFFFFFFL
-#elif SIZEOF_LONG == 8
-#define LONG_MAX 0X7FFFFFFFFFFFFFFFL
-#else
-#error "could not set LONG_MAX in pyport.h"
-#endif
-#endif
-
-#ifndef LONG_MIN
-#define LONG_MIN (-LONG_MAX-1)
-#endif
-
-#ifndef LONG_BIT
-#define LONG_BIT (8 * SIZEOF_LONG)
-#endif
-
-#if LONG_BIT != 8 * SIZEOF_LONG
-/* 04-Oct-2000 LONG_BIT is apparently (mis)defined as 64 on some recent
- * 32-bit platforms using gcc.  We try to catch that here at compile-time
- * rather than waiting for integer multiplication to trigger bogus
- * overflows.
- */
-#error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)."
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-/*
- * Hide GCC attributes from compilers that don't support them.
- */
-#if (!defined(__GNUC__) || __GNUC__ < 2 || \
-     (__GNUC__ == 2 && __GNUC_MINOR__ < 7) ) && \
-    !defined(RISCOS)
-#define Py_GCC_ATTRIBUTE(x)
-#else
-#define Py_GCC_ATTRIBUTE(x) __attribute__(x)
-#endif
-
-/*
- * Add PyArg_ParseTuple format where available.
- */
-#ifdef HAVE_ATTRIBUTE_FORMAT_PARSETUPLE
-#define Py_FORMAT_PARSETUPLE(func,p1,p2) __attribute__((format(func,p1,p2)))
-#else
-#define Py_FORMAT_PARSETUPLE(func,p1,p2)
-#endif
-
-/*
- * Specify alignment on compilers that support it.
- */
-#if defined(__GNUC__) && __GNUC__ >= 3
-#define Py_ALIGNED(x) __attribute__((aligned(x)))
-#else
-#define Py_ALIGNED(x)
-#endif
-
-/* Eliminate end-of-loop code not reached warnings from SunPro C
- * when using do{...}while(0) macros
- */
-#ifdef __SUNPRO_C
-#pragma error_messages (off,E_END_OF_LOOP_CODE_NOT_REACHED)
-#endif
-
-/*
- * Older Microsoft compilers don't support the C99 long long literal suffixes,
- * so these will be defined in PC/pyconfig.h for those compilers.
- */
-#ifndef Py_LL
-#define Py_LL(x) x##LL
-#endif
-
-#ifndef Py_ULL
-#define Py_ULL(x) Py_LL(x##U)
-#endif
-
-#endif /* Py_PYPORT_H */
+#endif /* Py_ENABLE_SHARED */ 
+ 
+/* If no external linkage macros defined by now, create defaults */ 
+#ifndef PyAPI_FUNC 
+#       define PyAPI_FUNC(RTYPE) RTYPE 
+#endif 
+#ifndef PyAPI_DATA 
+#       define PyAPI_DATA(RTYPE) extern RTYPE 
+#endif 
+#ifndef PyMODINIT_FUNC 
+#       if defined(__cplusplus) 
+#               define PyMODINIT_FUNC extern "C" void 
+#       else /* __cplusplus */ 
+#               define PyMODINIT_FUNC void 
+#       endif /* __cplusplus */ 
+#endif 
+ 
+/* Deprecated DL_IMPORT and DL_EXPORT macros */ 
+#if defined(Py_ENABLE_SHARED) && defined (HAVE_DECLSPEC_DLL) 
+#       if defined(Py_BUILD_CORE) 
+#               define DL_IMPORT(RTYPE) __declspec(dllexport) RTYPE 
+#               define DL_EXPORT(RTYPE) __declspec(dllexport) RTYPE 
+#       else 
+#               define DL_IMPORT(RTYPE) __declspec(dllimport) RTYPE 
+#               define DL_EXPORT(RTYPE) __declspec(dllexport) RTYPE 
+#       endif 
+#endif 
+#ifndef DL_EXPORT 
+#       define DL_EXPORT(RTYPE) RTYPE 
+#endif 
+#ifndef DL_IMPORT 
+#       define DL_IMPORT(RTYPE) RTYPE 
+#endif 
+/* End of deprecated DL_* macros */ 
+ 
+/* If the fd manipulation macros aren't defined, 
+   here is a set that should do the job */ 
+ 
+#if 0 /* disabled and probably obsolete */ 
+ 
+#ifndef FD_SETSIZE 
+#define FD_SETSIZE      256 
+#endif 
+ 
+#ifndef FD_SET 
+ 
+typedef long fd_mask; 
+ 
+#define NFDBITS (sizeof(fd_mask) * NBBY)        /* bits per mask */ 
+#ifndef howmany 
+#define howmany(x, y)   (((x)+((y)-1))/(y)) 
+#endif /* howmany */ 
+ 
+typedef struct fd_set { 
+    fd_mask     fds_bits[howmany(FD_SETSIZE, NFDBITS)]; 
+} fd_set; 
+ 
+#define FD_SET(n, p)    ((p)->fds_bits[(n)/NFDBITS] |= (1 << ((n) % NFDBITS))) 
+#define FD_CLR(n, p)    ((p)->fds_bits[(n)/NFDBITS] &= ~(1 << ((n) % NFDBITS))) 
+#define FD_ISSET(n, p)  ((p)->fds_bits[(n)/NFDBITS] & (1 << ((n) % NFDBITS))) 
+#define FD_ZERO(p)      memset((char *)(p), '\0', sizeof(*(p))) 
+ 
+#endif /* FD_SET */ 
+ 
+#endif /* fd manipulation macros */ 
+ 
+ 
+/* limits.h constants that may be missing */ 
+ 
+#ifndef INT_MAX 
+#define INT_MAX 2147483647 
+#endif 
+ 
+#ifndef LONG_MAX 
+#if SIZEOF_LONG == 4 
+#define LONG_MAX 0X7FFFFFFFL 
+#elif SIZEOF_LONG == 8 
+#define LONG_MAX 0X7FFFFFFFFFFFFFFFL 
+#else 
+#error "could not set LONG_MAX in pyport.h" 
+#endif 
+#endif 
+ 
+#ifndef LONG_MIN 
+#define LONG_MIN (-LONG_MAX-1) 
+#endif 
+ 
+#ifndef LONG_BIT 
+#define LONG_BIT (8 * SIZEOF_LONG) 
+#endif 
+ 
+#if LONG_BIT != 8 * SIZEOF_LONG 
+/* 04-Oct-2000 LONG_BIT is apparently (mis)defined as 64 on some recent 
+ * 32-bit platforms using gcc.  We try to catch that here at compile-time 
+ * rather than waiting for integer multiplication to trigger bogus 
+ * overflows. 
+ */ 
+#error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." 
+#endif 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+ 
+/* 
+ * Hide GCC attributes from compilers that don't support them. 
+ */ 
+#if (!defined(__GNUC__) || __GNUC__ < 2 || \ 
+     (__GNUC__ == 2 && __GNUC_MINOR__ < 7) ) && \ 
+    !defined(RISCOS) 
+#define Py_GCC_ATTRIBUTE(x) 
+#else 
+#define Py_GCC_ATTRIBUTE(x) __attribute__(x) 
+#endif 
+ 
+/* 
+ * Add PyArg_ParseTuple format where available. 
+ */ 
+#ifdef HAVE_ATTRIBUTE_FORMAT_PARSETUPLE 
+#define Py_FORMAT_PARSETUPLE(func,p1,p2) __attribute__((format(func,p1,p2))) 
+#else 
+#define Py_FORMAT_PARSETUPLE(func,p1,p2) 
+#endif 
+ 
+/* 
+ * Specify alignment on compilers that support it. 
+ */ 
+#if defined(__GNUC__) && __GNUC__ >= 3 
+#define Py_ALIGNED(x) __attribute__((aligned(x))) 
+#else 
+#define Py_ALIGNED(x) 
+#endif 
+ 
+/* Eliminate end-of-loop code not reached warnings from SunPro C 
+ * when using do{...}while(0) macros 
+ */ 
+#ifdef __SUNPRO_C 
+#pragma error_messages (off,E_END_OF_LOOP_CODE_NOT_REACHED) 
+#endif 
+ 
+/* 
+ * Older Microsoft compilers don't support the C99 long long literal suffixes, 
+ * so these will be defined in PC/pyconfig.h for those compilers. 
+ */ 
+#ifndef Py_LL 
+#define Py_LL(x) x##LL 
+#endif 
+ 
+#ifndef Py_ULL 
+#define Py_ULL(x) Py_LL(x##U) 
+#endif 
+ 
+#endif /* Py_PYPORT_H */ 
diff --git a/contrib/tools/python/src/Include/pystate.h b/contrib/tools/python/src/Include/pystate.h
index f2cfc30208..998d2d5dfe 100644
--- a/contrib/tools/python/src/Include/pystate.h
+++ b/contrib/tools/python/src/Include/pystate.h
@@ -1,200 +1,200 @@
-
-/* Thread and interpreter state structures and their interfaces */
-
-
-#ifndef Py_PYSTATE_H
-#define Py_PYSTATE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* State shared between threads */
-
-struct _ts; /* Forward */
-struct _is; /* Forward */
-
-typedef struct _is {
-
-    struct _is *next;
-    struct _ts *tstate_head;
-
-    PyObject *modules;
-    PyObject *sysdict;
-    PyObject *builtins;
-    PyObject *modules_reloading;
-
-    PyObject *codec_search_path;
-    PyObject *codec_search_cache;
-    PyObject *codec_error_registry;
-
-#ifdef HAVE_DLOPEN
-    int dlopenflags;
-#endif
-#ifdef WITH_TSC
-    int tscdump;
-#endif
-
-} PyInterpreterState;
-
-
-/* State unique per thread */
-
-struct _frame; /* Avoid including frameobject.h */
-
-/* Py_tracefunc return -1 when raising an exception, or 0 for success. */
-typedef int (*Py_tracefunc)(PyObject *, struct _frame *, int, PyObject *);
-
-/* The following values are used for 'what' for tracefunc functions: */
-#define PyTrace_CALL 0
-#define PyTrace_EXCEPTION 1
-#define PyTrace_LINE 2
-#define PyTrace_RETURN 3
-#define PyTrace_C_CALL 4
-#define PyTrace_C_EXCEPTION 5
-#define PyTrace_C_RETURN 6
-
-typedef struct _ts {
-    /* See Python/ceval.c for comments explaining most fields */
-
-    struct _ts *next;
-    PyInterpreterState *interp;
-
-    struct _frame *frame;
-    int recursion_depth;
-    /* 'tracing' keeps track of the execution depth when tracing/profiling.
-       This is to prevent the actual trace/profile code from being recorded in
-       the trace/profile. */
-    int tracing;
-    int use_tracing;
-
-    Py_tracefunc c_profilefunc;
-    Py_tracefunc c_tracefunc;
-    PyObject *c_profileobj;
-    PyObject *c_traceobj;
-
-    PyObject *curexc_type;
-    PyObject *curexc_value;
-    PyObject *curexc_traceback;
-
-    PyObject *exc_type;
-    PyObject *exc_value;
-    PyObject *exc_traceback;
-
-    PyObject *dict;  /* Stores per-thread state */
-
-    /* tick_counter is incremented whenever the check_interval ticker
-     * reaches zero. The purpose is to give a useful measure of the number
-     * of interpreted bytecode instructions in a given thread.  This
-     * extremely lightweight statistic collector may be of interest to
-     * profilers (like psyco.jit()), although nothing in the core uses it.
-     */
-    int tick_counter;
-
-    int gilstate_counter;
-
-    PyObject *async_exc; /* Asynchronous exception to raise */
-    long thread_id; /* Thread id where this tstate was created */
-
+ 
+/* Thread and interpreter state structures and their interfaces */ 
+ 
+ 
+#ifndef Py_PYSTATE_H 
+#define Py_PYSTATE_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+/* State shared between threads */ 
+ 
+struct _ts; /* Forward */ 
+struct _is; /* Forward */ 
+ 
+typedef struct _is { 
+ 
+    struct _is *next; 
+    struct _ts *tstate_head; 
+ 
+    PyObject *modules; 
+    PyObject *sysdict; 
+    PyObject *builtins; 
+    PyObject *modules_reloading; 
+ 
+    PyObject *codec_search_path; 
+    PyObject *codec_search_cache; 
+    PyObject *codec_error_registry; 
+ 
+#ifdef HAVE_DLOPEN 
+    int dlopenflags; 
+#endif 
+#ifdef WITH_TSC 
+    int tscdump; 
+#endif 
+ 
+} PyInterpreterState; 
+ 
+ 
+/* State unique per thread */ 
+ 
+struct _frame; /* Avoid including frameobject.h */ 
+ 
+/* Py_tracefunc return -1 when raising an exception, or 0 for success. */ 
+typedef int (*Py_tracefunc)(PyObject *, struct _frame *, int, PyObject *); 
+ 
+/* The following values are used for 'what' for tracefunc functions: */ 
+#define PyTrace_CALL 0 
+#define PyTrace_EXCEPTION 1 
+#define PyTrace_LINE 2 
+#define PyTrace_RETURN 3 
+#define PyTrace_C_CALL 4 
+#define PyTrace_C_EXCEPTION 5 
+#define PyTrace_C_RETURN 6 
+ 
+typedef struct _ts { 
+    /* See Python/ceval.c for comments explaining most fields */ 
+ 
+    struct _ts *next; 
+    PyInterpreterState *interp; 
+ 
+    struct _frame *frame; 
+    int recursion_depth; 
+    /* 'tracing' keeps track of the execution depth when tracing/profiling. 
+       This is to prevent the actual trace/profile code from being recorded in 
+       the trace/profile. */ 
+    int tracing; 
+    int use_tracing; 
+ 
+    Py_tracefunc c_profilefunc; 
+    Py_tracefunc c_tracefunc; 
+    PyObject *c_profileobj; 
+    PyObject *c_traceobj; 
+ 
+    PyObject *curexc_type; 
+    PyObject *curexc_value; 
+    PyObject *curexc_traceback; 
+ 
+    PyObject *exc_type; 
+    PyObject *exc_value; 
+    PyObject *exc_traceback; 
+ 
+    PyObject *dict;  /* Stores per-thread state */ 
+ 
+    /* tick_counter is incremented whenever the check_interval ticker 
+     * reaches zero. The purpose is to give a useful measure of the number 
+     * of interpreted bytecode instructions in a given thread.  This 
+     * extremely lightweight statistic collector may be of interest to 
+     * profilers (like psyco.jit()), although nothing in the core uses it. 
+     */ 
+    int tick_counter; 
+ 
+    int gilstate_counter; 
+ 
+    PyObject *async_exc; /* Asynchronous exception to raise */ 
+    long thread_id; /* Thread id where this tstate was created */ 
+ 
     int trash_delete_nesting;
     PyObject *trash_delete_later;
 
-    /* XXX signal handlers should also be here */
-
-} PyThreadState;
-
-
-PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_New(void);
-PyAPI_FUNC(void) PyInterpreterState_Clear(PyInterpreterState *);
-PyAPI_FUNC(void) PyInterpreterState_Delete(PyInterpreterState *);
-
-PyAPI_FUNC(PyThreadState *) PyThreadState_New(PyInterpreterState *);
-PyAPI_FUNC(PyThreadState *) _PyThreadState_Prealloc(PyInterpreterState *);
-PyAPI_FUNC(void) _PyThreadState_Init(PyThreadState *);
-PyAPI_FUNC(void) PyThreadState_Clear(PyThreadState *);
-PyAPI_FUNC(void) PyThreadState_Delete(PyThreadState *);
-#ifdef WITH_THREAD
-PyAPI_FUNC(void) PyThreadState_DeleteCurrent(void);
-#endif
-
-PyAPI_FUNC(PyThreadState *) PyThreadState_Get(void);
-PyAPI_FUNC(PyThreadState *) PyThreadState_Swap(PyThreadState *);
-PyAPI_FUNC(PyObject *) PyThreadState_GetDict(void);
-PyAPI_FUNC(int) PyThreadState_SetAsyncExc(long, PyObject *);
-
-
-/* Variable and macro for in-line access to current thread state */
-
-PyAPI_DATA(PyThreadState *) _PyThreadState_Current;
-
-#ifdef Py_DEBUG
-#define PyThreadState_GET() PyThreadState_Get()
-#else
-#define PyThreadState_GET() (_PyThreadState_Current)
-#endif
-
-typedef
-    enum {PyGILState_LOCKED, PyGILState_UNLOCKED}
-        PyGILState_STATE;
-
-/* Ensure that the current thread is ready to call the Python
-   C API, regardless of the current state of Python, or of its
-   thread lock.  This may be called as many times as desired
-   by a thread so long as each call is matched with a call to
-   PyGILState_Release().  In general, other thread-state APIs may
-   be used between _Ensure() and _Release() calls, so long as the
-   thread-state is restored to its previous state before the Release().
-   For example, normal use of the Py_BEGIN_ALLOW_THREADS/
-   Py_END_ALLOW_THREADS macros are acceptable.
-
-   The return value is an opaque "handle" to the thread state when
-   PyGILState_Ensure() was called, and must be passed to
-   PyGILState_Release() to ensure Python is left in the same state. Even
-   though recursive calls are allowed, these handles can *not* be shared -
-   each unique call to PyGILState_Ensure must save the handle for its
-   call to PyGILState_Release.
-
-   When the function returns, the current thread will hold the GIL.
-
-   Failure is a fatal error.
-*/
-PyAPI_FUNC(PyGILState_STATE) PyGILState_Ensure(void);
-
-/* Release any resources previously acquired.  After this call, Python's
-   state will be the same as it was prior to the corresponding
-   PyGILState_Ensure() call (but generally this state will be unknown to
-   the caller, hence the use of the GILState API.)
-
-   Every call to PyGILState_Ensure must be matched by a call to
-   PyGILState_Release on the same thread.
-*/
-PyAPI_FUNC(void) PyGILState_Release(PyGILState_STATE);
-
-/* Helper/diagnostic function - get the current thread state for
-   this thread.  May return NULL if no GILState API has been used
-   on the current thread.  Note that the main thread always has such a
-   thread-state, even if no auto-thread-state call has been made
-   on the main thread.
-*/
-PyAPI_FUNC(PyThreadState *) PyGILState_GetThisThreadState(void);
-
-/* The implementation of sys._current_frames()  Returns a dict mapping
-   thread id to that thread's current frame.
-*/
-PyAPI_FUNC(PyObject *) _PyThread_CurrentFrames(void);
-
-/* Routines for advanced debuggers, requested by David Beazley.
-   Don't use unless you know what you are doing! */
-PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_Head(void);
-PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_Next(PyInterpreterState *);
-PyAPI_FUNC(PyThreadState *) PyInterpreterState_ThreadHead(PyInterpreterState *);
-PyAPI_FUNC(PyThreadState *) PyThreadState_Next(PyThreadState *);
-
-typedef struct _frame *(*PyThreadFrameGetter)(PyThreadState *self_);
-
-/* hook for PyEval_GetFrame(), requested for Psyco */
-PyAPI_DATA(PyThreadFrameGetter) _PyThreadState_GetFrame;
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_PYSTATE_H */
+    /* XXX signal handlers should also be here */ 
+ 
+} PyThreadState; 
+ 
+ 
+PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_New(void); 
+PyAPI_FUNC(void) PyInterpreterState_Clear(PyInterpreterState *); 
+PyAPI_FUNC(void) PyInterpreterState_Delete(PyInterpreterState *); 
+ 
+PyAPI_FUNC(PyThreadState *) PyThreadState_New(PyInterpreterState *); 
+PyAPI_FUNC(PyThreadState *) _PyThreadState_Prealloc(PyInterpreterState *); 
+PyAPI_FUNC(void) _PyThreadState_Init(PyThreadState *); 
+PyAPI_FUNC(void) PyThreadState_Clear(PyThreadState *); 
+PyAPI_FUNC(void) PyThreadState_Delete(PyThreadState *); 
+#ifdef WITH_THREAD 
+PyAPI_FUNC(void) PyThreadState_DeleteCurrent(void); 
+#endif 
+ 
+PyAPI_FUNC(PyThreadState *) PyThreadState_Get(void); 
+PyAPI_FUNC(PyThreadState *) PyThreadState_Swap(PyThreadState *); 
+PyAPI_FUNC(PyObject *) PyThreadState_GetDict(void); 
+PyAPI_FUNC(int) PyThreadState_SetAsyncExc(long, PyObject *); 
+ 
+ 
+/* Variable and macro for in-line access to current thread state */ 
+ 
+PyAPI_DATA(PyThreadState *) _PyThreadState_Current; 
+ 
+#ifdef Py_DEBUG 
+#define PyThreadState_GET() PyThreadState_Get() 
+#else 
+#define PyThreadState_GET() (_PyThreadState_Current) 
+#endif 
+ 
+typedef 
+    enum {PyGILState_LOCKED, PyGILState_UNLOCKED} 
+        PyGILState_STATE; 
+ 
+/* Ensure that the current thread is ready to call the Python 
+   C API, regardless of the current state of Python, or of its 
+   thread lock.  This may be called as many times as desired 
+   by a thread so long as each call is matched with a call to 
+   PyGILState_Release().  In general, other thread-state APIs may 
+   be used between _Ensure() and _Release() calls, so long as the 
+   thread-state is restored to its previous state before the Release(). 
+   For example, normal use of the Py_BEGIN_ALLOW_THREADS/ 
+   Py_END_ALLOW_THREADS macros are acceptable. 
+ 
+   The return value is an opaque "handle" to the thread state when 
+   PyGILState_Ensure() was called, and must be passed to 
+   PyGILState_Release() to ensure Python is left in the same state. Even 
+   though recursive calls are allowed, these handles can *not* be shared - 
+   each unique call to PyGILState_Ensure must save the handle for its 
+   call to PyGILState_Release. 
+ 
+   When the function returns, the current thread will hold the GIL. 
+ 
+   Failure is a fatal error. 
+*/ 
+PyAPI_FUNC(PyGILState_STATE) PyGILState_Ensure(void); 
+ 
+/* Release any resources previously acquired.  After this call, Python's 
+   state will be the same as it was prior to the corresponding 
+   PyGILState_Ensure() call (but generally this state will be unknown to 
+   the caller, hence the use of the GILState API.) 
+ 
+   Every call to PyGILState_Ensure must be matched by a call to 
+   PyGILState_Release on the same thread. 
+*/ 
+PyAPI_FUNC(void) PyGILState_Release(PyGILState_STATE); 
+ 
+/* Helper/diagnostic function - get the current thread state for 
+   this thread.  May return NULL if no GILState API has been used 
+   on the current thread.  Note that the main thread always has such a 
+   thread-state, even if no auto-thread-state call has been made 
+   on the main thread. 
+*/ 
+PyAPI_FUNC(PyThreadState *) PyGILState_GetThisThreadState(void); 
+ 
+/* The implementation of sys._current_frames()  Returns a dict mapping 
+   thread id to that thread's current frame. 
+*/ 
+PyAPI_FUNC(PyObject *) _PyThread_CurrentFrames(void); 
+ 
+/* Routines for advanced debuggers, requested by David Beazley. 
+   Don't use unless you know what you are doing! */ 
+PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_Head(void); 
+PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_Next(PyInterpreterState *); 
+PyAPI_FUNC(PyThreadState *) PyInterpreterState_ThreadHead(PyInterpreterState *); 
+PyAPI_FUNC(PyThreadState *) PyThreadState_Next(PyThreadState *); 
+ 
+typedef struct _frame *(*PyThreadFrameGetter)(PyThreadState *self_); 
+ 
+/* hook for PyEval_GetFrame(), requested for Psyco */ 
+PyAPI_DATA(PyThreadFrameGetter) _PyThreadState_GetFrame; 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_PYSTATE_H */ 
diff --git a/contrib/tools/python/src/Include/pystrcmp.h b/contrib/tools/python/src/Include/pystrcmp.h
index 369c7e77ff..6527d6548d 100644
--- a/contrib/tools/python/src/Include/pystrcmp.h
+++ b/contrib/tools/python/src/Include/pystrcmp.h
@@ -1,23 +1,23 @@
-#ifndef Py_STRCMP_H
-#define Py_STRCMP_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_FUNC(int) PyOS_mystrnicmp(const char *, const char *, Py_ssize_t);
-PyAPI_FUNC(int) PyOS_mystricmp(const char *, const char *);
-
-#if defined(MS_WINDOWS) || defined(PYOS_OS2)
-#define PyOS_strnicmp strnicmp
-#define PyOS_stricmp stricmp
-#else
-#define PyOS_strnicmp PyOS_mystrnicmp
-#define PyOS_stricmp PyOS_mystricmp
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !Py_STRCMP_H */
+#ifndef Py_STRCMP_H 
+#define Py_STRCMP_H 
+ 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+PyAPI_FUNC(int) PyOS_mystrnicmp(const char *, const char *, Py_ssize_t); 
+PyAPI_FUNC(int) PyOS_mystricmp(const char *, const char *); 
+ 
+#if defined(MS_WINDOWS) || defined(PYOS_OS2) 
+#define PyOS_strnicmp strnicmp 
+#define PyOS_stricmp stricmp 
+#else 
+#define PyOS_strnicmp PyOS_mystrnicmp 
+#define PyOS_stricmp PyOS_mystricmp 
+#endif 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+ 
+#endif /* !Py_STRCMP_H */ 
diff --git a/contrib/tools/python/src/Include/pystrtod.h b/contrib/tools/python/src/Include/pystrtod.h
index eec434f1bd..9c2c3a9567 100644
--- a/contrib/tools/python/src/Include/pystrtod.h
+++ b/contrib/tools/python/src/Include/pystrtod.h
@@ -1,45 +1,45 @@
-#ifndef Py_STRTOD_H
-#define Py_STRTOD_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-PyAPI_FUNC(double) PyOS_ascii_strtod(const char *str, char **ptr);
-PyAPI_FUNC(double) PyOS_ascii_atof(const char *str);
-
-/* Deprecated in 2.7 and 3.1. Will disappear in 2.8 (if it exists) and 3.2 */
-PyAPI_FUNC(char *) PyOS_ascii_formatd(char *buffer, size_t buf_len,
-                                      const char *format, double d);
-PyAPI_FUNC(double) PyOS_string_to_double(const char *str,
-                                         char **endptr,
-                                         PyObject *overflow_exception);
-
-/* The caller is responsible for calling PyMem_Free to free the buffer
-   that's is returned. */
-PyAPI_FUNC(char *) PyOS_double_to_string(double val,
-                                         char format_code,
-                                         int precision,
-                                         int flags,
-                                         int *type);
-
-PyAPI_FUNC(double) _Py_parse_inf_or_nan(const char *p, char **endptr);
-
-
-/* PyOS_double_to_string's "flags" parameter can be set to 0 or more of: */
-#define Py_DTSF_SIGN      0x01 /* always add the sign */
-#define Py_DTSF_ADD_DOT_0 0x02 /* if the result is an integer add ".0" */
-#define Py_DTSF_ALT       0x04 /* "alternate" formatting. it's format_code
-                                  specific */
-
-/* PyOS_double_to_string's "type", if non-NULL, will be set to one of: */
-#define Py_DTST_FINITE 0
-#define Py_DTST_INFINITE 1
-#define Py_DTST_NAN 2
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !Py_STRTOD_H */
+#ifndef Py_STRTOD_H 
+#define Py_STRTOD_H 
+ 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+ 
+PyAPI_FUNC(double) PyOS_ascii_strtod(const char *str, char **ptr); 
+PyAPI_FUNC(double) PyOS_ascii_atof(const char *str); 
+ 
+/* Deprecated in 2.7 and 3.1. Will disappear in 2.8 (if it exists) and 3.2 */ 
+PyAPI_FUNC(char *) PyOS_ascii_formatd(char *buffer, size_t buf_len, 
+                                      const char *format, double d); 
+PyAPI_FUNC(double) PyOS_string_to_double(const char *str, 
+                                         char **endptr, 
+                                         PyObject *overflow_exception); 
+ 
+/* The caller is responsible for calling PyMem_Free to free the buffer 
+   that's is returned. */ 
+PyAPI_FUNC(char *) PyOS_double_to_string(double val, 
+                                         char format_code, 
+                                         int precision, 
+                                         int flags, 
+                                         int *type); 
+ 
+PyAPI_FUNC(double) _Py_parse_inf_or_nan(const char *p, char **endptr); 
+ 
+ 
+/* PyOS_double_to_string's "flags" parameter can be set to 0 or more of: */ 
+#define Py_DTSF_SIGN      0x01 /* always add the sign */ 
+#define Py_DTSF_ADD_DOT_0 0x02 /* if the result is an integer add ".0" */ 
+#define Py_DTSF_ALT       0x04 /* "alternate" formatting. it's format_code 
+                                  specific */ 
+ 
+/* PyOS_double_to_string's "type", if non-NULL, will be set to one of: */ 
+#define Py_DTST_FINITE 0 
+#define Py_DTST_INFINITE 1 
+#define Py_DTST_NAN 2 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+ 
+#endif /* !Py_STRTOD_H */ 
diff --git a/contrib/tools/python/src/Include/pythonrun.h b/contrib/tools/python/src/Include/pythonrun.h
index ba644b375a..e4a616bbcf 100644
--- a/contrib/tools/python/src/Include/pythonrun.h
+++ b/contrib/tools/python/src/Include/pythonrun.h
@@ -1,181 +1,181 @@
-
-/* Interfaces to parse and execute pieces of python code */
-
-#ifndef Py_PYTHONRUN_H
-#define Py_PYTHONRUN_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define PyCF_MASK (CO_FUTURE_DIVISION | CO_FUTURE_ABSOLUTE_IMPORT | \
-                   CO_FUTURE_WITH_STATEMENT | CO_FUTURE_PRINT_FUNCTION | \
-                   CO_FUTURE_UNICODE_LITERALS)
-#define PyCF_MASK_OBSOLETE (CO_NESTED)
-#define PyCF_SOURCE_IS_UTF8  0x0100
-#define PyCF_DONT_IMPLY_DEDENT 0x0200
-#define PyCF_ONLY_AST 0x0400
-
-typedef struct {
-    int cf_flags;  /* bitmask of CO_xxx flags relevant to future */
-} PyCompilerFlags;
-
+ 
+/* Interfaces to parse and execute pieces of python code */ 
+ 
+#ifndef Py_PYTHONRUN_H 
+#define Py_PYTHONRUN_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+#define PyCF_MASK (CO_FUTURE_DIVISION | CO_FUTURE_ABSOLUTE_IMPORT | \ 
+                   CO_FUTURE_WITH_STATEMENT | CO_FUTURE_PRINT_FUNCTION | \ 
+                   CO_FUTURE_UNICODE_LITERALS) 
+#define PyCF_MASK_OBSOLETE (CO_NESTED) 
+#define PyCF_SOURCE_IS_UTF8  0x0100 
+#define PyCF_DONT_IMPLY_DEDENT 0x0200 
+#define PyCF_ONLY_AST 0x0400 
+ 
+typedef struct { 
+    int cf_flags;  /* bitmask of CO_xxx flags relevant to future */ 
+} PyCompilerFlags; 
+ 
 PyAPI_FUNC(void) Py_SetProgramName(const char *);
-PyAPI_FUNC(char *) Py_GetProgramName(void);
-
-PyAPI_FUNC(void) Py_SetPythonHome(char *);
-PyAPI_FUNC(char *) Py_GetPythonHome(void);
-
-PyAPI_FUNC(void) Py_Initialize(void);
-PyAPI_FUNC(void) Py_InitializeEx(int);
-PyAPI_FUNC(void) Py_Finalize(void);
-PyAPI_FUNC(int) Py_IsInitialized(void);
-PyAPI_FUNC(PyThreadState *) Py_NewInterpreter(void);
-PyAPI_FUNC(void) Py_EndInterpreter(PyThreadState *);
-
-PyAPI_FUNC(int) PyRun_AnyFileFlags(FILE *, const char *, PyCompilerFlags *);
-PyAPI_FUNC(int) PyRun_AnyFileExFlags(FILE *, const char *, int, PyCompilerFlags *);
-PyAPI_FUNC(int) PyRun_SimpleStringFlags(const char *, PyCompilerFlags *);
-PyAPI_FUNC(int) PyRun_SimpleFileExFlags(FILE *, const char *, int, PyCompilerFlags *);
-PyAPI_FUNC(int) PyRun_InteractiveOneFlags(FILE *, const char *, PyCompilerFlags *);
-PyAPI_FUNC(int) PyRun_InteractiveLoopFlags(FILE *, const char *, PyCompilerFlags *);
-
-PyAPI_FUNC(struct _mod *) PyParser_ASTFromString(const char *, const char *,
-                                                 int, PyCompilerFlags *flags,
-                                                 PyArena *);
-PyAPI_FUNC(struct _mod *) PyParser_ASTFromFile(FILE *, const char *, int,
-                                               char *, char *,
-                                               PyCompilerFlags *, int *,
-                                               PyArena *);
-#define PyParser_SimpleParseString(S, B) \
-    PyParser_SimpleParseStringFlags(S, B, 0)
-#define PyParser_SimpleParseFile(FP, S, B) \
-    PyParser_SimpleParseFileFlags(FP, S, B, 0)
-PyAPI_FUNC(struct _node *) PyParser_SimpleParseStringFlags(const char *, int,
-                                                          int);
-PyAPI_FUNC(struct _node *) PyParser_SimpleParseFileFlags(FILE *, const char *,
-                                                        int, int);
-
-PyAPI_FUNC(PyObject *) PyRun_StringFlags(const char *, int, PyObject *,
-                                         PyObject *, PyCompilerFlags *);
-
-PyAPI_FUNC(PyObject *) PyRun_FileExFlags(FILE *, const char *, int,
-                                         PyObject *, PyObject *, int,
-                                         PyCompilerFlags *);
-
-#define Py_CompileString(str, p, s) Py_CompileStringFlags(str, p, s, NULL)
-PyAPI_FUNC(PyObject *) Py_CompileStringFlags(const char *, const char *, int,
-                                             PyCompilerFlags *);
-PyAPI_FUNC(struct symtable *) Py_SymtableString(const char *, const char *, int);
-
-PyAPI_FUNC(void) PyErr_Print(void);
-PyAPI_FUNC(void) PyErr_PrintEx(int);
-PyAPI_FUNC(void) PyErr_Display(PyObject *, PyObject *, PyObject *);
-
-PyAPI_FUNC(int) Py_AtExit(void (*func)(void));
-
-PyAPI_FUNC(void) Py_Exit(int);
-
-PyAPI_FUNC(int) Py_FdIsInteractive(FILE *, const char *);
-
-/* Bootstrap */
-PyAPI_FUNC(int) Py_Main(int argc, char **argv);
-
-/* Use macros for a bunch of old variants */
-#define PyRun_String(str, s, g, l) PyRun_StringFlags(str, s, g, l, NULL)
-#define PyRun_AnyFile(fp, name) PyRun_AnyFileExFlags(fp, name, 0, NULL)
-#define PyRun_AnyFileEx(fp, name, closeit) \
-    PyRun_AnyFileExFlags(fp, name, closeit, NULL)
-#define PyRun_AnyFileFlags(fp, name, flags) \
-    PyRun_AnyFileExFlags(fp, name, 0, flags)
-#define PyRun_SimpleString(s) PyRun_SimpleStringFlags(s, NULL)
-#define PyRun_SimpleFile(f, p) PyRun_SimpleFileExFlags(f, p, 0, NULL)
-#define PyRun_SimpleFileEx(f, p, c) PyRun_SimpleFileExFlags(f, p, c, NULL)
-#define PyRun_InteractiveOne(f, p) PyRun_InteractiveOneFlags(f, p, NULL)
-#define PyRun_InteractiveLoop(f, p) PyRun_InteractiveLoopFlags(f, p, NULL)
-#define PyRun_File(fp, p, s, g, l) \
-    PyRun_FileExFlags(fp, p, s, g, l, 0, NULL)
-#define PyRun_FileEx(fp, p, s, g, l, c) \
-    PyRun_FileExFlags(fp, p, s, g, l, c, NULL)
-#define PyRun_FileFlags(fp, p, s, g, l, flags) \
-    PyRun_FileExFlags(fp, p, s, g, l, 0, flags)
-
-/* In getpath.c */
-PyAPI_FUNC(char *) Py_GetProgramFullPath(void);
-PyAPI_FUNC(char *) Py_GetPrefix(void);
-PyAPI_FUNC(char *) Py_GetExecPrefix(void);
-PyAPI_FUNC(char *) Py_GetPath(void);
-
-/* In their own files */
-PyAPI_FUNC(const char *) Py_GetVersion(void);
-PyAPI_FUNC(const char *) Py_GetPlatform(void);
-PyAPI_FUNC(const char *) Py_GetCopyright(void);
-PyAPI_FUNC(const char *) Py_GetCompiler(void);
-PyAPI_FUNC(const char *) Py_GetBuildInfo(void);
-PyAPI_FUNC(const char *) Py_SubversionRevision(void);
-PyAPI_FUNC(const char *) Py_SubversionShortBranch(void);
+PyAPI_FUNC(char *) Py_GetProgramName(void); 
+ 
+PyAPI_FUNC(void) Py_SetPythonHome(char *); 
+PyAPI_FUNC(char *) Py_GetPythonHome(void); 
+ 
+PyAPI_FUNC(void) Py_Initialize(void); 
+PyAPI_FUNC(void) Py_InitializeEx(int); 
+PyAPI_FUNC(void) Py_Finalize(void); 
+PyAPI_FUNC(int) Py_IsInitialized(void); 
+PyAPI_FUNC(PyThreadState *) Py_NewInterpreter(void); 
+PyAPI_FUNC(void) Py_EndInterpreter(PyThreadState *); 
+ 
+PyAPI_FUNC(int) PyRun_AnyFileFlags(FILE *, const char *, PyCompilerFlags *); 
+PyAPI_FUNC(int) PyRun_AnyFileExFlags(FILE *, const char *, int, PyCompilerFlags *); 
+PyAPI_FUNC(int) PyRun_SimpleStringFlags(const char *, PyCompilerFlags *); 
+PyAPI_FUNC(int) PyRun_SimpleFileExFlags(FILE *, const char *, int, PyCompilerFlags *); 
+PyAPI_FUNC(int) PyRun_InteractiveOneFlags(FILE *, const char *, PyCompilerFlags *); 
+PyAPI_FUNC(int) PyRun_InteractiveLoopFlags(FILE *, const char *, PyCompilerFlags *); 
+ 
+PyAPI_FUNC(struct _mod *) PyParser_ASTFromString(const char *, const char *, 
+                                                 int, PyCompilerFlags *flags, 
+                                                 PyArena *); 
+PyAPI_FUNC(struct _mod *) PyParser_ASTFromFile(FILE *, const char *, int, 
+                                               char *, char *, 
+                                               PyCompilerFlags *, int *, 
+                                               PyArena *); 
+#define PyParser_SimpleParseString(S, B) \ 
+    PyParser_SimpleParseStringFlags(S, B, 0) 
+#define PyParser_SimpleParseFile(FP, S, B) \ 
+    PyParser_SimpleParseFileFlags(FP, S, B, 0) 
+PyAPI_FUNC(struct _node *) PyParser_SimpleParseStringFlags(const char *, int, 
+                                                          int); 
+PyAPI_FUNC(struct _node *) PyParser_SimpleParseFileFlags(FILE *, const char *, 
+                                                        int, int); 
+ 
+PyAPI_FUNC(PyObject *) PyRun_StringFlags(const char *, int, PyObject *, 
+                                         PyObject *, PyCompilerFlags *); 
+ 
+PyAPI_FUNC(PyObject *) PyRun_FileExFlags(FILE *, const char *, int, 
+                                         PyObject *, PyObject *, int, 
+                                         PyCompilerFlags *); 
+ 
+#define Py_CompileString(str, p, s) Py_CompileStringFlags(str, p, s, NULL) 
+PyAPI_FUNC(PyObject *) Py_CompileStringFlags(const char *, const char *, int, 
+                                             PyCompilerFlags *); 
+PyAPI_FUNC(struct symtable *) Py_SymtableString(const char *, const char *, int); 
+ 
+PyAPI_FUNC(void) PyErr_Print(void); 
+PyAPI_FUNC(void) PyErr_PrintEx(int); 
+PyAPI_FUNC(void) PyErr_Display(PyObject *, PyObject *, PyObject *); 
+ 
+PyAPI_FUNC(int) Py_AtExit(void (*func)(void)); 
+ 
+PyAPI_FUNC(void) Py_Exit(int); 
+ 
+PyAPI_FUNC(int) Py_FdIsInteractive(FILE *, const char *); 
+ 
+/* Bootstrap */ 
+PyAPI_FUNC(int) Py_Main(int argc, char **argv); 
+ 
+/* Use macros for a bunch of old variants */ 
+#define PyRun_String(str, s, g, l) PyRun_StringFlags(str, s, g, l, NULL) 
+#define PyRun_AnyFile(fp, name) PyRun_AnyFileExFlags(fp, name, 0, NULL) 
+#define PyRun_AnyFileEx(fp, name, closeit) \ 
+    PyRun_AnyFileExFlags(fp, name, closeit, NULL) 
+#define PyRun_AnyFileFlags(fp, name, flags) \ 
+    PyRun_AnyFileExFlags(fp, name, 0, flags) 
+#define PyRun_SimpleString(s) PyRun_SimpleStringFlags(s, NULL) 
+#define PyRun_SimpleFile(f, p) PyRun_SimpleFileExFlags(f, p, 0, NULL) 
+#define PyRun_SimpleFileEx(f, p, c) PyRun_SimpleFileExFlags(f, p, c, NULL) 
+#define PyRun_InteractiveOne(f, p) PyRun_InteractiveOneFlags(f, p, NULL) 
+#define PyRun_InteractiveLoop(f, p) PyRun_InteractiveLoopFlags(f, p, NULL) 
+#define PyRun_File(fp, p, s, g, l) \ 
+    PyRun_FileExFlags(fp, p, s, g, l, 0, NULL) 
+#define PyRun_FileEx(fp, p, s, g, l, c) \ 
+    PyRun_FileExFlags(fp, p, s, g, l, c, NULL) 
+#define PyRun_FileFlags(fp, p, s, g, l, flags) \ 
+    PyRun_FileExFlags(fp, p, s, g, l, 0, flags) 
+ 
+/* In getpath.c */ 
+PyAPI_FUNC(char *) Py_GetProgramFullPath(void); 
+PyAPI_FUNC(char *) Py_GetPrefix(void); 
+PyAPI_FUNC(char *) Py_GetExecPrefix(void); 
+PyAPI_FUNC(char *) Py_GetPath(void); 
+ 
+/* In their own files */ 
+PyAPI_FUNC(const char *) Py_GetVersion(void); 
+PyAPI_FUNC(const char *) Py_GetPlatform(void); 
+PyAPI_FUNC(const char *) Py_GetCopyright(void); 
+PyAPI_FUNC(const char *) Py_GetCompiler(void); 
+PyAPI_FUNC(const char *) Py_GetBuildInfo(void); 
+PyAPI_FUNC(const char *) Py_SubversionRevision(void); 
+PyAPI_FUNC(const char *) Py_SubversionShortBranch(void); 
 PyAPI_FUNC(const char *) _Py_gitidentifier(void);
 PyAPI_FUNC(const char *) _Py_gitversion(void);
-
-/* Internal -- various one-time initializations */
-PyAPI_FUNC(PyObject *) _PyBuiltin_Init(void);
-PyAPI_FUNC(PyObject *) _PySys_Init(void);
-PyAPI_FUNC(void) _PyImport_Init(void);
-PyAPI_FUNC(void) _PyExc_Init(void);
-PyAPI_FUNC(void) _PyImportHooks_Init(void);
-PyAPI_FUNC(int) _PyFrame_Init(void);
-PyAPI_FUNC(int) _PyInt_Init(void);
-PyAPI_FUNC(int) _PyLong_Init(void);
-PyAPI_FUNC(void) _PyFloat_Init(void);
-PyAPI_FUNC(int) PyByteArray_Init(void);
-PyAPI_FUNC(void) _PyRandom_Init(void);
-
-/* Various internal finalizers */
-PyAPI_FUNC(void) _PyExc_Fini(void);
-PyAPI_FUNC(void) _PyImport_Fini(void);
-PyAPI_FUNC(void) PyMethod_Fini(void);
-PyAPI_FUNC(void) PyFrame_Fini(void);
-PyAPI_FUNC(void) PyCFunction_Fini(void);
-PyAPI_FUNC(void) PyDict_Fini(void);
-PyAPI_FUNC(void) PyTuple_Fini(void);
-PyAPI_FUNC(void) PyList_Fini(void);
-PyAPI_FUNC(void) PySet_Fini(void);
-PyAPI_FUNC(void) PyString_Fini(void);
-PyAPI_FUNC(void) PyInt_Fini(void);
-PyAPI_FUNC(void) PyFloat_Fini(void);
-PyAPI_FUNC(void) PyOS_FiniInterrupts(void);
-PyAPI_FUNC(void) PyByteArray_Fini(void);
+ 
+/* Internal -- various one-time initializations */ 
+PyAPI_FUNC(PyObject *) _PyBuiltin_Init(void); 
+PyAPI_FUNC(PyObject *) _PySys_Init(void); 
+PyAPI_FUNC(void) _PyImport_Init(void); 
+PyAPI_FUNC(void) _PyExc_Init(void); 
+PyAPI_FUNC(void) _PyImportHooks_Init(void); 
+PyAPI_FUNC(int) _PyFrame_Init(void); 
+PyAPI_FUNC(int) _PyInt_Init(void); 
+PyAPI_FUNC(int) _PyLong_Init(void); 
+PyAPI_FUNC(void) _PyFloat_Init(void); 
+PyAPI_FUNC(int) PyByteArray_Init(void); 
+PyAPI_FUNC(void) _PyRandom_Init(void); 
+ 
+/* Various internal finalizers */ 
+PyAPI_FUNC(void) _PyExc_Fini(void); 
+PyAPI_FUNC(void) _PyImport_Fini(void); 
+PyAPI_FUNC(void) PyMethod_Fini(void); 
+PyAPI_FUNC(void) PyFrame_Fini(void); 
+PyAPI_FUNC(void) PyCFunction_Fini(void); 
+PyAPI_FUNC(void) PyDict_Fini(void); 
+PyAPI_FUNC(void) PyTuple_Fini(void); 
+PyAPI_FUNC(void) PyList_Fini(void); 
+PyAPI_FUNC(void) PySet_Fini(void); 
+PyAPI_FUNC(void) PyString_Fini(void); 
+PyAPI_FUNC(void) PyInt_Fini(void); 
+PyAPI_FUNC(void) PyFloat_Fini(void); 
+PyAPI_FUNC(void) PyOS_FiniInterrupts(void); 
+PyAPI_FUNC(void) PyByteArray_Fini(void); 
 PyAPI_FUNC(void) _PyRandom_Fini(void);
-
-/* Stuff with no proper home (yet) */
-PyAPI_FUNC(char *) PyOS_Readline(FILE *, FILE *, char *);
-PyAPI_DATA(int) (*PyOS_InputHook)(void);
-PyAPI_DATA(char) *(*PyOS_ReadlineFunctionPointer)(FILE *, FILE *, char *);
-PyAPI_DATA(PyThreadState*) _PyOS_ReadlineTState;
-
-/* Stack size, in "pointers" (so we get extra safety margins
-   on 64-bit platforms).  On a 32-bit platform, this translates
+ 
+/* Stuff with no proper home (yet) */ 
+PyAPI_FUNC(char *) PyOS_Readline(FILE *, FILE *, char *); 
+PyAPI_DATA(int) (*PyOS_InputHook)(void); 
+PyAPI_DATA(char) *(*PyOS_ReadlineFunctionPointer)(FILE *, FILE *, char *); 
+PyAPI_DATA(PyThreadState*) _PyOS_ReadlineTState; 
+ 
+/* Stack size, in "pointers" (so we get extra safety margins 
+   on 64-bit platforms).  On a 32-bit platform, this translates 
    to an 8k margin. */
-#define PYOS_STACK_MARGIN 2048
-
-#if defined(WIN32) && !defined(MS_WIN64) && defined(_MSC_VER) && _MSC_VER >= 1300
-/* Enable stack checking under Microsoft C */
-#define USE_STACKCHECK
-#endif
-
-#ifdef USE_STACKCHECK
-/* Check that we aren't overflowing our stack */
-PyAPI_FUNC(int) PyOS_CheckStack(void);
-#endif
-
-/* Signals */
-typedef void (*PyOS_sighandler_t)(int);
-PyAPI_FUNC(PyOS_sighandler_t) PyOS_getsig(int);
-PyAPI_FUNC(PyOS_sighandler_t) PyOS_setsig(int, PyOS_sighandler_t);
-
-/* Random */
-PyAPI_FUNC(int) _PyOS_URandom (void *buffer, Py_ssize_t size);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_PYTHONRUN_H */
+#define PYOS_STACK_MARGIN 2048 
+ 
+#if defined(WIN32) && !defined(MS_WIN64) && defined(_MSC_VER) && _MSC_VER >= 1300 
+/* Enable stack checking under Microsoft C */ 
+#define USE_STACKCHECK 
+#endif 
+ 
+#ifdef USE_STACKCHECK 
+/* Check that we aren't overflowing our stack */ 
+PyAPI_FUNC(int) PyOS_CheckStack(void); 
+#endif 
+ 
+/* Signals */ 
+typedef void (*PyOS_sighandler_t)(int); 
+PyAPI_FUNC(PyOS_sighandler_t) PyOS_getsig(int); 
+PyAPI_FUNC(PyOS_sighandler_t) PyOS_setsig(int, PyOS_sighandler_t); 
+ 
+/* Random */ 
+PyAPI_FUNC(int) _PyOS_URandom (void *buffer, Py_ssize_t size); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_PYTHONRUN_H */ 
diff --git a/contrib/tools/python/src/Include/pythread.h b/contrib/tools/python/src/Include/pythread.h
index dfd61575ea..83139add21 100644
--- a/contrib/tools/python/src/Include/pythread.h
+++ b/contrib/tools/python/src/Include/pythread.h
@@ -1,41 +1,41 @@
-
-#ifndef Py_PYTHREAD_H
-#define Py_PYTHREAD_H
-
-typedef void *PyThread_type_lock;
-typedef void *PyThread_type_sema;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_FUNC(void) PyThread_init_thread(void);
-PyAPI_FUNC(long) PyThread_start_new_thread(void (*)(void *), void *);
-PyAPI_FUNC(void) PyThread_exit_thread(void);
-PyAPI_FUNC(long) PyThread_get_thread_ident(void);
-
-PyAPI_FUNC(PyThread_type_lock) PyThread_allocate_lock(void);
-PyAPI_FUNC(void) PyThread_free_lock(PyThread_type_lock);
-PyAPI_FUNC(int) PyThread_acquire_lock(PyThread_type_lock, int);
-#define WAIT_LOCK	1
-#define NOWAIT_LOCK	0
-PyAPI_FUNC(void) PyThread_release_lock(PyThread_type_lock);
-
-PyAPI_FUNC(size_t) PyThread_get_stacksize(void);
-PyAPI_FUNC(int) PyThread_set_stacksize(size_t);
-
-/* Thread Local Storage (TLS) API */
-PyAPI_FUNC(int) PyThread_create_key(void);
-PyAPI_FUNC(void) PyThread_delete_key(int);
-PyAPI_FUNC(int) PyThread_set_key_value(int, void *);
-PyAPI_FUNC(void *) PyThread_get_key_value(int);
-PyAPI_FUNC(void) PyThread_delete_key_value(int key);
-
-/* Cleanup after a fork */
-PyAPI_FUNC(void) PyThread_ReInitTLS(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !Py_PYTHREAD_H */
+ 
+#ifndef Py_PYTHREAD_H 
+#define Py_PYTHREAD_H 
+ 
+typedef void *PyThread_type_lock; 
+typedef void *PyThread_type_sema; 
+ 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+PyAPI_FUNC(void) PyThread_init_thread(void); 
+PyAPI_FUNC(long) PyThread_start_new_thread(void (*)(void *), void *); 
+PyAPI_FUNC(void) PyThread_exit_thread(void); 
+PyAPI_FUNC(long) PyThread_get_thread_ident(void); 
+ 
+PyAPI_FUNC(PyThread_type_lock) PyThread_allocate_lock(void); 
+PyAPI_FUNC(void) PyThread_free_lock(PyThread_type_lock); 
+PyAPI_FUNC(int) PyThread_acquire_lock(PyThread_type_lock, int); 
+#define WAIT_LOCK	1 
+#define NOWAIT_LOCK	0 
+PyAPI_FUNC(void) PyThread_release_lock(PyThread_type_lock); 
+ 
+PyAPI_FUNC(size_t) PyThread_get_stacksize(void); 
+PyAPI_FUNC(int) PyThread_set_stacksize(size_t); 
+ 
+/* Thread Local Storage (TLS) API */ 
+PyAPI_FUNC(int) PyThread_create_key(void); 
+PyAPI_FUNC(void) PyThread_delete_key(int); 
+PyAPI_FUNC(int) PyThread_set_key_value(int, void *); 
+PyAPI_FUNC(void *) PyThread_get_key_value(int); 
+PyAPI_FUNC(void) PyThread_delete_key_value(int key); 
+ 
+/* Cleanup after a fork */ 
+PyAPI_FUNC(void) PyThread_ReInitTLS(void); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+ 
+#endif /* !Py_PYTHREAD_H */ 
diff --git a/contrib/tools/python/src/Include/rangeobject.h b/contrib/tools/python/src/Include/rangeobject.h
index 36c9cee5a8..432432b660 100644
--- a/contrib/tools/python/src/Include/rangeobject.h
+++ b/contrib/tools/python/src/Include/rangeobject.h
@@ -1,28 +1,28 @@
-
-/* Range object interface */
-
-#ifndef Py_RANGEOBJECT_H
-#define Py_RANGEOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* This is about the type 'xrange', not the built-in function range(), which
-   returns regular lists. */
-
-/*
-A range object represents an integer range.  This is an immutable object;
-a range cannot change its value after creation.
-
-Range objects behave like the corresponding tuple objects except that
-they are represented by a start, stop, and step datamembers.
-*/
-
-PyAPI_DATA(PyTypeObject) PyRange_Type;
-
-#define PyRange_Check(op) (Py_TYPE(op) == &PyRange_Type)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_RANGEOBJECT_H */
+ 
+/* Range object interface */ 
+ 
+#ifndef Py_RANGEOBJECT_H 
+#define Py_RANGEOBJECT_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+/* This is about the type 'xrange', not the built-in function range(), which 
+   returns regular lists. */ 
+ 
+/* 
+A range object represents an integer range.  This is an immutable object; 
+a range cannot change its value after creation. 
+ 
+Range objects behave like the corresponding tuple objects except that 
+they are represented by a start, stop, and step datamembers. 
+*/ 
+ 
+PyAPI_DATA(PyTypeObject) PyRange_Type; 
+ 
+#define PyRange_Check(op) (Py_TYPE(op) == &PyRange_Type) 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_RANGEOBJECT_H */ 
diff --git a/contrib/tools/python/src/Include/setobject.h b/contrib/tools/python/src/Include/setobject.h
index 52b07d52df..0239253abe 100644
--- a/contrib/tools/python/src/Include/setobject.h
+++ b/contrib/tools/python/src/Include/setobject.h
@@ -1,99 +1,99 @@
-/* Set object interface */
-
-#ifndef Py_SETOBJECT_H
-#define Py_SETOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/*
-There are three kinds of slots in the table:
-
-1. Unused:  key == NULL
-2. Active:  key != NULL and key != dummy
-3. Dummy:   key == dummy
-
-Note: .pop() abuses the hash field of an Unused or Dummy slot to
-hold a search finger.  The hash field of Unused or Dummy slots has
-no meaning otherwise.
-*/
-
-#define PySet_MINSIZE 8
-
-typedef struct {
-    long hash;      /* cached hash code for the entry key */
-    PyObject *key;
-} setentry;
-
-
-/*
-This data structure is shared by set and frozenset objects.
-*/
-
-typedef struct _setobject PySetObject;
-struct _setobject {
-    PyObject_HEAD
-
-    Py_ssize_t fill;  /* # Active + # Dummy */
-    Py_ssize_t used;  /* # Active */
-
-    /* The table contains mask + 1 slots, and that's a power of 2.
-     * We store the mask instead of the size because the mask is more
-     * frequently needed.
-     */
-    Py_ssize_t mask;
-
-    /* table points to smalltable for small tables, else to
-     * additional malloc'ed memory.  table is never NULL!  This rule
-     * saves repeated runtime null-tests.
-     */
-    setentry *table;
-    setentry *(*lookup)(PySetObject *so, PyObject *key, long hash);
-    setentry smalltable[PySet_MINSIZE];
-
-    long hash;                  /* only used by frozenset objects */
-    PyObject *weakreflist;      /* List of weak references */
-};
-
-PyAPI_DATA(PyTypeObject) PySet_Type;
-PyAPI_DATA(PyTypeObject) PyFrozenSet_Type;
-
-/* Invariants for frozensets:
- *     data is immutable.
- *     hash is the hash of the frozenset or -1 if not computed yet.
- * Invariants for sets:
- *     hash is -1
- */
-
-#define PyFrozenSet_CheckExact(ob) (Py_TYPE(ob) == &PyFrozenSet_Type)
-#define PyAnySet_CheckExact(ob) \
-    (Py_TYPE(ob) == &PySet_Type || Py_TYPE(ob) == &PyFrozenSet_Type)
-#define PyAnySet_Check(ob) \
-    (Py_TYPE(ob) == &PySet_Type || Py_TYPE(ob) == &PyFrozenSet_Type || \
-      PyType_IsSubtype(Py_TYPE(ob), &PySet_Type) || \
-      PyType_IsSubtype(Py_TYPE(ob), &PyFrozenSet_Type))
-#define PySet_Check(ob) \
-    (Py_TYPE(ob) == &PySet_Type || \
-    PyType_IsSubtype(Py_TYPE(ob), &PySet_Type))
-#define   PyFrozenSet_Check(ob) \
-    (Py_TYPE(ob) == &PyFrozenSet_Type || \
-      PyType_IsSubtype(Py_TYPE(ob), &PyFrozenSet_Type))
-
-PyAPI_FUNC(PyObject *) PySet_New(PyObject *);
-PyAPI_FUNC(PyObject *) PyFrozenSet_New(PyObject *);
-PyAPI_FUNC(Py_ssize_t) PySet_Size(PyObject *anyset);
-#define PySet_GET_SIZE(so) (((PySetObject *)(so))->used)
-PyAPI_FUNC(int) PySet_Clear(PyObject *set);
-PyAPI_FUNC(int) PySet_Contains(PyObject *anyset, PyObject *key);
-PyAPI_FUNC(int) PySet_Discard(PyObject *set, PyObject *key);
-PyAPI_FUNC(int) PySet_Add(PyObject *set, PyObject *key);
-PyAPI_FUNC(int) _PySet_Next(PyObject *set, Py_ssize_t *pos, PyObject **key);
-PyAPI_FUNC(int) _PySet_NextEntry(PyObject *set, Py_ssize_t *pos, PyObject **key, long *hash);
-PyAPI_FUNC(PyObject *) PySet_Pop(PyObject *set);
-PyAPI_FUNC(int) _PySet_Update(PyObject *set, PyObject *iterable);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_SETOBJECT_H */
+/* Set object interface */ 
+ 
+#ifndef Py_SETOBJECT_H 
+#define Py_SETOBJECT_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+ 
+/* 
+There are three kinds of slots in the table: 
+ 
+1. Unused:  key == NULL 
+2. Active:  key != NULL and key != dummy 
+3. Dummy:   key == dummy 
+ 
+Note: .pop() abuses the hash field of an Unused or Dummy slot to 
+hold a search finger.  The hash field of Unused or Dummy slots has 
+no meaning otherwise. 
+*/ 
+ 
+#define PySet_MINSIZE 8 
+ 
+typedef struct { 
+    long hash;      /* cached hash code for the entry key */ 
+    PyObject *key; 
+} setentry; 
+ 
+ 
+/* 
+This data structure is shared by set and frozenset objects. 
+*/ 
+ 
+typedef struct _setobject PySetObject; 
+struct _setobject { 
+    PyObject_HEAD 
+ 
+    Py_ssize_t fill;  /* # Active + # Dummy */ 
+    Py_ssize_t used;  /* # Active */ 
+ 
+    /* The table contains mask + 1 slots, and that's a power of 2. 
+     * We store the mask instead of the size because the mask is more 
+     * frequently needed. 
+     */ 
+    Py_ssize_t mask; 
+ 
+    /* table points to smalltable for small tables, else to 
+     * additional malloc'ed memory.  table is never NULL!  This rule 
+     * saves repeated runtime null-tests. 
+     */ 
+    setentry *table; 
+    setentry *(*lookup)(PySetObject *so, PyObject *key, long hash); 
+    setentry smalltable[PySet_MINSIZE]; 
+ 
+    long hash;                  /* only used by frozenset objects */ 
+    PyObject *weakreflist;      /* List of weak references */ 
+}; 
+ 
+PyAPI_DATA(PyTypeObject) PySet_Type; 
+PyAPI_DATA(PyTypeObject) PyFrozenSet_Type; 
+ 
+/* Invariants for frozensets: 
+ *     data is immutable. 
+ *     hash is the hash of the frozenset or -1 if not computed yet. 
+ * Invariants for sets: 
+ *     hash is -1 
+ */ 
+ 
+#define PyFrozenSet_CheckExact(ob) (Py_TYPE(ob) == &PyFrozenSet_Type) 
+#define PyAnySet_CheckExact(ob) \ 
+    (Py_TYPE(ob) == &PySet_Type || Py_TYPE(ob) == &PyFrozenSet_Type) 
+#define PyAnySet_Check(ob) \ 
+    (Py_TYPE(ob) == &PySet_Type || Py_TYPE(ob) == &PyFrozenSet_Type || \ 
+      PyType_IsSubtype(Py_TYPE(ob), &PySet_Type) || \ 
+      PyType_IsSubtype(Py_TYPE(ob), &PyFrozenSet_Type)) 
+#define PySet_Check(ob) \ 
+    (Py_TYPE(ob) == &PySet_Type || \ 
+    PyType_IsSubtype(Py_TYPE(ob), &PySet_Type)) 
+#define   PyFrozenSet_Check(ob) \ 
+    (Py_TYPE(ob) == &PyFrozenSet_Type || \ 
+      PyType_IsSubtype(Py_TYPE(ob), &PyFrozenSet_Type)) 
+ 
+PyAPI_FUNC(PyObject *) PySet_New(PyObject *); 
+PyAPI_FUNC(PyObject *) PyFrozenSet_New(PyObject *); 
+PyAPI_FUNC(Py_ssize_t) PySet_Size(PyObject *anyset); 
+#define PySet_GET_SIZE(so) (((PySetObject *)(so))->used) 
+PyAPI_FUNC(int) PySet_Clear(PyObject *set); 
+PyAPI_FUNC(int) PySet_Contains(PyObject *anyset, PyObject *key); 
+PyAPI_FUNC(int) PySet_Discard(PyObject *set, PyObject *key); 
+PyAPI_FUNC(int) PySet_Add(PyObject *set, PyObject *key); 
+PyAPI_FUNC(int) _PySet_Next(PyObject *set, Py_ssize_t *pos, PyObject **key); 
+PyAPI_FUNC(int) _PySet_NextEntry(PyObject *set, Py_ssize_t *pos, PyObject **key, long *hash); 
+PyAPI_FUNC(PyObject *) PySet_Pop(PyObject *set); 
+PyAPI_FUNC(int) _PySet_Update(PyObject *set, PyObject *iterable); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_SETOBJECT_H */ 
diff --git a/contrib/tools/python/src/Include/sliceobject.h b/contrib/tools/python/src/Include/sliceobject.h
index a10cc05f09..9dab3fd55f 100644
--- a/contrib/tools/python/src/Include/sliceobject.h
+++ b/contrib/tools/python/src/Include/sliceobject.h
@@ -1,50 +1,50 @@
-#ifndef Py_SLICEOBJECT_H
-#define Py_SLICEOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* The unique ellipsis object "..." */
-
-PyAPI_DATA(PyObject) _Py_EllipsisObject; /* Don't use this directly */
-
-#define Py_Ellipsis (&_Py_EllipsisObject)
-
-/* Slice object interface */
-
-/*
-
-A slice object containing start, stop, and step data members (the
-names are from range).  After much talk with Guido, it was decided to
-let these be any arbitrary python type.  Py_None stands for omitted values.
-*/
-
-typedef struct {
-    PyObject_HEAD
-    PyObject *start, *stop, *step;	/* not NULL */
-} PySliceObject;
-
-PyAPI_DATA(PyTypeObject) PySlice_Type;
-PyAPI_DATA(PyTypeObject) PyEllipsis_Type;
-
-#define PySlice_Check(op) (Py_TYPE(op) == &PySlice_Type)
-
-PyAPI_FUNC(PyObject *) PySlice_New(PyObject* start, PyObject* stop,
-                                  PyObject* step);
-PyAPI_FUNC(PyObject *) _PySlice_FromIndices(Py_ssize_t start, Py_ssize_t stop);
-PyAPI_FUNC(int) PySlice_GetIndices(PySliceObject *r, Py_ssize_t length,
-                                  Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step);
-PyAPI_FUNC(int) PySlice_GetIndicesEx(PySliceObject *r, Py_ssize_t length,
-				    Py_ssize_t *start, Py_ssize_t *stop, 
-				    Py_ssize_t *step, Py_ssize_t *slicelength);
-
+#ifndef Py_SLICEOBJECT_H 
+#define Py_SLICEOBJECT_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+/* The unique ellipsis object "..." */ 
+ 
+PyAPI_DATA(PyObject) _Py_EllipsisObject; /* Don't use this directly */ 
+ 
+#define Py_Ellipsis (&_Py_EllipsisObject) 
+ 
+/* Slice object interface */ 
+ 
+/* 
+ 
+A slice object containing start, stop, and step data members (the 
+names are from range).  After much talk with Guido, it was decided to 
+let these be any arbitrary python type.  Py_None stands for omitted values. 
+*/ 
+ 
+typedef struct { 
+    PyObject_HEAD 
+    PyObject *start, *stop, *step;	/* not NULL */ 
+} PySliceObject; 
+ 
+PyAPI_DATA(PyTypeObject) PySlice_Type; 
+PyAPI_DATA(PyTypeObject) PyEllipsis_Type; 
+ 
+#define PySlice_Check(op) (Py_TYPE(op) == &PySlice_Type) 
+ 
+PyAPI_FUNC(PyObject *) PySlice_New(PyObject* start, PyObject* stop, 
+                                  PyObject* step); 
+PyAPI_FUNC(PyObject *) _PySlice_FromIndices(Py_ssize_t start, Py_ssize_t stop); 
+PyAPI_FUNC(int) PySlice_GetIndices(PySliceObject *r, Py_ssize_t length, 
+                                  Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step); 
+PyAPI_FUNC(int) PySlice_GetIndicesEx(PySliceObject *r, Py_ssize_t length, 
+				    Py_ssize_t *start, Py_ssize_t *stop,  
+				    Py_ssize_t *step, Py_ssize_t *slicelength); 
+ 
 PyAPI_FUNC(int) _PySlice_Unpack(PyObject *slice,
                                 Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step);
 PyAPI_FUNC(Py_ssize_t) _PySlice_AdjustIndices(Py_ssize_t length,
                                               Py_ssize_t *start, Py_ssize_t *stop,
                                               Py_ssize_t step);
 
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_SLICEOBJECT_H */
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_SLICEOBJECT_H */ 
diff --git a/contrib/tools/python/src/Include/stringobject.h b/contrib/tools/python/src/Include/stringobject.h
index 12cc093c62..d2be1f1736 100644
--- a/contrib/tools/python/src/Include/stringobject.h
+++ b/contrib/tools/python/src/Include/stringobject.h
@@ -1,210 +1,210 @@
-
-/* String (str/bytes) object interface */
-
-#ifndef Py_STRINGOBJECT_H
-#define Py_STRINGOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdarg.h>
-
-/*
-Type PyStringObject represents a character string.  An extra zero byte is
-reserved at the end to ensure it is zero-terminated, but a size is
-present so strings with null bytes in them can be represented.  This
-is an immutable object type.
-
-There are functions to create new string objects, to test
-an object for string-ness, and to get the
-string value.  The latter function returns a null pointer
-if the object is not of the proper type.
-There is a variant that takes an explicit size as well as a
-variant that assumes a zero-terminated string.  Note that none of the
-functions should be applied to nil objects.
-*/
-
-/* Caching the hash (ob_shash) saves recalculation of a string's hash value.
-   Interning strings (ob_sstate) tries to ensure that only one string
-   object with a given value exists, so equality tests can be one pointer
-   comparison.  This is generally restricted to strings that "look like"
-   Python identifiers, although the intern() builtin can be used to force
-   interning of any string.
-   Together, these sped the interpreter by up to 20%. */
-
-typedef struct {
-    PyObject_VAR_HEAD
-    long ob_shash;
-    int ob_sstate;
-    char ob_sval[1];
-
-    /* Invariants:
-     *     ob_sval contains space for 'ob_size+1' elements.
-     *     ob_sval[ob_size] == 0.
-     *     ob_shash is the hash of the string or -1 if not computed yet.
-     *     ob_sstate != 0 iff the string object is in stringobject.c's
-     *       'interned' dictionary; in this case the two references
-     *       from 'interned' to this object are *not counted* in ob_refcnt.
-     */
-} PyStringObject;
-
-#define SSTATE_NOT_INTERNED 0
-#define SSTATE_INTERNED_MORTAL 1
-#define SSTATE_INTERNED_IMMORTAL 2
-
-PyAPI_DATA(PyTypeObject) PyBaseString_Type;
-PyAPI_DATA(PyTypeObject) PyString_Type;
-
-#define PyString_Check(op) \
-                 PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_STRING_SUBCLASS)
-#define PyString_CheckExact(op) (Py_TYPE(op) == &PyString_Type)
-
-PyAPI_FUNC(PyObject *) PyString_FromStringAndSize(const char *, Py_ssize_t);
-PyAPI_FUNC(PyObject *) PyString_FromString(const char *);
-PyAPI_FUNC(PyObject *) PyString_FromFormatV(const char*, va_list)
-				Py_GCC_ATTRIBUTE((format(printf, 1, 0)));
-PyAPI_FUNC(PyObject *) PyString_FromFormat(const char*, ...)
-				Py_GCC_ATTRIBUTE((format(printf, 1, 2)));
-PyAPI_FUNC(Py_ssize_t) PyString_Size(PyObject *);
-PyAPI_FUNC(char *) PyString_AsString(PyObject *);
-PyAPI_FUNC(PyObject *) PyString_Repr(PyObject *, int);
-PyAPI_FUNC(void) PyString_Concat(PyObject **, PyObject *);
-PyAPI_FUNC(void) PyString_ConcatAndDel(PyObject **, PyObject *);
-PyAPI_FUNC(int) _PyString_Resize(PyObject **, Py_ssize_t);
-PyAPI_FUNC(int) _PyString_Eq(PyObject *, PyObject*);
-PyAPI_FUNC(PyObject *) PyString_Format(PyObject *, PyObject *);
-PyAPI_FUNC(PyObject *) _PyString_FormatLong(PyObject*, int, int,
-						  int, char**, int*);
-PyAPI_FUNC(PyObject *) PyString_DecodeEscape(const char *, Py_ssize_t, 
-						   const char *, Py_ssize_t,
-						   const char *);
-
-PyAPI_FUNC(void) PyString_InternInPlace(PyObject **);
-PyAPI_FUNC(void) PyString_InternImmortal(PyObject **);
-PyAPI_FUNC(PyObject *) PyString_InternFromString(const char *);
-PyAPI_FUNC(void) _Py_ReleaseInternedStrings(void);
-
-/* Use only if you know it's a string */
-#define PyString_CHECK_INTERNED(op) (((PyStringObject *)(op))->ob_sstate)
-
-/* Macro, trading safety for speed */
-#define PyString_AS_STRING(op) (((PyStringObject *)(op))->ob_sval)
-#define PyString_GET_SIZE(op)  Py_SIZE(op)
-
-/* _PyString_Join(sep, x) is like sep.join(x).  sep must be PyStringObject*,
-   x must be an iterable object. */
-PyAPI_FUNC(PyObject *) _PyString_Join(PyObject *sep, PyObject *x);
-
-/* --- Generic Codecs ----------------------------------------------------- */
-
-/* Create an object by decoding the encoded string s of the
-   given size. */
-
-PyAPI_FUNC(PyObject*) PyString_Decode(
-    const char *s,              /* encoded string */
-    Py_ssize_t size,            /* size of buffer */
-    const char *encoding,       /* encoding */
-    const char *errors          /* error handling */
-    );
-
-/* Encodes a char buffer of the given size and returns a 
-   Python object. */
-
-PyAPI_FUNC(PyObject*) PyString_Encode(
-    const char *s,              /* string char buffer */
-    Py_ssize_t size,            /* number of chars to encode */
-    const char *encoding,       /* encoding */
-    const char *errors          /* error handling */
-    );
-
-/* Encodes a string object and returns the result as Python 
-   object. */
-
-PyAPI_FUNC(PyObject*) PyString_AsEncodedObject(
-    PyObject *str,	 	/* string object */
-    const char *encoding,	/* encoding */
-    const char *errors		/* error handling */
-    );
-
-/* Encodes a string object and returns the result as Python string
-   object.   
-   
+ 
+/* String (str/bytes) object interface */ 
+ 
+#ifndef Py_STRINGOBJECT_H 
+#define Py_STRINGOBJECT_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+#include <stdarg.h> 
+ 
+/* 
+Type PyStringObject represents a character string.  An extra zero byte is 
+reserved at the end to ensure it is zero-terminated, but a size is 
+present so strings with null bytes in them can be represented.  This 
+is an immutable object type. 
+ 
+There are functions to create new string objects, to test 
+an object for string-ness, and to get the 
+string value.  The latter function returns a null pointer 
+if the object is not of the proper type. 
+There is a variant that takes an explicit size as well as a 
+variant that assumes a zero-terminated string.  Note that none of the 
+functions should be applied to nil objects. 
+*/ 
+ 
+/* Caching the hash (ob_shash) saves recalculation of a string's hash value. 
+   Interning strings (ob_sstate) tries to ensure that only one string 
+   object with a given value exists, so equality tests can be one pointer 
+   comparison.  This is generally restricted to strings that "look like" 
+   Python identifiers, although the intern() builtin can be used to force 
+   interning of any string. 
+   Together, these sped the interpreter by up to 20%. */ 
+ 
+typedef struct { 
+    PyObject_VAR_HEAD 
+    long ob_shash; 
+    int ob_sstate; 
+    char ob_sval[1]; 
+ 
+    /* Invariants: 
+     *     ob_sval contains space for 'ob_size+1' elements. 
+     *     ob_sval[ob_size] == 0. 
+     *     ob_shash is the hash of the string or -1 if not computed yet. 
+     *     ob_sstate != 0 iff the string object is in stringobject.c's 
+     *       'interned' dictionary; in this case the two references 
+     *       from 'interned' to this object are *not counted* in ob_refcnt. 
+     */ 
+} PyStringObject; 
+ 
+#define SSTATE_NOT_INTERNED 0 
+#define SSTATE_INTERNED_MORTAL 1 
+#define SSTATE_INTERNED_IMMORTAL 2 
+ 
+PyAPI_DATA(PyTypeObject) PyBaseString_Type; 
+PyAPI_DATA(PyTypeObject) PyString_Type; 
+ 
+#define PyString_Check(op) \ 
+                 PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_STRING_SUBCLASS) 
+#define PyString_CheckExact(op) (Py_TYPE(op) == &PyString_Type) 
+ 
+PyAPI_FUNC(PyObject *) PyString_FromStringAndSize(const char *, Py_ssize_t); 
+PyAPI_FUNC(PyObject *) PyString_FromString(const char *); 
+PyAPI_FUNC(PyObject *) PyString_FromFormatV(const char*, va_list) 
+				Py_GCC_ATTRIBUTE((format(printf, 1, 0))); 
+PyAPI_FUNC(PyObject *) PyString_FromFormat(const char*, ...) 
+				Py_GCC_ATTRIBUTE((format(printf, 1, 2))); 
+PyAPI_FUNC(Py_ssize_t) PyString_Size(PyObject *); 
+PyAPI_FUNC(char *) PyString_AsString(PyObject *); 
+PyAPI_FUNC(PyObject *) PyString_Repr(PyObject *, int); 
+PyAPI_FUNC(void) PyString_Concat(PyObject **, PyObject *); 
+PyAPI_FUNC(void) PyString_ConcatAndDel(PyObject **, PyObject *); 
+PyAPI_FUNC(int) _PyString_Resize(PyObject **, Py_ssize_t); 
+PyAPI_FUNC(int) _PyString_Eq(PyObject *, PyObject*); 
+PyAPI_FUNC(PyObject *) PyString_Format(PyObject *, PyObject *); 
+PyAPI_FUNC(PyObject *) _PyString_FormatLong(PyObject*, int, int, 
+						  int, char**, int*); 
+PyAPI_FUNC(PyObject *) PyString_DecodeEscape(const char *, Py_ssize_t,  
+						   const char *, Py_ssize_t, 
+						   const char *); 
+ 
+PyAPI_FUNC(void) PyString_InternInPlace(PyObject **); 
+PyAPI_FUNC(void) PyString_InternImmortal(PyObject **); 
+PyAPI_FUNC(PyObject *) PyString_InternFromString(const char *); 
+PyAPI_FUNC(void) _Py_ReleaseInternedStrings(void); 
+ 
+/* Use only if you know it's a string */ 
+#define PyString_CHECK_INTERNED(op) (((PyStringObject *)(op))->ob_sstate) 
+ 
+/* Macro, trading safety for speed */ 
+#define PyString_AS_STRING(op) (((PyStringObject *)(op))->ob_sval) 
+#define PyString_GET_SIZE(op)  Py_SIZE(op) 
+ 
+/* _PyString_Join(sep, x) is like sep.join(x).  sep must be PyStringObject*, 
+   x must be an iterable object. */ 
+PyAPI_FUNC(PyObject *) _PyString_Join(PyObject *sep, PyObject *x); 
+ 
+/* --- Generic Codecs ----------------------------------------------------- */ 
+ 
+/* Create an object by decoding the encoded string s of the 
+   given size. */ 
+ 
+PyAPI_FUNC(PyObject*) PyString_Decode( 
+    const char *s,              /* encoded string */ 
+    Py_ssize_t size,            /* size of buffer */ 
+    const char *encoding,       /* encoding */ 
+    const char *errors          /* error handling */ 
+    ); 
+ 
+/* Encodes a char buffer of the given size and returns a  
+   Python object. */ 
+ 
+PyAPI_FUNC(PyObject*) PyString_Encode( 
+    const char *s,              /* string char buffer */ 
+    Py_ssize_t size,            /* number of chars to encode */ 
+    const char *encoding,       /* encoding */ 
+    const char *errors          /* error handling */ 
+    ); 
+ 
+/* Encodes a string object and returns the result as Python  
+   object. */ 
+ 
+PyAPI_FUNC(PyObject*) PyString_AsEncodedObject( 
+    PyObject *str,	 	/* string object */ 
+    const char *encoding,	/* encoding */ 
+    const char *errors		/* error handling */ 
+    ); 
+ 
+/* Encodes a string object and returns the result as Python string 
+   object.    
+    
    If the codec returns a Unicode object, the object is converted
-   back to a string using the default encoding.
-
-   DEPRECATED - use PyString_AsEncodedObject() instead. */
-
-PyAPI_FUNC(PyObject*) PyString_AsEncodedString(
-    PyObject *str,	 	/* string object */
-    const char *encoding,	/* encoding */
-    const char *errors		/* error handling */
-    );
-
-/* Decodes a string object and returns the result as Python 
-   object. */
-
-PyAPI_FUNC(PyObject*) PyString_AsDecodedObject(
-    PyObject *str,	 	/* string object */
-    const char *encoding,	/* encoding */
-    const char *errors		/* error handling */
-    );
-
-/* Decodes a string object and returns the result as Python string
-   object.  
-   
+   back to a string using the default encoding. 
+ 
+   DEPRECATED - use PyString_AsEncodedObject() instead. */ 
+ 
+PyAPI_FUNC(PyObject*) PyString_AsEncodedString( 
+    PyObject *str,	 	/* string object */ 
+    const char *encoding,	/* encoding */ 
+    const char *errors		/* error handling */ 
+    ); 
+ 
+/* Decodes a string object and returns the result as Python  
+   object. */ 
+ 
+PyAPI_FUNC(PyObject*) PyString_AsDecodedObject( 
+    PyObject *str,	 	/* string object */ 
+    const char *encoding,	/* encoding */ 
+    const char *errors		/* error handling */ 
+    ); 
+ 
+/* Decodes a string object and returns the result as Python string 
+   object.   
+    
    If the codec returns a Unicode object, the object is converted
-   back to a string using the default encoding.
-
-   DEPRECATED - use PyString_AsDecodedObject() instead. */
-
-PyAPI_FUNC(PyObject*) PyString_AsDecodedString(
-    PyObject *str,	 	/* string object */
-    const char *encoding,	/* encoding */
-    const char *errors		/* error handling */
-    );
-
-/* Provides access to the internal data buffer and size of a string
+   back to a string using the default encoding. 
+ 
+   DEPRECATED - use PyString_AsDecodedObject() instead. */ 
+ 
+PyAPI_FUNC(PyObject*) PyString_AsDecodedString( 
+    PyObject *str,	 	/* string object */ 
+    const char *encoding,	/* encoding */ 
+    const char *errors		/* error handling */ 
+    ); 
+ 
+/* Provides access to the internal data buffer and size of a string 
    object or the default encoded version of a Unicode object. Passing
-   NULL as *len parameter will force the string buffer to be
-   0-terminated (passing a string with embedded NULL characters will
-   cause an exception).  */
-
-PyAPI_FUNC(int) PyString_AsStringAndSize(
-    register PyObject *obj,	/* string or Unicode object */
-    register char **s,		/* pointer to buffer variable */
-    register Py_ssize_t *len	/* pointer to length variable or NULL
-				   (only possible for 0-terminated
-				   strings) */
-    );
-
-
-/* Using the current locale, insert the thousands grouping
-   into the string pointed to by buffer.  For the argument descriptions,
-   see Objects/stringlib/localeutil.h */
-PyAPI_FUNC(Py_ssize_t) _PyString_InsertThousandsGroupingLocale(char *buffer,
-                                  Py_ssize_t n_buffer,
-                                  char *digits,
-                                  Py_ssize_t n_digits,
-                                  Py_ssize_t min_width);
-
-/* Using explicit passed-in values, insert the thousands grouping
-   into the string pointed to by buffer.  For the argument descriptions,
-   see Objects/stringlib/localeutil.h */
-PyAPI_FUNC(Py_ssize_t) _PyString_InsertThousandsGrouping(char *buffer,
-                                  Py_ssize_t n_buffer,
-                                  char *digits,
-                                  Py_ssize_t n_digits,
-                                  Py_ssize_t min_width,
-                                  const char *grouping,
-                                  const char *thousands_sep);
-
-/* Format the object based on the format_spec, as defined in PEP 3101
-   (Advanced String Formatting). */
-PyAPI_FUNC(PyObject *) _PyBytes_FormatAdvanced(PyObject *obj,
-					       char *format_spec,
-					       Py_ssize_t format_spec_len);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_STRINGOBJECT_H */
+   NULL as *len parameter will force the string buffer to be 
+   0-terminated (passing a string with embedded NULL characters will 
+   cause an exception).  */ 
+ 
+PyAPI_FUNC(int) PyString_AsStringAndSize( 
+    register PyObject *obj,	/* string or Unicode object */ 
+    register char **s,		/* pointer to buffer variable */ 
+    register Py_ssize_t *len	/* pointer to length variable or NULL 
+				   (only possible for 0-terminated 
+				   strings) */ 
+    ); 
+ 
+ 
+/* Using the current locale, insert the thousands grouping 
+   into the string pointed to by buffer.  For the argument descriptions, 
+   see Objects/stringlib/localeutil.h */ 
+PyAPI_FUNC(Py_ssize_t) _PyString_InsertThousandsGroupingLocale(char *buffer, 
+                                  Py_ssize_t n_buffer, 
+                                  char *digits, 
+                                  Py_ssize_t n_digits, 
+                                  Py_ssize_t min_width); 
+ 
+/* Using explicit passed-in values, insert the thousands grouping 
+   into the string pointed to by buffer.  For the argument descriptions, 
+   see Objects/stringlib/localeutil.h */ 
+PyAPI_FUNC(Py_ssize_t) _PyString_InsertThousandsGrouping(char *buffer, 
+                                  Py_ssize_t n_buffer, 
+                                  char *digits, 
+                                  Py_ssize_t n_digits, 
+                                  Py_ssize_t min_width, 
+                                  const char *grouping, 
+                                  const char *thousands_sep); 
+ 
+/* Format the object based on the format_spec, as defined in PEP 3101 
+   (Advanced String Formatting). */ 
+PyAPI_FUNC(PyObject *) _PyBytes_FormatAdvanced(PyObject *obj, 
+					       char *format_spec, 
+					       Py_ssize_t format_spec_len); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_STRINGOBJECT_H */ 
diff --git a/contrib/tools/python/src/Include/structmember.h b/contrib/tools/python/src/Include/structmember.h
index fe5b44ea34..dfa5073aea 100644
--- a/contrib/tools/python/src/Include/structmember.h
+++ b/contrib/tools/python/src/Include/structmember.h
@@ -1,99 +1,99 @@
-#ifndef Py_STRUCTMEMBER_H
-#define Py_STRUCTMEMBER_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Interface to map C struct members to Python object attributes */
-
-#include <stddef.h> /* For offsetof */
-
-/* The offsetof() macro calculates the offset of a structure member
-   in its structure.  Unfortunately this cannot be written down
-   portably, hence it is provided by a Standard C header file.
-   For pre-Standard C compilers, here is a version that usually works
-   (but watch out!): */
-
-#ifndef offsetof
-#define offsetof(type, member) ( (int) & ((type*)0) -> member )
-#endif
-
-/* An array of memberlist structures defines the name, type and offset
-   of selected members of a C structure.  These can be read by
-   PyMember_Get() and set by PyMember_Set() (except if their READONLY flag
-   is set).  The array must be terminated with an entry whose name
-   pointer is NULL. */
-
-struct memberlist {
-    /* Obsolete version, for binary backwards compatibility */
-    char *name;
-    int type;
-    int offset;
-    int flags;
-};
-
-typedef struct PyMemberDef {
-    /* Current version, use this */
-    char *name;
-    int type;
-    Py_ssize_t offset;
-    int flags;
-    char *doc;
-} PyMemberDef;
-
-/* Types */
-#define T_SHORT         0
-#define T_INT           1
-#define T_LONG          2
-#define T_FLOAT         3
-#define T_DOUBLE        4
-#define T_STRING        5
-#define T_OBJECT        6
-/* XXX the ordering here is weird for binary compatibility */
-#define T_CHAR          7       /* 1-character string */
-#define T_BYTE          8       /* 8-bit signed int */
-/* unsigned variants: */
-#define T_UBYTE         9
-#define T_USHORT        10
-#define T_UINT          11
-#define T_ULONG         12
-
-/* Added by Jack: strings contained in the structure */
-#define T_STRING_INPLACE        13
-
-/* Added by Lillo: bools contained in the structure (assumed char) */
-#define T_BOOL          14
-
-#define T_OBJECT_EX     16      /* Like T_OBJECT, but raises AttributeError
-                   when the value is NULL, instead of
-                   converting to None. */
-#ifdef HAVE_LONG_LONG
-#define T_LONGLONG      17
-#define T_ULONGLONG      18
-#endif /* HAVE_LONG_LONG */
-
-#define T_PYSSIZET       19 /* Py_ssize_t */
-
-
-/* Flags */
-#define READONLY        1
-#define RO              READONLY                /* Shorthand */
-#define READ_RESTRICTED 2
-#define PY_WRITE_RESTRICTED 4
-#define RESTRICTED      (READ_RESTRICTED | PY_WRITE_RESTRICTED)
-
-
-/* Obsolete API, for binary backwards compatibility */
-PyAPI_FUNC(PyObject *) PyMember_Get(const char *, struct memberlist *, const char *);
-PyAPI_FUNC(int) PyMember_Set(char *, struct memberlist *, const char *, PyObject *);
-
-/* Current API, use this */
-PyAPI_FUNC(PyObject *) PyMember_GetOne(const char *, struct PyMemberDef *);
-PyAPI_FUNC(int) PyMember_SetOne(char *, struct PyMemberDef *, PyObject *);
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_STRUCTMEMBER_H */
+#ifndef Py_STRUCTMEMBER_H 
+#define Py_STRUCTMEMBER_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+ 
+/* Interface to map C struct members to Python object attributes */ 
+ 
+#include <stddef.h> /* For offsetof */ 
+ 
+/* The offsetof() macro calculates the offset of a structure member 
+   in its structure.  Unfortunately this cannot be written down 
+   portably, hence it is provided by a Standard C header file. 
+   For pre-Standard C compilers, here is a version that usually works 
+   (but watch out!): */ 
+ 
+#ifndef offsetof 
+#define offsetof(type, member) ( (int) & ((type*)0) -> member ) 
+#endif 
+ 
+/* An array of memberlist structures defines the name, type and offset 
+   of selected members of a C structure.  These can be read by 
+   PyMember_Get() and set by PyMember_Set() (except if their READONLY flag 
+   is set).  The array must be terminated with an entry whose name 
+   pointer is NULL. */ 
+ 
+struct memberlist { 
+    /* Obsolete version, for binary backwards compatibility */ 
+    char *name; 
+    int type; 
+    int offset; 
+    int flags; 
+}; 
+ 
+typedef struct PyMemberDef { 
+    /* Current version, use this */ 
+    char *name; 
+    int type; 
+    Py_ssize_t offset; 
+    int flags; 
+    char *doc; 
+} PyMemberDef; 
+ 
+/* Types */ 
+#define T_SHORT         0 
+#define T_INT           1 
+#define T_LONG          2 
+#define T_FLOAT         3 
+#define T_DOUBLE        4 
+#define T_STRING        5 
+#define T_OBJECT        6 
+/* XXX the ordering here is weird for binary compatibility */ 
+#define T_CHAR          7       /* 1-character string */ 
+#define T_BYTE          8       /* 8-bit signed int */ 
+/* unsigned variants: */ 
+#define T_UBYTE         9 
+#define T_USHORT        10 
+#define T_UINT          11 
+#define T_ULONG         12 
+ 
+/* Added by Jack: strings contained in the structure */ 
+#define T_STRING_INPLACE        13 
+ 
+/* Added by Lillo: bools contained in the structure (assumed char) */ 
+#define T_BOOL          14 
+ 
+#define T_OBJECT_EX     16      /* Like T_OBJECT, but raises AttributeError 
+                   when the value is NULL, instead of 
+                   converting to None. */ 
+#ifdef HAVE_LONG_LONG 
+#define T_LONGLONG      17 
+#define T_ULONGLONG      18 
+#endif /* HAVE_LONG_LONG */ 
+ 
+#define T_PYSSIZET       19 /* Py_ssize_t */ 
+ 
+ 
+/* Flags */ 
+#define READONLY        1 
+#define RO              READONLY                /* Shorthand */ 
+#define READ_RESTRICTED 2 
+#define PY_WRITE_RESTRICTED 4 
+#define RESTRICTED      (READ_RESTRICTED | PY_WRITE_RESTRICTED) 
+ 
+ 
+/* Obsolete API, for binary backwards compatibility */ 
+PyAPI_FUNC(PyObject *) PyMember_Get(const char *, struct memberlist *, const char *); 
+PyAPI_FUNC(int) PyMember_Set(char *, struct memberlist *, const char *, PyObject *); 
+ 
+/* Current API, use this */ 
+PyAPI_FUNC(PyObject *) PyMember_GetOne(const char *, struct PyMemberDef *); 
+PyAPI_FUNC(int) PyMember_SetOne(char *, struct PyMemberDef *, PyObject *); 
+ 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_STRUCTMEMBER_H */ 
diff --git a/contrib/tools/python/src/Include/structseq.h b/contrib/tools/python/src/Include/structseq.h
index e662916fe4..83598f21b3 100644
--- a/contrib/tools/python/src/Include/structseq.h
+++ b/contrib/tools/python/src/Include/structseq.h
@@ -1,41 +1,41 @@
-
-/* Tuple object interface */
-
-#ifndef Py_STRUCTSEQ_H
-#define Py_STRUCTSEQ_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct PyStructSequence_Field {
-	char *name;
-	char *doc;
-} PyStructSequence_Field;
-
-typedef struct PyStructSequence_Desc {
-	char *name;
-	char *doc;
-	struct PyStructSequence_Field *fields;
-	int n_in_sequence;
-} PyStructSequence_Desc;
-
-extern char* PyStructSequence_UnnamedField;
-
-PyAPI_FUNC(void) PyStructSequence_InitType(PyTypeObject *type,
-					   PyStructSequence_Desc *desc);
-
-PyAPI_FUNC(PyObject *) PyStructSequence_New(PyTypeObject* type);
-
-typedef struct {
-	PyObject_VAR_HEAD
-	PyObject *ob_item[1];
-} PyStructSequence;
-
-/* Macro, *only* to be used to fill in brand new objects */
-#define PyStructSequence_SET_ITEM(op, i, v) \
-	(((PyStructSequence *)(op))->ob_item[i] = v)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_STRUCTSEQ_H */
+ 
+/* Tuple object interface */ 
+ 
+#ifndef Py_STRUCTSEQ_H 
+#define Py_STRUCTSEQ_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+typedef struct PyStructSequence_Field { 
+	char *name; 
+	char *doc; 
+} PyStructSequence_Field; 
+ 
+typedef struct PyStructSequence_Desc { 
+	char *name; 
+	char *doc; 
+	struct PyStructSequence_Field *fields; 
+	int n_in_sequence; 
+} PyStructSequence_Desc; 
+ 
+extern char* PyStructSequence_UnnamedField; 
+ 
+PyAPI_FUNC(void) PyStructSequence_InitType(PyTypeObject *type, 
+					   PyStructSequence_Desc *desc); 
+ 
+PyAPI_FUNC(PyObject *) PyStructSequence_New(PyTypeObject* type); 
+ 
+typedef struct { 
+	PyObject_VAR_HEAD 
+	PyObject *ob_item[1]; 
+} PyStructSequence; 
+ 
+/* Macro, *only* to be used to fill in brand new objects */ 
+#define PyStructSequence_SET_ITEM(op, i, v) \ 
+	(((PyStructSequence *)(op))->ob_item[i] = v) 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_STRUCTSEQ_H */ 
diff --git a/contrib/tools/python/src/Include/symtable.h b/contrib/tools/python/src/Include/symtable.h
index e0a0be41b5..af8c134f7e 100644
--- a/contrib/tools/python/src/Include/symtable.h
+++ b/contrib/tools/python/src/Include/symtable.h
@@ -1,98 +1,98 @@
-#ifndef Py_SYMTABLE_H
-#define Py_SYMTABLE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef enum _block_type { FunctionBlock, ClassBlock, ModuleBlock }
-    _Py_block_ty;
-
-struct _symtable_entry;
-
-struct symtable {
-    const char *st_filename; /* name of file being compiled */
-    struct _symtable_entry *st_cur; /* current symbol table entry */
-    struct _symtable_entry *st_top; /* module entry */
-    PyObject *st_symbols;    /* dictionary of symbol table entries */
-    PyObject *st_stack;      /* stack of namespace info */
-    PyObject *st_global;     /* borrowed ref to MODULE in st_symbols */
-    int st_nblocks;          /* number of blocks */
-    PyObject *st_private;        /* name of current class or NULL */
-    PyFutureFeatures *st_future; /* module's future features */
-};
-
-typedef struct _symtable_entry {
-    PyObject_HEAD
-    PyObject *ste_id;        /* int: key in st_symbols */
-    PyObject *ste_symbols;   /* dict: name to flags */
-    PyObject *ste_name;      /* string: name of block */
-    PyObject *ste_varnames;  /* list of variable names */
-    PyObject *ste_children;  /* list of child ids */
-    _Py_block_ty ste_type;   /* module, class, or function */
-    int ste_unoptimized;     /* false if namespace is optimized */
-    int ste_nested;      /* true if block is nested */
-    unsigned ste_free : 1;        /* true if block has free variables */
-    unsigned ste_child_free : 1;  /* true if a child block has free vars,
-                                     including free refs to globals */
-    unsigned ste_generator : 1;   /* true if namespace is a generator */
-    unsigned ste_varargs : 1;     /* true if block has varargs */
-    unsigned ste_varkeywords : 1; /* true if block has varkeywords */
-    unsigned ste_returns_value : 1;  /* true if namespace uses return with
-                                        an argument */
-    int ste_lineno;          /* first line of block */
-    int ste_opt_lineno;      /* lineno of last exec or import * */
-    int ste_tmpname;         /* counter for listcomp temp vars */
-    struct symtable *ste_table;
-} PySTEntryObject;
-
-PyAPI_DATA(PyTypeObject) PySTEntry_Type;
-
-#define PySTEntry_Check(op) (Py_TYPE(op) == &PySTEntry_Type)
-
-PyAPI_FUNC(int) PyST_GetScope(PySTEntryObject *, PyObject *);
-
-PyAPI_FUNC(struct symtable *) PySymtable_Build(mod_ty, const char *,
-                                              PyFutureFeatures *);
-PyAPI_FUNC(PySTEntryObject *) PySymtable_Lookup(struct symtable *, void *);
-
-PyAPI_FUNC(void) PySymtable_Free(struct symtable *);
-
-/* Flags for def-use information */
-
-#define DEF_GLOBAL 1           /* global stmt */
-#define DEF_LOCAL 2            /* assignment in code block */
-#define DEF_PARAM 2<<1         /* formal parameter */
-#define USE 2<<2               /* name is used */
-#define DEF_FREE 2<<3         /* name used but not defined in nested block */
-#define DEF_FREE_CLASS 2<<4    /* free variable from class's method */
-#define DEF_IMPORT 2<<5        /* assignment occurred via import */
-
-#define DEF_BOUND (DEF_LOCAL | DEF_PARAM | DEF_IMPORT)
-
-/* GLOBAL_EXPLICIT and GLOBAL_IMPLICIT are used internally by the symbol
-   table.  GLOBAL is returned from PyST_GetScope() for either of them.
-   It is stored in ste_symbols at bits 12-14.
-*/
-#define SCOPE_OFF 11
-#define SCOPE_MASK 7
-
-#define LOCAL 1
-#define GLOBAL_EXPLICIT 2
-#define GLOBAL_IMPLICIT 3
-#define FREE 4
-#define CELL 5
-
-/* The following three names are used for the ste_unoptimized bit field */
-#define OPT_IMPORT_STAR 1
-#define OPT_EXEC 2
-#define OPT_BARE_EXEC 4
-#define OPT_TOPLEVEL 8  /* top-level names, including eval and exec */
-
-#define GENERATOR 1
-#define GENERATOR_EXPRESSION 2
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_SYMTABLE_H */
+#ifndef Py_SYMTABLE_H 
+#define Py_SYMTABLE_H 
+ 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+typedef enum _block_type { FunctionBlock, ClassBlock, ModuleBlock } 
+    _Py_block_ty; 
+ 
+struct _symtable_entry; 
+ 
+struct symtable { 
+    const char *st_filename; /* name of file being compiled */ 
+    struct _symtable_entry *st_cur; /* current symbol table entry */ 
+    struct _symtable_entry *st_top; /* module entry */ 
+    PyObject *st_symbols;    /* dictionary of symbol table entries */ 
+    PyObject *st_stack;      /* stack of namespace info */ 
+    PyObject *st_global;     /* borrowed ref to MODULE in st_symbols */ 
+    int st_nblocks;          /* number of blocks */ 
+    PyObject *st_private;        /* name of current class or NULL */ 
+    PyFutureFeatures *st_future; /* module's future features */ 
+}; 
+ 
+typedef struct _symtable_entry { 
+    PyObject_HEAD 
+    PyObject *ste_id;        /* int: key in st_symbols */ 
+    PyObject *ste_symbols;   /* dict: name to flags */ 
+    PyObject *ste_name;      /* string: name of block */ 
+    PyObject *ste_varnames;  /* list of variable names */ 
+    PyObject *ste_children;  /* list of child ids */ 
+    _Py_block_ty ste_type;   /* module, class, or function */ 
+    int ste_unoptimized;     /* false if namespace is optimized */ 
+    int ste_nested;      /* true if block is nested */ 
+    unsigned ste_free : 1;        /* true if block has free variables */ 
+    unsigned ste_child_free : 1;  /* true if a child block has free vars, 
+                                     including free refs to globals */ 
+    unsigned ste_generator : 1;   /* true if namespace is a generator */ 
+    unsigned ste_varargs : 1;     /* true if block has varargs */ 
+    unsigned ste_varkeywords : 1; /* true if block has varkeywords */ 
+    unsigned ste_returns_value : 1;  /* true if namespace uses return with 
+                                        an argument */ 
+    int ste_lineno;          /* first line of block */ 
+    int ste_opt_lineno;      /* lineno of last exec or import * */ 
+    int ste_tmpname;         /* counter for listcomp temp vars */ 
+    struct symtable *ste_table; 
+} PySTEntryObject; 
+ 
+PyAPI_DATA(PyTypeObject) PySTEntry_Type; 
+ 
+#define PySTEntry_Check(op) (Py_TYPE(op) == &PySTEntry_Type) 
+ 
+PyAPI_FUNC(int) PyST_GetScope(PySTEntryObject *, PyObject *); 
+ 
+PyAPI_FUNC(struct symtable *) PySymtable_Build(mod_ty, const char *, 
+                                              PyFutureFeatures *); 
+PyAPI_FUNC(PySTEntryObject *) PySymtable_Lookup(struct symtable *, void *); 
+ 
+PyAPI_FUNC(void) PySymtable_Free(struct symtable *); 
+ 
+/* Flags for def-use information */ 
+ 
+#define DEF_GLOBAL 1           /* global stmt */ 
+#define DEF_LOCAL 2            /* assignment in code block */ 
+#define DEF_PARAM 2<<1         /* formal parameter */ 
+#define USE 2<<2               /* name is used */ 
+#define DEF_FREE 2<<3         /* name used but not defined in nested block */ 
+#define DEF_FREE_CLASS 2<<4    /* free variable from class's method */ 
+#define DEF_IMPORT 2<<5        /* assignment occurred via import */ 
+ 
+#define DEF_BOUND (DEF_LOCAL | DEF_PARAM | DEF_IMPORT) 
+ 
+/* GLOBAL_EXPLICIT and GLOBAL_IMPLICIT are used internally by the symbol 
+   table.  GLOBAL is returned from PyST_GetScope() for either of them. 
+   It is stored in ste_symbols at bits 12-14. 
+*/ 
+#define SCOPE_OFF 11 
+#define SCOPE_MASK 7 
+ 
+#define LOCAL 1 
+#define GLOBAL_EXPLICIT 2 
+#define GLOBAL_IMPLICIT 3 
+#define FREE 4 
+#define CELL 5 
+ 
+/* The following three names are used for the ste_unoptimized bit field */ 
+#define OPT_IMPORT_STAR 1 
+#define OPT_EXEC 2 
+#define OPT_BARE_EXEC 4 
+#define OPT_TOPLEVEL 8  /* top-level names, including eval and exec */ 
+ 
+#define GENERATOR 1 
+#define GENERATOR_EXPRESSION 2 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_SYMTABLE_H */ 
diff --git a/contrib/tools/python/src/Include/sysmodule.h b/contrib/tools/python/src/Include/sysmodule.h
index cf11a2bc50..61ecb2822f 100644
--- a/contrib/tools/python/src/Include/sysmodule.h
+++ b/contrib/tools/python/src/Include/sysmodule.h
@@ -1,31 +1,31 @@
-
-/* System module interface */
-
-#ifndef Py_SYSMODULE_H
-#define Py_SYSMODULE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
+ 
+/* System module interface */ 
+ 
+#ifndef Py_SYSMODULE_H 
+#define Py_SYSMODULE_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
 PyAPI_FUNC(PyObject *) PySys_GetObject(const char *);
 PyAPI_FUNC(int) PySys_SetObject(const char *, PyObject *);
-PyAPI_FUNC(FILE *) PySys_GetFile(char *, FILE *);
-PyAPI_FUNC(void) PySys_SetArgv(int, char **);
-PyAPI_FUNC(void) PySys_SetArgvEx(int, char **, int);
-PyAPI_FUNC(void) PySys_SetPath(char *);
-
-PyAPI_FUNC(void) PySys_WriteStdout(const char *format, ...)
-			Py_GCC_ATTRIBUTE((format(printf, 1, 2)));
-PyAPI_FUNC(void) PySys_WriteStderr(const char *format, ...)
-			Py_GCC_ATTRIBUTE((format(printf, 1, 2)));
-
-PyAPI_FUNC(void) PySys_ResetWarnOptions(void);
-PyAPI_FUNC(void) PySys_AddWarnOption(char *);
-PyAPI_FUNC(int) PySys_HasWarnOptions(void);
-
+PyAPI_FUNC(FILE *) PySys_GetFile(char *, FILE *); 
+PyAPI_FUNC(void) PySys_SetArgv(int, char **); 
+PyAPI_FUNC(void) PySys_SetArgvEx(int, char **, int); 
+PyAPI_FUNC(void) PySys_SetPath(char *); 
+ 
+PyAPI_FUNC(void) PySys_WriteStdout(const char *format, ...) 
+			Py_GCC_ATTRIBUTE((format(printf, 1, 2))); 
+PyAPI_FUNC(void) PySys_WriteStderr(const char *format, ...) 
+			Py_GCC_ATTRIBUTE((format(printf, 1, 2))); 
+ 
+PyAPI_FUNC(void) PySys_ResetWarnOptions(void); 
+PyAPI_FUNC(void) PySys_AddWarnOption(char *); 
+PyAPI_FUNC(int) PySys_HasWarnOptions(void); 
+ 
 PyAPI_FUNC(size_t) _PySys_GetSizeOf(PyObject *);
 
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_SYSMODULE_H */
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_SYSMODULE_H */ 
diff --git a/contrib/tools/python/src/Include/timefuncs.h b/contrib/tools/python/src/Include/timefuncs.h
index a9d26a77a1..28bdaad5e6 100644
--- a/contrib/tools/python/src/Include/timefuncs.h
+++ b/contrib/tools/python/src/Include/timefuncs.h
@@ -1,26 +1,26 @@
-/*  timefuncs.h
- */
-
-/* Utility function related to timemodule.c. */
-
-#ifndef TIMEFUNCS_H
-#define TIMEFUNCS_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Cast double x to time_t, but raise ValueError if x is too large
- * to fit in a time_t.  ValueError is set on return iff the return
- * value is (time_t)-1 and PyErr_Occurred().
- */
-PyAPI_FUNC(time_t) _PyTime_DoubleToTimet(double x);
-
+/*  timefuncs.h 
+ */ 
+ 
+/* Utility function related to timemodule.c. */ 
+ 
+#ifndef TIMEFUNCS_H 
+#define TIMEFUNCS_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+ 
+/* Cast double x to time_t, but raise ValueError if x is too large 
+ * to fit in a time_t.  ValueError is set on return iff the return 
+ * value is (time_t)-1 and PyErr_Occurred(). 
+ */ 
+PyAPI_FUNC(time_t) _PyTime_DoubleToTimet(double x); 
+ 
 /* Get the current time since the epoch in seconds */
 PyAPI_FUNC(double) _PyTime_FloatTime(void);
+ 
 
-
-#ifdef __cplusplus
-}
-#endif
-#endif  /* TIMEFUNCS_H */
+#ifdef __cplusplus 
+} 
+#endif 
+#endif  /* TIMEFUNCS_H */ 
diff --git a/contrib/tools/python/src/Include/token.h b/contrib/tools/python/src/Include/token.h
index 72659ac053..955a78256b 100644
--- a/contrib/tools/python/src/Include/token.h
+++ b/contrib/tools/python/src/Include/token.h
@@ -1,85 +1,85 @@
-
-/* Token types */
-
-#ifndef Py_TOKEN_H
-#define Py_TOKEN_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#undef TILDE   /* Prevent clash of our definition with system macro. Ex AIX, ioctl.h */
-
-#define ENDMARKER	0
-#define NAME		1
-#define NUMBER		2
-#define STRING		3
-#define NEWLINE		4
-#define INDENT		5
-#define DEDENT		6
-#define LPAR		7
-#define RPAR		8
-#define LSQB		9
-#define RSQB		10
-#define COLON		11
-#define COMMA		12
-#define SEMI		13
-#define PLUS		14
-#define MINUS		15
-#define STAR		16
-#define SLASH		17
-#define VBAR		18
-#define AMPER		19
-#define LESS		20
-#define GREATER		21
-#define EQUAL		22
-#define DOT		23
-#define PERCENT		24
-#define BACKQUOTE	25
-#define LBRACE		26
-#define RBRACE		27
-#define EQEQUAL		28
-#define NOTEQUAL	29
-#define LESSEQUAL	30
-#define GREATEREQUAL	31
-#define TILDE		32
-#define CIRCUMFLEX	33
-#define LEFTSHIFT	34
-#define RIGHTSHIFT	35
-#define DOUBLESTAR	36
-#define PLUSEQUAL	37
-#define MINEQUAL	38
-#define STAREQUAL	39
-#define SLASHEQUAL	40
-#define PERCENTEQUAL	41
-#define AMPEREQUAL	42
-#define VBAREQUAL	43
-#define CIRCUMFLEXEQUAL	44
-#define LEFTSHIFTEQUAL	45
-#define RIGHTSHIFTEQUAL	46
-#define DOUBLESTAREQUAL	47
-#define DOUBLESLASH	48
-#define DOUBLESLASHEQUAL 49
-#define AT              50	
-/* Don't forget to update the table _PyParser_TokenNames in tokenizer.c! */
-#define OP		51
-#define ERRORTOKEN	52
-#define N_TOKENS	53
-
-/* Special definitions for cooperation with parser */
-
-#define NT_OFFSET		256
-
-#define ISTERMINAL(x)		((x) < NT_OFFSET)
-#define ISNONTERMINAL(x)	((x) >= NT_OFFSET)
-#define ISEOF(x)		((x) == ENDMARKER)
-
-
-PyAPI_DATA(char *) _PyParser_TokenNames[]; /* Token names */
-PyAPI_FUNC(int) PyToken_OneChar(int);
-PyAPI_FUNC(int) PyToken_TwoChars(int, int);
-PyAPI_FUNC(int) PyToken_ThreeChars(int, int, int);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_TOKEN_H */
+ 
+/* Token types */ 
+ 
+#ifndef Py_TOKEN_H 
+#define Py_TOKEN_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+#undef TILDE   /* Prevent clash of our definition with system macro. Ex AIX, ioctl.h */ 
+ 
+#define ENDMARKER	0 
+#define NAME		1 
+#define NUMBER		2 
+#define STRING		3 
+#define NEWLINE		4 
+#define INDENT		5 
+#define DEDENT		6 
+#define LPAR		7 
+#define RPAR		8 
+#define LSQB		9 
+#define RSQB		10 
+#define COLON		11 
+#define COMMA		12 
+#define SEMI		13 
+#define PLUS		14 
+#define MINUS		15 
+#define STAR		16 
+#define SLASH		17 
+#define VBAR		18 
+#define AMPER		19 
+#define LESS		20 
+#define GREATER		21 
+#define EQUAL		22 
+#define DOT		23 
+#define PERCENT		24 
+#define BACKQUOTE	25 
+#define LBRACE		26 
+#define RBRACE		27 
+#define EQEQUAL		28 
+#define NOTEQUAL	29 
+#define LESSEQUAL	30 
+#define GREATEREQUAL	31 
+#define TILDE		32 
+#define CIRCUMFLEX	33 
+#define LEFTSHIFT	34 
+#define RIGHTSHIFT	35 
+#define DOUBLESTAR	36 
+#define PLUSEQUAL	37 
+#define MINEQUAL	38 
+#define STAREQUAL	39 
+#define SLASHEQUAL	40 
+#define PERCENTEQUAL	41 
+#define AMPEREQUAL	42 
+#define VBAREQUAL	43 
+#define CIRCUMFLEXEQUAL	44 
+#define LEFTSHIFTEQUAL	45 
+#define RIGHTSHIFTEQUAL	46 
+#define DOUBLESTAREQUAL	47 
+#define DOUBLESLASH	48 
+#define DOUBLESLASHEQUAL 49 
+#define AT              50	 
+/* Don't forget to update the table _PyParser_TokenNames in tokenizer.c! */ 
+#define OP		51 
+#define ERRORTOKEN	52 
+#define N_TOKENS	53 
+ 
+/* Special definitions for cooperation with parser */ 
+ 
+#define NT_OFFSET		256 
+ 
+#define ISTERMINAL(x)		((x) < NT_OFFSET) 
+#define ISNONTERMINAL(x)	((x) >= NT_OFFSET) 
+#define ISEOF(x)		((x) == ENDMARKER) 
+ 
+ 
+PyAPI_DATA(char *) _PyParser_TokenNames[]; /* Token names */ 
+PyAPI_FUNC(int) PyToken_OneChar(int); 
+PyAPI_FUNC(int) PyToken_TwoChars(int, int); 
+PyAPI_FUNC(int) PyToken_ThreeChars(int, int, int); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_TOKEN_H */ 
diff --git a/contrib/tools/python/src/Include/traceback.h b/contrib/tools/python/src/Include/traceback.h
index e7943dae96..96793b54ea 100644
--- a/contrib/tools/python/src/Include/traceback.h
+++ b/contrib/tools/python/src/Include/traceback.h
@@ -1,31 +1,31 @@
-
-#ifndef Py_TRACEBACK_H
-#define Py_TRACEBACK_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct _frame;
-
-/* Traceback interface */
-
-typedef struct _traceback {
-	PyObject_HEAD
-	struct _traceback *tb_next;
-	struct _frame *tb_frame;
-	int tb_lasti;
-	int tb_lineno;
-} PyTracebackObject;
-
-PyAPI_FUNC(int) PyTraceBack_Here(struct _frame *);
-PyAPI_FUNC(int) PyTraceBack_Print(PyObject *, PyObject *);
-PyAPI_FUNC(int) _Py_DisplaySourceLine(PyObject *, const char *, int, int);
-
-/* Reveal traceback type so we can typecheck traceback objects */
-PyAPI_DATA(PyTypeObject) PyTraceBack_Type;
-#define PyTraceBack_Check(v) (Py_TYPE(v) == &PyTraceBack_Type)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_TRACEBACK_H */
+ 
+#ifndef Py_TRACEBACK_H 
+#define Py_TRACEBACK_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+struct _frame; 
+ 
+/* Traceback interface */ 
+ 
+typedef struct _traceback { 
+	PyObject_HEAD 
+	struct _traceback *tb_next; 
+	struct _frame *tb_frame; 
+	int tb_lasti; 
+	int tb_lineno; 
+} PyTracebackObject; 
+ 
+PyAPI_FUNC(int) PyTraceBack_Here(struct _frame *); 
+PyAPI_FUNC(int) PyTraceBack_Print(PyObject *, PyObject *); 
+PyAPI_FUNC(int) _Py_DisplaySourceLine(PyObject *, const char *, int, int); 
+ 
+/* Reveal traceback type so we can typecheck traceback objects */ 
+PyAPI_DATA(PyTypeObject) PyTraceBack_Type; 
+#define PyTraceBack_Check(v) (Py_TYPE(v) == &PyTraceBack_Type) 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_TRACEBACK_H */ 
diff --git a/contrib/tools/python/src/Include/tupleobject.h b/contrib/tools/python/src/Include/tupleobject.h
index a5ab733208..863aea1331 100644
--- a/contrib/tools/python/src/Include/tupleobject.h
+++ b/contrib/tools/python/src/Include/tupleobject.h
@@ -1,61 +1,61 @@
-
-/* Tuple object interface */
-
-#ifndef Py_TUPLEOBJECT_H
-#define Py_TUPLEOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-Another generally useful object type is a tuple of object pointers.
-For Python, this is an immutable type.  C code can change the tuple items
-(but not their number), and even use tuples are general-purpose arrays of
-object references, but in general only brand new tuples should be mutated,
-not ones that might already have been exposed to Python code.
-
-*** WARNING *** PyTuple_SetItem does not increment the new item's reference
-count, but does decrement the reference count of the item it replaces,
-if not nil.  It does *decrement* the reference count if it is *not*
-inserted in the tuple.  Similarly, PyTuple_GetItem does not increment the
-returned item's reference count.
-*/
-
-typedef struct {
-    PyObject_VAR_HEAD
-    PyObject *ob_item[1];
-
-    /* ob_item contains space for 'ob_size' elements.
-     * Items must normally not be NULL, except during construction when
-     * the tuple is not yet visible outside the function that builds it.
-     */
-} PyTupleObject;
-
-PyAPI_DATA(PyTypeObject) PyTuple_Type;
-
-#define PyTuple_Check(op) \
-                 PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_TUPLE_SUBCLASS)
-#define PyTuple_CheckExact(op) (Py_TYPE(op) == &PyTuple_Type)
-
-PyAPI_FUNC(PyObject *) PyTuple_New(Py_ssize_t size);
-PyAPI_FUNC(Py_ssize_t) PyTuple_Size(PyObject *);
-PyAPI_FUNC(PyObject *) PyTuple_GetItem(PyObject *, Py_ssize_t);
-PyAPI_FUNC(int) PyTuple_SetItem(PyObject *, Py_ssize_t, PyObject *);
-PyAPI_FUNC(PyObject *) PyTuple_GetSlice(PyObject *, Py_ssize_t, Py_ssize_t);
-PyAPI_FUNC(int) _PyTuple_Resize(PyObject **, Py_ssize_t);
-PyAPI_FUNC(PyObject *) PyTuple_Pack(Py_ssize_t, ...);
-PyAPI_FUNC(void) _PyTuple_MaybeUntrack(PyObject *);
-
-/* Macro, trading safety for speed */
-#define PyTuple_GET_ITEM(op, i) (((PyTupleObject *)(op))->ob_item[i])
-#define PyTuple_GET_SIZE(op)    Py_SIZE(op)
-
-/* Macro, *only* to be used to fill in brand new tuples */
-#define PyTuple_SET_ITEM(op, i, v) (((PyTupleObject *)(op))->ob_item[i] = v)
-
-PyAPI_FUNC(int) PyTuple_ClearFreeList(void);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_TUPLEOBJECT_H */
+ 
+/* Tuple object interface */ 
+ 
+#ifndef Py_TUPLEOBJECT_H 
+#define Py_TUPLEOBJECT_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+/* 
+Another generally useful object type is a tuple of object pointers. 
+For Python, this is an immutable type.  C code can change the tuple items 
+(but not their number), and even use tuples are general-purpose arrays of 
+object references, but in general only brand new tuples should be mutated, 
+not ones that might already have been exposed to Python code. 
+ 
+*** WARNING *** PyTuple_SetItem does not increment the new item's reference 
+count, but does decrement the reference count of the item it replaces, 
+if not nil.  It does *decrement* the reference count if it is *not* 
+inserted in the tuple.  Similarly, PyTuple_GetItem does not increment the 
+returned item's reference count. 
+*/ 
+ 
+typedef struct { 
+    PyObject_VAR_HEAD 
+    PyObject *ob_item[1]; 
+ 
+    /* ob_item contains space for 'ob_size' elements. 
+     * Items must normally not be NULL, except during construction when 
+     * the tuple is not yet visible outside the function that builds it. 
+     */ 
+} PyTupleObject; 
+ 
+PyAPI_DATA(PyTypeObject) PyTuple_Type; 
+ 
+#define PyTuple_Check(op) \ 
+                 PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_TUPLE_SUBCLASS) 
+#define PyTuple_CheckExact(op) (Py_TYPE(op) == &PyTuple_Type) 
+ 
+PyAPI_FUNC(PyObject *) PyTuple_New(Py_ssize_t size); 
+PyAPI_FUNC(Py_ssize_t) PyTuple_Size(PyObject *); 
+PyAPI_FUNC(PyObject *) PyTuple_GetItem(PyObject *, Py_ssize_t); 
+PyAPI_FUNC(int) PyTuple_SetItem(PyObject *, Py_ssize_t, PyObject *); 
+PyAPI_FUNC(PyObject *) PyTuple_GetSlice(PyObject *, Py_ssize_t, Py_ssize_t); 
+PyAPI_FUNC(int) _PyTuple_Resize(PyObject **, Py_ssize_t); 
+PyAPI_FUNC(PyObject *) PyTuple_Pack(Py_ssize_t, ...); 
+PyAPI_FUNC(void) _PyTuple_MaybeUntrack(PyObject *); 
+ 
+/* Macro, trading safety for speed */ 
+#define PyTuple_GET_ITEM(op, i) (((PyTupleObject *)(op))->ob_item[i]) 
+#define PyTuple_GET_SIZE(op)    Py_SIZE(op) 
+ 
+/* Macro, *only* to be used to fill in brand new tuples */ 
+#define PyTuple_SET_ITEM(op, i, v) (((PyTupleObject *)(op))->ob_item[i] = v) 
+ 
+PyAPI_FUNC(int) PyTuple_ClearFreeList(void); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_TUPLEOBJECT_H */ 
diff --git a/contrib/tools/python/src/Include/ucnhash.h b/contrib/tools/python/src/Include/ucnhash.h
index 69b7774a97..80c58f99e3 100644
--- a/contrib/tools/python/src/Include/ucnhash.h
+++ b/contrib/tools/python/src/Include/ucnhash.h
@@ -1,33 +1,33 @@
-/* Unicode name database interface */
-
-#ifndef Py_UCNHASH_H
-#define Py_UCNHASH_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* revised ucnhash CAPI interface (exported through a "wrapper") */
-
-#define PyUnicodeData_CAPSULE_NAME "unicodedata.ucnhash_CAPI"
-
-typedef struct {
-
-    /* Size of this struct */
-    int size;
-
-    /* Get name for a given character code.  Returns non-zero if
-       success, zero if not.  Does not set Python exceptions. 
-       If self is NULL, data come from the default version of the database.
-       If it is not NULL, it should be a unicodedata.ucd_X_Y_Z object */
-    int (*getname)(PyObject *self, Py_UCS4 code, char* buffer, int buflen);
-
-    /* Get character code for a given name.  Same error handling
-       as for getname. */
-    int (*getcode)(PyObject *self, const char* name, int namelen, Py_UCS4* code);
-
-} _PyUnicode_Name_CAPI;
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_UCNHASH_H */
+/* Unicode name database interface */ 
+ 
+#ifndef Py_UCNHASH_H 
+#define Py_UCNHASH_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+/* revised ucnhash CAPI interface (exported through a "wrapper") */ 
+ 
+#define PyUnicodeData_CAPSULE_NAME "unicodedata.ucnhash_CAPI" 
+ 
+typedef struct { 
+ 
+    /* Size of this struct */ 
+    int size; 
+ 
+    /* Get name for a given character code.  Returns non-zero if 
+       success, zero if not.  Does not set Python exceptions.  
+       If self is NULL, data come from the default version of the database. 
+       If it is not NULL, it should be a unicodedata.ucd_X_Y_Z object */ 
+    int (*getname)(PyObject *self, Py_UCS4 code, char* buffer, int buflen); 
+ 
+    /* Get character code for a given name.  Same error handling 
+       as for getname. */ 
+    int (*getcode)(PyObject *self, const char* name, int namelen, Py_UCS4* code); 
+ 
+} _PyUnicode_Name_CAPI; 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_UCNHASH_H */ 
diff --git a/contrib/tools/python/src/Include/unicodeobject.h b/contrib/tools/python/src/Include/unicodeobject.h
index 94419760c5..4a39f43f4b 100644
--- a/contrib/tools/python/src/Include/unicodeobject.h
+++ b/contrib/tools/python/src/Include/unicodeobject.h
@@ -1,1421 +1,1421 @@
-#ifndef Py_UNICODEOBJECT_H
-#define Py_UNICODEOBJECT_H
-
-#include <stdarg.h>
-
-/*
-
-Unicode implementation based on original code by Fredrik Lundh,
-modified by Marc-Andre Lemburg (mal@lemburg.com) according to the
-Unicode Integration Proposal (see file Misc/unicode.txt).
-
-Copyright (c) Corporation for National Research Initiatives.
-
-
- Original header:
- --------------------------------------------------------------------
-
- * Yet another Unicode string type for Python.  This type supports the
- * 16-bit Basic Multilingual Plane (BMP) only.
- *
- * Written by Fredrik Lundh, January 1999.
- *
- * Copyright (c) 1999 by Secret Labs AB.
- * Copyright (c) 1999 by Fredrik Lundh.
- *
- * fredrik@pythonware.com
- * http://www.pythonware.com
- *
- * --------------------------------------------------------------------
- * This Unicode String Type is
- *
- * Copyright (c) 1999 by Secret Labs AB
- * Copyright (c) 1999 by Fredrik Lundh
- *
- * By obtaining, using, and/or copying this software and/or its
- * associated documentation, you agree that you have read, understood,
- * and will comply with the following terms and conditions:
- *
- * Permission to use, copy, modify, and distribute this software and its
- * associated documentation for any purpose and without fee is hereby
- * granted, provided that the above copyright notice appears in all
- * copies, and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of Secret Labs
- * AB or the author not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission.
- *
- * SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS.  IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- * -------------------------------------------------------------------- */
-
-#include <ctype.h>
-
-/* === Internal API ======================================================= */
-
-/* --- Internal Unicode Format -------------------------------------------- */
-
-#ifndef Py_USING_UNICODE
-
-#define PyUnicode_Check(op)                 0
-#define PyUnicode_CheckExact(op)            0
-
-#else
-
+#ifndef Py_UNICODEOBJECT_H 
+#define Py_UNICODEOBJECT_H 
+ 
+#include <stdarg.h> 
+ 
+/* 
+ 
+Unicode implementation based on original code by Fredrik Lundh, 
+modified by Marc-Andre Lemburg (mal@lemburg.com) according to the 
+Unicode Integration Proposal (see file Misc/unicode.txt). 
+ 
+Copyright (c) Corporation for National Research Initiatives. 
+ 
+ 
+ Original header: 
+ -------------------------------------------------------------------- 
+ 
+ * Yet another Unicode string type for Python.  This type supports the 
+ * 16-bit Basic Multilingual Plane (BMP) only. 
+ * 
+ * Written by Fredrik Lundh, January 1999. 
+ * 
+ * Copyright (c) 1999 by Secret Labs AB. 
+ * Copyright (c) 1999 by Fredrik Lundh. 
+ * 
+ * fredrik@pythonware.com 
+ * http://www.pythonware.com 
+ * 
+ * -------------------------------------------------------------------- 
+ * This Unicode String Type is 
+ * 
+ * Copyright (c) 1999 by Secret Labs AB 
+ * Copyright (c) 1999 by Fredrik Lundh 
+ * 
+ * By obtaining, using, and/or copying this software and/or its 
+ * associated documentation, you agree that you have read, understood, 
+ * and will comply with the following terms and conditions: 
+ * 
+ * Permission to use, copy, modify, and distribute this software and its 
+ * associated documentation for any purpose and without fee is hereby 
+ * granted, provided that the above copyright notice appears in all 
+ * copies, and that both that copyright notice and this permission notice 
+ * appear in supporting documentation, and that the name of Secret Labs 
+ * AB or the author not be used in advertising or publicity pertaining to 
+ * distribution of the software without specific, written prior 
+ * permission. 
+ * 
+ * SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO 
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND 
+ * FITNESS.  IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR BE LIABLE FOR 
+ * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT 
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 
+ * -------------------------------------------------------------------- */ 
+ 
+#include <ctype.h> 
+ 
+/* === Internal API ======================================================= */ 
+ 
+/* --- Internal Unicode Format -------------------------------------------- */ 
+ 
+#ifndef Py_USING_UNICODE 
+ 
+#define PyUnicode_Check(op)                 0 
+#define PyUnicode_CheckExact(op)            0 
+ 
+#else 
+ 
 #undef Py_UNICODE_SIZE
 #undef PY_UNICODE_TYPE
 #define Py_UNICODE_SIZE ARCADIA_PYTHON_UNICODE_SIZE
 
-/* FIXME: MvL's new implementation assumes that Py_UNICODE_SIZE is
-   properly set, but the default rules below doesn't set it.  I'll
-   sort this out some other day -- fredrik@pythonware.com */
-
-#ifndef Py_UNICODE_SIZE
-#error Must define Py_UNICODE_SIZE
-#endif
-
-/* Setting Py_UNICODE_WIDE enables UCS-4 storage.  Otherwise, Unicode
-   strings are stored as UCS-2 (with limited support for UTF-16) */
-
-#if Py_UNICODE_SIZE >= 4
-#define Py_UNICODE_WIDE
-#endif
-
-/* Set these flags if the platform has "wchar.h", "wctype.h" and the
-   wchar_t type is a 16-bit unsigned type */
-/* #define HAVE_WCHAR_H */
-/* #define HAVE_USABLE_WCHAR_T */
-
-/* Defaults for various platforms */
-#ifndef PY_UNICODE_TYPE
-
-/* Windows has a usable wchar_t type (unless we're using UCS-4) */
-# if defined(MS_WIN32) && Py_UNICODE_SIZE == 2
-#  define HAVE_USABLE_WCHAR_T
-#  define PY_UNICODE_TYPE wchar_t
-# endif
-
-# if defined(Py_UNICODE_WIDE)
-#  define PY_UNICODE_TYPE Py_UCS4
-# endif
-
-#endif
-
+/* FIXME: MvL's new implementation assumes that Py_UNICODE_SIZE is 
+   properly set, but the default rules below doesn't set it.  I'll 
+   sort this out some other day -- fredrik@pythonware.com */ 
+ 
+#ifndef Py_UNICODE_SIZE 
+#error Must define Py_UNICODE_SIZE 
+#endif 
+ 
+/* Setting Py_UNICODE_WIDE enables UCS-4 storage.  Otherwise, Unicode 
+   strings are stored as UCS-2 (with limited support for UTF-16) */ 
+ 
+#if Py_UNICODE_SIZE >= 4 
+#define Py_UNICODE_WIDE 
+#endif 
+ 
+/* Set these flags if the platform has "wchar.h", "wctype.h" and the 
+   wchar_t type is a 16-bit unsigned type */ 
+/* #define HAVE_WCHAR_H */ 
+/* #define HAVE_USABLE_WCHAR_T */ 
+ 
+/* Defaults for various platforms */ 
+#ifndef PY_UNICODE_TYPE 
+ 
+/* Windows has a usable wchar_t type (unless we're using UCS-4) */ 
+# if defined(MS_WIN32) && Py_UNICODE_SIZE == 2 
+#  define HAVE_USABLE_WCHAR_T 
+#  define PY_UNICODE_TYPE wchar_t 
+# endif 
+ 
+# if defined(Py_UNICODE_WIDE) 
+#  define PY_UNICODE_TYPE Py_UCS4 
+# endif 
+ 
+#endif 
+ 
 #ifndef PY_UNICODE_TYPE
 #define PY_UNICODE_TYPE unsigned short
 #endif
 
-/* If the compiler provides a wchar_t type we try to support it
-   through the interface functions PyUnicode_FromWideChar() and
-   PyUnicode_AsWideChar(). */
-
-#ifdef HAVE_USABLE_WCHAR_T
-# ifndef HAVE_WCHAR_H
-#  define HAVE_WCHAR_H
-# endif
-#endif
-
-#ifdef HAVE_WCHAR_H
-/* Work around a cosmetic bug in BSDI 4.x wchar.h; thanks to Thomas Wouters */
-# ifdef _HAVE_BSDI
-#  include <time.h>
-# endif
-#  include <wchar.h>
-#endif
-
-/*
- * Use this typedef when you need to represent a UTF-16 surrogate pair
- * as single unsigned integer.
- */
-#if SIZEOF_INT >= 4
-typedef unsigned int Py_UCS4;
-#elif SIZEOF_LONG >= 4
-typedef unsigned long Py_UCS4;
-#endif
-
-/* Py_UNICODE is the native Unicode storage format (code unit) used by
-   Python and represents a single Unicode element in the Unicode
-   type. */
-
-typedef PY_UNICODE_TYPE Py_UNICODE;
-
-/* --- UCS-2/UCS-4 Name Mangling ------------------------------------------ */
-
-/* Unicode API names are mangled to assure that UCS-2 and UCS-4 builds
-   produce different external names and thus cause import errors in
-   case Python interpreters and extensions with mixed compiled in
-   Unicode width assumptions are combined. */
-
-#ifndef Py_UNICODE_WIDE
-
-# define PyUnicode_AsASCIIString PyUnicodeUCS2_AsASCIIString
-# define PyUnicode_AsCharmapString PyUnicodeUCS2_AsCharmapString
-# define PyUnicode_AsEncodedObject PyUnicodeUCS2_AsEncodedObject
-# define PyUnicode_AsEncodedString PyUnicodeUCS2_AsEncodedString
-# define PyUnicode_AsLatin1String PyUnicodeUCS2_AsLatin1String
-# define PyUnicode_AsRawUnicodeEscapeString PyUnicodeUCS2_AsRawUnicodeEscapeString
-# define PyUnicode_AsUTF32String PyUnicodeUCS2_AsUTF32String
-# define PyUnicode_AsUTF16String PyUnicodeUCS2_AsUTF16String
-# define PyUnicode_AsUTF8String PyUnicodeUCS2_AsUTF8String
-# define PyUnicode_AsUnicode PyUnicodeUCS2_AsUnicode
-# define PyUnicode_AsUnicodeEscapeString PyUnicodeUCS2_AsUnicodeEscapeString
-# define PyUnicode_AsWideChar PyUnicodeUCS2_AsWideChar
-# define PyUnicode_ClearFreeList PyUnicodeUCS2_ClearFreelist
-# define PyUnicode_Compare PyUnicodeUCS2_Compare
-# define PyUnicode_Concat PyUnicodeUCS2_Concat
-# define PyUnicode_Contains PyUnicodeUCS2_Contains
-# define PyUnicode_Count PyUnicodeUCS2_Count
-# define PyUnicode_Decode PyUnicodeUCS2_Decode
-# define PyUnicode_DecodeASCII PyUnicodeUCS2_DecodeASCII
-# define PyUnicode_DecodeCharmap PyUnicodeUCS2_DecodeCharmap
-# define PyUnicode_DecodeLatin1 PyUnicodeUCS2_DecodeLatin1
-# define PyUnicode_DecodeRawUnicodeEscape PyUnicodeUCS2_DecodeRawUnicodeEscape
-# define PyUnicode_DecodeUTF32 PyUnicodeUCS2_DecodeUTF32
-# define PyUnicode_DecodeUTF32Stateful PyUnicodeUCS2_DecodeUTF32Stateful
-# define PyUnicode_DecodeUTF16 PyUnicodeUCS2_DecodeUTF16
-# define PyUnicode_DecodeUTF16Stateful PyUnicodeUCS2_DecodeUTF16Stateful
-# define PyUnicode_DecodeUTF8 PyUnicodeUCS2_DecodeUTF8
-# define PyUnicode_DecodeUTF8Stateful PyUnicodeUCS2_DecodeUTF8Stateful
-# define PyUnicode_DecodeUnicodeEscape PyUnicodeUCS2_DecodeUnicodeEscape
-# define PyUnicode_Encode PyUnicodeUCS2_Encode
-# define PyUnicode_EncodeASCII PyUnicodeUCS2_EncodeASCII
-# define PyUnicode_EncodeCharmap PyUnicodeUCS2_EncodeCharmap
-# define PyUnicode_EncodeDecimal PyUnicodeUCS2_EncodeDecimal
-# define PyUnicode_EncodeLatin1 PyUnicodeUCS2_EncodeLatin1
-# define PyUnicode_EncodeRawUnicodeEscape PyUnicodeUCS2_EncodeRawUnicodeEscape
-# define PyUnicode_EncodeUTF32 PyUnicodeUCS2_EncodeUTF32
-# define PyUnicode_EncodeUTF16 PyUnicodeUCS2_EncodeUTF16
-# define PyUnicode_EncodeUTF8 PyUnicodeUCS2_EncodeUTF8
-# define PyUnicode_EncodeUnicodeEscape PyUnicodeUCS2_EncodeUnicodeEscape
-# define PyUnicode_Find PyUnicodeUCS2_Find
-# define PyUnicode_Format PyUnicodeUCS2_Format
-# define PyUnicode_FromEncodedObject PyUnicodeUCS2_FromEncodedObject
-# define PyUnicode_FromFormat PyUnicodeUCS2_FromFormat
-# define PyUnicode_FromFormatV PyUnicodeUCS2_FromFormatV
-# define PyUnicode_FromObject PyUnicodeUCS2_FromObject
-# define PyUnicode_FromOrdinal PyUnicodeUCS2_FromOrdinal
-# define PyUnicode_FromString PyUnicodeUCS2_FromString
-# define PyUnicode_FromStringAndSize PyUnicodeUCS2_FromStringAndSize
-# define PyUnicode_FromUnicode PyUnicodeUCS2_FromUnicode
-# define PyUnicode_FromWideChar PyUnicodeUCS2_FromWideChar
-# define PyUnicode_GetDefaultEncoding PyUnicodeUCS2_GetDefaultEncoding
-# define PyUnicode_GetMax PyUnicodeUCS2_GetMax
-# define PyUnicode_GetSize PyUnicodeUCS2_GetSize
-# define PyUnicode_Join PyUnicodeUCS2_Join
-# define PyUnicode_Partition PyUnicodeUCS2_Partition
-# define PyUnicode_RPartition PyUnicodeUCS2_RPartition
-# define PyUnicode_RSplit PyUnicodeUCS2_RSplit
-# define PyUnicode_Replace PyUnicodeUCS2_Replace
-# define PyUnicode_Resize PyUnicodeUCS2_Resize
-# define PyUnicode_RichCompare PyUnicodeUCS2_RichCompare
-# define PyUnicode_SetDefaultEncoding PyUnicodeUCS2_SetDefaultEncoding
-# define PyUnicode_Split PyUnicodeUCS2_Split
-# define PyUnicode_Splitlines PyUnicodeUCS2_Splitlines
-# define PyUnicode_Tailmatch PyUnicodeUCS2_Tailmatch
-# define PyUnicode_Translate PyUnicodeUCS2_Translate
-# define PyUnicode_TranslateCharmap PyUnicodeUCS2_TranslateCharmap
-# define _PyUnicode_AsDefaultEncodedString _PyUnicodeUCS2_AsDefaultEncodedString
-# define _PyUnicode_Fini _PyUnicodeUCS2_Fini
-# define _PyUnicode_Init _PyUnicodeUCS2_Init
-# define _PyUnicode_IsAlpha _PyUnicodeUCS2_IsAlpha
-# define _PyUnicode_IsDecimalDigit _PyUnicodeUCS2_IsDecimalDigit
-# define _PyUnicode_IsDigit _PyUnicodeUCS2_IsDigit
-# define _PyUnicode_IsLinebreak _PyUnicodeUCS2_IsLinebreak
-# define _PyUnicode_IsLowercase _PyUnicodeUCS2_IsLowercase
-# define _PyUnicode_IsNumeric _PyUnicodeUCS2_IsNumeric
-# define _PyUnicode_IsTitlecase _PyUnicodeUCS2_IsTitlecase
-# define _PyUnicode_IsUppercase _PyUnicodeUCS2_IsUppercase
-# define _PyUnicode_IsWhitespace _PyUnicodeUCS2_IsWhitespace
-# define _PyUnicode_ToDecimalDigit _PyUnicodeUCS2_ToDecimalDigit
-# define _PyUnicode_ToDigit _PyUnicodeUCS2_ToDigit
-# define _PyUnicode_ToLowercase _PyUnicodeUCS2_ToLowercase
-# define _PyUnicode_ToNumeric _PyUnicodeUCS2_ToNumeric
-# define _PyUnicode_ToTitlecase _PyUnicodeUCS2_ToTitlecase
-# define _PyUnicode_ToUppercase _PyUnicodeUCS2_ToUppercase
-
-#else
-
-# define PyUnicode_AsASCIIString PyUnicodeUCS4_AsASCIIString
-# define PyUnicode_AsCharmapString PyUnicodeUCS4_AsCharmapString
-# define PyUnicode_AsEncodedObject PyUnicodeUCS4_AsEncodedObject
-# define PyUnicode_AsEncodedString PyUnicodeUCS4_AsEncodedString
-# define PyUnicode_AsLatin1String PyUnicodeUCS4_AsLatin1String
-# define PyUnicode_AsRawUnicodeEscapeString PyUnicodeUCS4_AsRawUnicodeEscapeString
-# define PyUnicode_AsUTF32String PyUnicodeUCS4_AsUTF32String
-# define PyUnicode_AsUTF16String PyUnicodeUCS4_AsUTF16String
-# define PyUnicode_AsUTF8String PyUnicodeUCS4_AsUTF8String
-# define PyUnicode_AsUnicode PyUnicodeUCS4_AsUnicode
-# define PyUnicode_AsUnicodeEscapeString PyUnicodeUCS4_AsUnicodeEscapeString
-# define PyUnicode_AsWideChar PyUnicodeUCS4_AsWideChar
-# define PyUnicode_ClearFreeList PyUnicodeUCS4_ClearFreelist
-# define PyUnicode_Compare PyUnicodeUCS4_Compare
-# define PyUnicode_Concat PyUnicodeUCS4_Concat
-# define PyUnicode_Contains PyUnicodeUCS4_Contains
-# define PyUnicode_Count PyUnicodeUCS4_Count
-# define PyUnicode_Decode PyUnicodeUCS4_Decode
-# define PyUnicode_DecodeASCII PyUnicodeUCS4_DecodeASCII
-# define PyUnicode_DecodeCharmap PyUnicodeUCS4_DecodeCharmap
-# define PyUnicode_DecodeLatin1 PyUnicodeUCS4_DecodeLatin1
-# define PyUnicode_DecodeRawUnicodeEscape PyUnicodeUCS4_DecodeRawUnicodeEscape
-# define PyUnicode_DecodeUTF32 PyUnicodeUCS4_DecodeUTF32
-# define PyUnicode_DecodeUTF32Stateful PyUnicodeUCS4_DecodeUTF32Stateful
-# define PyUnicode_DecodeUTF16 PyUnicodeUCS4_DecodeUTF16
-# define PyUnicode_DecodeUTF16Stateful PyUnicodeUCS4_DecodeUTF16Stateful
-# define PyUnicode_DecodeUTF8 PyUnicodeUCS4_DecodeUTF8
-# define PyUnicode_DecodeUTF8Stateful PyUnicodeUCS4_DecodeUTF8Stateful
-# define PyUnicode_DecodeUnicodeEscape PyUnicodeUCS4_DecodeUnicodeEscape
-# define PyUnicode_Encode PyUnicodeUCS4_Encode
-# define PyUnicode_EncodeASCII PyUnicodeUCS4_EncodeASCII
-# define PyUnicode_EncodeCharmap PyUnicodeUCS4_EncodeCharmap
-# define PyUnicode_EncodeDecimal PyUnicodeUCS4_EncodeDecimal
-# define PyUnicode_EncodeLatin1 PyUnicodeUCS4_EncodeLatin1
-# define PyUnicode_EncodeRawUnicodeEscape PyUnicodeUCS4_EncodeRawUnicodeEscape
-# define PyUnicode_EncodeUTF32 PyUnicodeUCS4_EncodeUTF32
-# define PyUnicode_EncodeUTF16 PyUnicodeUCS4_EncodeUTF16
-# define PyUnicode_EncodeUTF8 PyUnicodeUCS4_EncodeUTF8
-# define PyUnicode_EncodeUnicodeEscape PyUnicodeUCS4_EncodeUnicodeEscape
-# define PyUnicode_Find PyUnicodeUCS4_Find
-# define PyUnicode_Format PyUnicodeUCS4_Format
-# define PyUnicode_FromEncodedObject PyUnicodeUCS4_FromEncodedObject
-# define PyUnicode_FromFormat PyUnicodeUCS4_FromFormat
-# define PyUnicode_FromFormatV PyUnicodeUCS4_FromFormatV
-# define PyUnicode_FromObject PyUnicodeUCS4_FromObject
-# define PyUnicode_FromOrdinal PyUnicodeUCS4_FromOrdinal
-# define PyUnicode_FromString PyUnicodeUCS4_FromString
-# define PyUnicode_FromStringAndSize PyUnicodeUCS4_FromStringAndSize
-# define PyUnicode_FromUnicode PyUnicodeUCS4_FromUnicode
-# define PyUnicode_FromWideChar PyUnicodeUCS4_FromWideChar
-# define PyUnicode_GetDefaultEncoding PyUnicodeUCS4_GetDefaultEncoding
-# define PyUnicode_GetMax PyUnicodeUCS4_GetMax
-# define PyUnicode_GetSize PyUnicodeUCS4_GetSize
-# define PyUnicode_Join PyUnicodeUCS4_Join
-# define PyUnicode_Partition PyUnicodeUCS4_Partition
-# define PyUnicode_RPartition PyUnicodeUCS4_RPartition
-# define PyUnicode_RSplit PyUnicodeUCS4_RSplit
-# define PyUnicode_Replace PyUnicodeUCS4_Replace
-# define PyUnicode_Resize PyUnicodeUCS4_Resize
-# define PyUnicode_RichCompare PyUnicodeUCS4_RichCompare
-# define PyUnicode_SetDefaultEncoding PyUnicodeUCS4_SetDefaultEncoding
-# define PyUnicode_Split PyUnicodeUCS4_Split
-# define PyUnicode_Splitlines PyUnicodeUCS4_Splitlines
-# define PyUnicode_Tailmatch PyUnicodeUCS4_Tailmatch
-# define PyUnicode_Translate PyUnicodeUCS4_Translate
-# define PyUnicode_TranslateCharmap PyUnicodeUCS4_TranslateCharmap
-# define _PyUnicode_AsDefaultEncodedString _PyUnicodeUCS4_AsDefaultEncodedString
-# define _PyUnicode_Fini _PyUnicodeUCS4_Fini
-# define _PyUnicode_Init _PyUnicodeUCS4_Init
-# define _PyUnicode_IsAlpha _PyUnicodeUCS4_IsAlpha
-# define _PyUnicode_IsDecimalDigit _PyUnicodeUCS4_IsDecimalDigit
-# define _PyUnicode_IsDigit _PyUnicodeUCS4_IsDigit
-# define _PyUnicode_IsLinebreak _PyUnicodeUCS4_IsLinebreak
-# define _PyUnicode_IsLowercase _PyUnicodeUCS4_IsLowercase
-# define _PyUnicode_IsNumeric _PyUnicodeUCS4_IsNumeric
-# define _PyUnicode_IsTitlecase _PyUnicodeUCS4_IsTitlecase
-# define _PyUnicode_IsUppercase _PyUnicodeUCS4_IsUppercase
-# define _PyUnicode_IsWhitespace _PyUnicodeUCS4_IsWhitespace
-# define _PyUnicode_ToDecimalDigit _PyUnicodeUCS4_ToDecimalDigit
-# define _PyUnicode_ToDigit _PyUnicodeUCS4_ToDigit
-# define _PyUnicode_ToLowercase _PyUnicodeUCS4_ToLowercase
-# define _PyUnicode_ToNumeric _PyUnicodeUCS4_ToNumeric
-# define _PyUnicode_ToTitlecase _PyUnicodeUCS4_ToTitlecase
-# define _PyUnicode_ToUppercase _PyUnicodeUCS4_ToUppercase
-
-
-#endif
-
-/* --- Internal Unicode Operations ---------------------------------------- */
-
-/* If you want Python to use the compiler's wctype.h functions instead
-   of the ones supplied with Python, define WANT_WCTYPE_FUNCTIONS or
-   configure Python using --with-wctype-functions.  This reduces the
-   interpreter's code size. */
-
-#if defined(HAVE_USABLE_WCHAR_T) && defined(WANT_WCTYPE_FUNCTIONS)
-
-#include <wctype.h>
-
-#define Py_UNICODE_ISSPACE(ch) iswspace(ch)
-
-#define Py_UNICODE_ISLOWER(ch) iswlower(ch)
-#define Py_UNICODE_ISUPPER(ch) iswupper(ch)
-#define Py_UNICODE_ISTITLE(ch) _PyUnicode_IsTitlecase(ch)
-#define Py_UNICODE_ISLINEBREAK(ch) _PyUnicode_IsLinebreak(ch)
-
-#define Py_UNICODE_TOLOWER(ch) towlower(ch)
-#define Py_UNICODE_TOUPPER(ch) towupper(ch)
-#define Py_UNICODE_TOTITLE(ch) _PyUnicode_ToTitlecase(ch)
-
-#define Py_UNICODE_ISDECIMAL(ch) _PyUnicode_IsDecimalDigit(ch)
-#define Py_UNICODE_ISDIGIT(ch) _PyUnicode_IsDigit(ch)
-#define Py_UNICODE_ISNUMERIC(ch) _PyUnicode_IsNumeric(ch)
-
-#define Py_UNICODE_TODECIMAL(ch) _PyUnicode_ToDecimalDigit(ch)
-#define Py_UNICODE_TODIGIT(ch) _PyUnicode_ToDigit(ch)
-#define Py_UNICODE_TONUMERIC(ch) _PyUnicode_ToNumeric(ch)
-
-#define Py_UNICODE_ISALPHA(ch) iswalpha(ch)
-
-#else
-
-/* Since splitting on whitespace is an important use case, and
-   whitespace in most situations is solely ASCII whitespace, we
-   optimize for the common case by using a quick look-up table
-   _Py_ascii_whitespace (see below) with an inlined check.
-
- */
-#define Py_UNICODE_ISSPACE(ch) \
-    ((ch) < 128U ? _Py_ascii_whitespace[(ch)] : _PyUnicode_IsWhitespace(ch))
-
-#define Py_UNICODE_ISLOWER(ch) _PyUnicode_IsLowercase(ch)
-#define Py_UNICODE_ISUPPER(ch) _PyUnicode_IsUppercase(ch)
-#define Py_UNICODE_ISTITLE(ch) _PyUnicode_IsTitlecase(ch)
-#define Py_UNICODE_ISLINEBREAK(ch) _PyUnicode_IsLinebreak(ch)
-
-#define Py_UNICODE_TOLOWER(ch) _PyUnicode_ToLowercase(ch)
-#define Py_UNICODE_TOUPPER(ch) _PyUnicode_ToUppercase(ch)
-#define Py_UNICODE_TOTITLE(ch) _PyUnicode_ToTitlecase(ch)
-
-#define Py_UNICODE_ISDECIMAL(ch) _PyUnicode_IsDecimalDigit(ch)
-#define Py_UNICODE_ISDIGIT(ch) _PyUnicode_IsDigit(ch)
-#define Py_UNICODE_ISNUMERIC(ch) _PyUnicode_IsNumeric(ch)
-
-#define Py_UNICODE_TODECIMAL(ch) _PyUnicode_ToDecimalDigit(ch)
-#define Py_UNICODE_TODIGIT(ch) _PyUnicode_ToDigit(ch)
-#define Py_UNICODE_TONUMERIC(ch) _PyUnicode_ToNumeric(ch)
-
-#define Py_UNICODE_ISALPHA(ch) _PyUnicode_IsAlpha(ch)
-
-#endif
-
-#define Py_UNICODE_ISALNUM(ch) \
-       (Py_UNICODE_ISALPHA(ch) || \
-    Py_UNICODE_ISDECIMAL(ch) || \
-    Py_UNICODE_ISDIGIT(ch) || \
-    Py_UNICODE_ISNUMERIC(ch))
-
-#define Py_UNICODE_COPY(target, source, length)                         \
-    Py_MEMCPY((target), (source), (length)*sizeof(Py_UNICODE))
-
-#define Py_UNICODE_FILL(target, value, length) \
-    do {Py_ssize_t i_; Py_UNICODE *t_ = (target); Py_UNICODE v_ = (value);\
+/* If the compiler provides a wchar_t type we try to support it 
+   through the interface functions PyUnicode_FromWideChar() and 
+   PyUnicode_AsWideChar(). */ 
+ 
+#ifdef HAVE_USABLE_WCHAR_T 
+# ifndef HAVE_WCHAR_H 
+#  define HAVE_WCHAR_H 
+# endif 
+#endif 
+ 
+#ifdef HAVE_WCHAR_H 
+/* Work around a cosmetic bug in BSDI 4.x wchar.h; thanks to Thomas Wouters */ 
+# ifdef _HAVE_BSDI 
+#  include <time.h> 
+# endif 
+#  include <wchar.h> 
+#endif 
+ 
+/* 
+ * Use this typedef when you need to represent a UTF-16 surrogate pair 
+ * as single unsigned integer. 
+ */ 
+#if SIZEOF_INT >= 4 
+typedef unsigned int Py_UCS4; 
+#elif SIZEOF_LONG >= 4 
+typedef unsigned long Py_UCS4; 
+#endif 
+ 
+/* Py_UNICODE is the native Unicode storage format (code unit) used by 
+   Python and represents a single Unicode element in the Unicode 
+   type. */ 
+ 
+typedef PY_UNICODE_TYPE Py_UNICODE; 
+ 
+/* --- UCS-2/UCS-4 Name Mangling ------------------------------------------ */ 
+ 
+/* Unicode API names are mangled to assure that UCS-2 and UCS-4 builds 
+   produce different external names and thus cause import errors in 
+   case Python interpreters and extensions with mixed compiled in 
+   Unicode width assumptions are combined. */ 
+ 
+#ifndef Py_UNICODE_WIDE 
+ 
+# define PyUnicode_AsASCIIString PyUnicodeUCS2_AsASCIIString 
+# define PyUnicode_AsCharmapString PyUnicodeUCS2_AsCharmapString 
+# define PyUnicode_AsEncodedObject PyUnicodeUCS2_AsEncodedObject 
+# define PyUnicode_AsEncodedString PyUnicodeUCS2_AsEncodedString 
+# define PyUnicode_AsLatin1String PyUnicodeUCS2_AsLatin1String 
+# define PyUnicode_AsRawUnicodeEscapeString PyUnicodeUCS2_AsRawUnicodeEscapeString 
+# define PyUnicode_AsUTF32String PyUnicodeUCS2_AsUTF32String 
+# define PyUnicode_AsUTF16String PyUnicodeUCS2_AsUTF16String 
+# define PyUnicode_AsUTF8String PyUnicodeUCS2_AsUTF8String 
+# define PyUnicode_AsUnicode PyUnicodeUCS2_AsUnicode 
+# define PyUnicode_AsUnicodeEscapeString PyUnicodeUCS2_AsUnicodeEscapeString 
+# define PyUnicode_AsWideChar PyUnicodeUCS2_AsWideChar 
+# define PyUnicode_ClearFreeList PyUnicodeUCS2_ClearFreelist 
+# define PyUnicode_Compare PyUnicodeUCS2_Compare 
+# define PyUnicode_Concat PyUnicodeUCS2_Concat 
+# define PyUnicode_Contains PyUnicodeUCS2_Contains 
+# define PyUnicode_Count PyUnicodeUCS2_Count 
+# define PyUnicode_Decode PyUnicodeUCS2_Decode 
+# define PyUnicode_DecodeASCII PyUnicodeUCS2_DecodeASCII 
+# define PyUnicode_DecodeCharmap PyUnicodeUCS2_DecodeCharmap 
+# define PyUnicode_DecodeLatin1 PyUnicodeUCS2_DecodeLatin1 
+# define PyUnicode_DecodeRawUnicodeEscape PyUnicodeUCS2_DecodeRawUnicodeEscape 
+# define PyUnicode_DecodeUTF32 PyUnicodeUCS2_DecodeUTF32 
+# define PyUnicode_DecodeUTF32Stateful PyUnicodeUCS2_DecodeUTF32Stateful 
+# define PyUnicode_DecodeUTF16 PyUnicodeUCS2_DecodeUTF16 
+# define PyUnicode_DecodeUTF16Stateful PyUnicodeUCS2_DecodeUTF16Stateful 
+# define PyUnicode_DecodeUTF8 PyUnicodeUCS2_DecodeUTF8 
+# define PyUnicode_DecodeUTF8Stateful PyUnicodeUCS2_DecodeUTF8Stateful 
+# define PyUnicode_DecodeUnicodeEscape PyUnicodeUCS2_DecodeUnicodeEscape 
+# define PyUnicode_Encode PyUnicodeUCS2_Encode 
+# define PyUnicode_EncodeASCII PyUnicodeUCS2_EncodeASCII 
+# define PyUnicode_EncodeCharmap PyUnicodeUCS2_EncodeCharmap 
+# define PyUnicode_EncodeDecimal PyUnicodeUCS2_EncodeDecimal 
+# define PyUnicode_EncodeLatin1 PyUnicodeUCS2_EncodeLatin1 
+# define PyUnicode_EncodeRawUnicodeEscape PyUnicodeUCS2_EncodeRawUnicodeEscape 
+# define PyUnicode_EncodeUTF32 PyUnicodeUCS2_EncodeUTF32 
+# define PyUnicode_EncodeUTF16 PyUnicodeUCS2_EncodeUTF16 
+# define PyUnicode_EncodeUTF8 PyUnicodeUCS2_EncodeUTF8 
+# define PyUnicode_EncodeUnicodeEscape PyUnicodeUCS2_EncodeUnicodeEscape 
+# define PyUnicode_Find PyUnicodeUCS2_Find 
+# define PyUnicode_Format PyUnicodeUCS2_Format 
+# define PyUnicode_FromEncodedObject PyUnicodeUCS2_FromEncodedObject 
+# define PyUnicode_FromFormat PyUnicodeUCS2_FromFormat 
+# define PyUnicode_FromFormatV PyUnicodeUCS2_FromFormatV 
+# define PyUnicode_FromObject PyUnicodeUCS2_FromObject 
+# define PyUnicode_FromOrdinal PyUnicodeUCS2_FromOrdinal 
+# define PyUnicode_FromString PyUnicodeUCS2_FromString 
+# define PyUnicode_FromStringAndSize PyUnicodeUCS2_FromStringAndSize 
+# define PyUnicode_FromUnicode PyUnicodeUCS2_FromUnicode 
+# define PyUnicode_FromWideChar PyUnicodeUCS2_FromWideChar 
+# define PyUnicode_GetDefaultEncoding PyUnicodeUCS2_GetDefaultEncoding 
+# define PyUnicode_GetMax PyUnicodeUCS2_GetMax 
+# define PyUnicode_GetSize PyUnicodeUCS2_GetSize 
+# define PyUnicode_Join PyUnicodeUCS2_Join 
+# define PyUnicode_Partition PyUnicodeUCS2_Partition 
+# define PyUnicode_RPartition PyUnicodeUCS2_RPartition 
+# define PyUnicode_RSplit PyUnicodeUCS2_RSplit 
+# define PyUnicode_Replace PyUnicodeUCS2_Replace 
+# define PyUnicode_Resize PyUnicodeUCS2_Resize 
+# define PyUnicode_RichCompare PyUnicodeUCS2_RichCompare 
+# define PyUnicode_SetDefaultEncoding PyUnicodeUCS2_SetDefaultEncoding 
+# define PyUnicode_Split PyUnicodeUCS2_Split 
+# define PyUnicode_Splitlines PyUnicodeUCS2_Splitlines 
+# define PyUnicode_Tailmatch PyUnicodeUCS2_Tailmatch 
+# define PyUnicode_Translate PyUnicodeUCS2_Translate 
+# define PyUnicode_TranslateCharmap PyUnicodeUCS2_TranslateCharmap 
+# define _PyUnicode_AsDefaultEncodedString _PyUnicodeUCS2_AsDefaultEncodedString 
+# define _PyUnicode_Fini _PyUnicodeUCS2_Fini 
+# define _PyUnicode_Init _PyUnicodeUCS2_Init 
+# define _PyUnicode_IsAlpha _PyUnicodeUCS2_IsAlpha 
+# define _PyUnicode_IsDecimalDigit _PyUnicodeUCS2_IsDecimalDigit 
+# define _PyUnicode_IsDigit _PyUnicodeUCS2_IsDigit 
+# define _PyUnicode_IsLinebreak _PyUnicodeUCS2_IsLinebreak 
+# define _PyUnicode_IsLowercase _PyUnicodeUCS2_IsLowercase 
+# define _PyUnicode_IsNumeric _PyUnicodeUCS2_IsNumeric 
+# define _PyUnicode_IsTitlecase _PyUnicodeUCS2_IsTitlecase 
+# define _PyUnicode_IsUppercase _PyUnicodeUCS2_IsUppercase 
+# define _PyUnicode_IsWhitespace _PyUnicodeUCS2_IsWhitespace 
+# define _PyUnicode_ToDecimalDigit _PyUnicodeUCS2_ToDecimalDigit 
+# define _PyUnicode_ToDigit _PyUnicodeUCS2_ToDigit 
+# define _PyUnicode_ToLowercase _PyUnicodeUCS2_ToLowercase 
+# define _PyUnicode_ToNumeric _PyUnicodeUCS2_ToNumeric 
+# define _PyUnicode_ToTitlecase _PyUnicodeUCS2_ToTitlecase 
+# define _PyUnicode_ToUppercase _PyUnicodeUCS2_ToUppercase 
+ 
+#else 
+ 
+# define PyUnicode_AsASCIIString PyUnicodeUCS4_AsASCIIString 
+# define PyUnicode_AsCharmapString PyUnicodeUCS4_AsCharmapString 
+# define PyUnicode_AsEncodedObject PyUnicodeUCS4_AsEncodedObject 
+# define PyUnicode_AsEncodedString PyUnicodeUCS4_AsEncodedString 
+# define PyUnicode_AsLatin1String PyUnicodeUCS4_AsLatin1String 
+# define PyUnicode_AsRawUnicodeEscapeString PyUnicodeUCS4_AsRawUnicodeEscapeString 
+# define PyUnicode_AsUTF32String PyUnicodeUCS4_AsUTF32String 
+# define PyUnicode_AsUTF16String PyUnicodeUCS4_AsUTF16String 
+# define PyUnicode_AsUTF8String PyUnicodeUCS4_AsUTF8String 
+# define PyUnicode_AsUnicode PyUnicodeUCS4_AsUnicode 
+# define PyUnicode_AsUnicodeEscapeString PyUnicodeUCS4_AsUnicodeEscapeString 
+# define PyUnicode_AsWideChar PyUnicodeUCS4_AsWideChar 
+# define PyUnicode_ClearFreeList PyUnicodeUCS4_ClearFreelist 
+# define PyUnicode_Compare PyUnicodeUCS4_Compare 
+# define PyUnicode_Concat PyUnicodeUCS4_Concat 
+# define PyUnicode_Contains PyUnicodeUCS4_Contains 
+# define PyUnicode_Count PyUnicodeUCS4_Count 
+# define PyUnicode_Decode PyUnicodeUCS4_Decode 
+# define PyUnicode_DecodeASCII PyUnicodeUCS4_DecodeASCII 
+# define PyUnicode_DecodeCharmap PyUnicodeUCS4_DecodeCharmap 
+# define PyUnicode_DecodeLatin1 PyUnicodeUCS4_DecodeLatin1 
+# define PyUnicode_DecodeRawUnicodeEscape PyUnicodeUCS4_DecodeRawUnicodeEscape 
+# define PyUnicode_DecodeUTF32 PyUnicodeUCS4_DecodeUTF32 
+# define PyUnicode_DecodeUTF32Stateful PyUnicodeUCS4_DecodeUTF32Stateful 
+# define PyUnicode_DecodeUTF16 PyUnicodeUCS4_DecodeUTF16 
+# define PyUnicode_DecodeUTF16Stateful PyUnicodeUCS4_DecodeUTF16Stateful 
+# define PyUnicode_DecodeUTF8 PyUnicodeUCS4_DecodeUTF8 
+# define PyUnicode_DecodeUTF8Stateful PyUnicodeUCS4_DecodeUTF8Stateful 
+# define PyUnicode_DecodeUnicodeEscape PyUnicodeUCS4_DecodeUnicodeEscape 
+# define PyUnicode_Encode PyUnicodeUCS4_Encode 
+# define PyUnicode_EncodeASCII PyUnicodeUCS4_EncodeASCII 
+# define PyUnicode_EncodeCharmap PyUnicodeUCS4_EncodeCharmap 
+# define PyUnicode_EncodeDecimal PyUnicodeUCS4_EncodeDecimal 
+# define PyUnicode_EncodeLatin1 PyUnicodeUCS4_EncodeLatin1 
+# define PyUnicode_EncodeRawUnicodeEscape PyUnicodeUCS4_EncodeRawUnicodeEscape 
+# define PyUnicode_EncodeUTF32 PyUnicodeUCS4_EncodeUTF32 
+# define PyUnicode_EncodeUTF16 PyUnicodeUCS4_EncodeUTF16 
+# define PyUnicode_EncodeUTF8 PyUnicodeUCS4_EncodeUTF8 
+# define PyUnicode_EncodeUnicodeEscape PyUnicodeUCS4_EncodeUnicodeEscape 
+# define PyUnicode_Find PyUnicodeUCS4_Find 
+# define PyUnicode_Format PyUnicodeUCS4_Format 
+# define PyUnicode_FromEncodedObject PyUnicodeUCS4_FromEncodedObject 
+# define PyUnicode_FromFormat PyUnicodeUCS4_FromFormat 
+# define PyUnicode_FromFormatV PyUnicodeUCS4_FromFormatV 
+# define PyUnicode_FromObject PyUnicodeUCS4_FromObject 
+# define PyUnicode_FromOrdinal PyUnicodeUCS4_FromOrdinal 
+# define PyUnicode_FromString PyUnicodeUCS4_FromString 
+# define PyUnicode_FromStringAndSize PyUnicodeUCS4_FromStringAndSize 
+# define PyUnicode_FromUnicode PyUnicodeUCS4_FromUnicode 
+# define PyUnicode_FromWideChar PyUnicodeUCS4_FromWideChar 
+# define PyUnicode_GetDefaultEncoding PyUnicodeUCS4_GetDefaultEncoding 
+# define PyUnicode_GetMax PyUnicodeUCS4_GetMax 
+# define PyUnicode_GetSize PyUnicodeUCS4_GetSize 
+# define PyUnicode_Join PyUnicodeUCS4_Join 
+# define PyUnicode_Partition PyUnicodeUCS4_Partition 
+# define PyUnicode_RPartition PyUnicodeUCS4_RPartition 
+# define PyUnicode_RSplit PyUnicodeUCS4_RSplit 
+# define PyUnicode_Replace PyUnicodeUCS4_Replace 
+# define PyUnicode_Resize PyUnicodeUCS4_Resize 
+# define PyUnicode_RichCompare PyUnicodeUCS4_RichCompare 
+# define PyUnicode_SetDefaultEncoding PyUnicodeUCS4_SetDefaultEncoding 
+# define PyUnicode_Split PyUnicodeUCS4_Split 
+# define PyUnicode_Splitlines PyUnicodeUCS4_Splitlines 
+# define PyUnicode_Tailmatch PyUnicodeUCS4_Tailmatch 
+# define PyUnicode_Translate PyUnicodeUCS4_Translate 
+# define PyUnicode_TranslateCharmap PyUnicodeUCS4_TranslateCharmap 
+# define _PyUnicode_AsDefaultEncodedString _PyUnicodeUCS4_AsDefaultEncodedString 
+# define _PyUnicode_Fini _PyUnicodeUCS4_Fini 
+# define _PyUnicode_Init _PyUnicodeUCS4_Init 
+# define _PyUnicode_IsAlpha _PyUnicodeUCS4_IsAlpha 
+# define _PyUnicode_IsDecimalDigit _PyUnicodeUCS4_IsDecimalDigit 
+# define _PyUnicode_IsDigit _PyUnicodeUCS4_IsDigit 
+# define _PyUnicode_IsLinebreak _PyUnicodeUCS4_IsLinebreak 
+# define _PyUnicode_IsLowercase _PyUnicodeUCS4_IsLowercase 
+# define _PyUnicode_IsNumeric _PyUnicodeUCS4_IsNumeric 
+# define _PyUnicode_IsTitlecase _PyUnicodeUCS4_IsTitlecase 
+# define _PyUnicode_IsUppercase _PyUnicodeUCS4_IsUppercase 
+# define _PyUnicode_IsWhitespace _PyUnicodeUCS4_IsWhitespace 
+# define _PyUnicode_ToDecimalDigit _PyUnicodeUCS4_ToDecimalDigit 
+# define _PyUnicode_ToDigit _PyUnicodeUCS4_ToDigit 
+# define _PyUnicode_ToLowercase _PyUnicodeUCS4_ToLowercase 
+# define _PyUnicode_ToNumeric _PyUnicodeUCS4_ToNumeric 
+# define _PyUnicode_ToTitlecase _PyUnicodeUCS4_ToTitlecase 
+# define _PyUnicode_ToUppercase _PyUnicodeUCS4_ToUppercase 
+ 
+ 
+#endif 
+ 
+/* --- Internal Unicode Operations ---------------------------------------- */ 
+ 
+/* If you want Python to use the compiler's wctype.h functions instead 
+   of the ones supplied with Python, define WANT_WCTYPE_FUNCTIONS or 
+   configure Python using --with-wctype-functions.  This reduces the 
+   interpreter's code size. */ 
+ 
+#if defined(HAVE_USABLE_WCHAR_T) && defined(WANT_WCTYPE_FUNCTIONS) 
+ 
+#include <wctype.h> 
+ 
+#define Py_UNICODE_ISSPACE(ch) iswspace(ch) 
+ 
+#define Py_UNICODE_ISLOWER(ch) iswlower(ch) 
+#define Py_UNICODE_ISUPPER(ch) iswupper(ch) 
+#define Py_UNICODE_ISTITLE(ch) _PyUnicode_IsTitlecase(ch) 
+#define Py_UNICODE_ISLINEBREAK(ch) _PyUnicode_IsLinebreak(ch) 
+ 
+#define Py_UNICODE_TOLOWER(ch) towlower(ch) 
+#define Py_UNICODE_TOUPPER(ch) towupper(ch) 
+#define Py_UNICODE_TOTITLE(ch) _PyUnicode_ToTitlecase(ch) 
+ 
+#define Py_UNICODE_ISDECIMAL(ch) _PyUnicode_IsDecimalDigit(ch) 
+#define Py_UNICODE_ISDIGIT(ch) _PyUnicode_IsDigit(ch) 
+#define Py_UNICODE_ISNUMERIC(ch) _PyUnicode_IsNumeric(ch) 
+ 
+#define Py_UNICODE_TODECIMAL(ch) _PyUnicode_ToDecimalDigit(ch) 
+#define Py_UNICODE_TODIGIT(ch) _PyUnicode_ToDigit(ch) 
+#define Py_UNICODE_TONUMERIC(ch) _PyUnicode_ToNumeric(ch) 
+ 
+#define Py_UNICODE_ISALPHA(ch) iswalpha(ch) 
+ 
+#else 
+ 
+/* Since splitting on whitespace is an important use case, and 
+   whitespace in most situations is solely ASCII whitespace, we 
+   optimize for the common case by using a quick look-up table 
+   _Py_ascii_whitespace (see below) with an inlined check. 
+ 
+ */ 
+#define Py_UNICODE_ISSPACE(ch) \ 
+    ((ch) < 128U ? _Py_ascii_whitespace[(ch)] : _PyUnicode_IsWhitespace(ch)) 
+ 
+#define Py_UNICODE_ISLOWER(ch) _PyUnicode_IsLowercase(ch) 
+#define Py_UNICODE_ISUPPER(ch) _PyUnicode_IsUppercase(ch) 
+#define Py_UNICODE_ISTITLE(ch) _PyUnicode_IsTitlecase(ch) 
+#define Py_UNICODE_ISLINEBREAK(ch) _PyUnicode_IsLinebreak(ch) 
+ 
+#define Py_UNICODE_TOLOWER(ch) _PyUnicode_ToLowercase(ch) 
+#define Py_UNICODE_TOUPPER(ch) _PyUnicode_ToUppercase(ch) 
+#define Py_UNICODE_TOTITLE(ch) _PyUnicode_ToTitlecase(ch) 
+ 
+#define Py_UNICODE_ISDECIMAL(ch) _PyUnicode_IsDecimalDigit(ch) 
+#define Py_UNICODE_ISDIGIT(ch) _PyUnicode_IsDigit(ch) 
+#define Py_UNICODE_ISNUMERIC(ch) _PyUnicode_IsNumeric(ch) 
+ 
+#define Py_UNICODE_TODECIMAL(ch) _PyUnicode_ToDecimalDigit(ch) 
+#define Py_UNICODE_TODIGIT(ch) _PyUnicode_ToDigit(ch) 
+#define Py_UNICODE_TONUMERIC(ch) _PyUnicode_ToNumeric(ch) 
+ 
+#define Py_UNICODE_ISALPHA(ch) _PyUnicode_IsAlpha(ch) 
+ 
+#endif 
+ 
+#define Py_UNICODE_ISALNUM(ch) \ 
+       (Py_UNICODE_ISALPHA(ch) || \ 
+    Py_UNICODE_ISDECIMAL(ch) || \ 
+    Py_UNICODE_ISDIGIT(ch) || \ 
+    Py_UNICODE_ISNUMERIC(ch)) 
+ 
+#define Py_UNICODE_COPY(target, source, length)                         \ 
+    Py_MEMCPY((target), (source), (length)*sizeof(Py_UNICODE)) 
+ 
+#define Py_UNICODE_FILL(target, value, length) \ 
+    do {Py_ssize_t i_; Py_UNICODE *t_ = (target); Py_UNICODE v_ = (value);\ 
         for (i_ = 0; i_ < (length); i_++) t_[i_] = v_;\
-    } while (0)
-
-/* Check if substring matches at given offset.  the offset must be
-   valid, and the substring must not be empty */
-
-#define Py_UNICODE_MATCH(string, offset, substring) \
-    ((*((string)->str + (offset)) == *((substring)->str)) && \
-    ((*((string)->str + (offset) + (substring)->length-1) == *((substring)->str + (substring)->length-1))) && \
-     !memcmp((string)->str + (offset), (substring)->str, (substring)->length*sizeof(Py_UNICODE)))
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* --- Unicode Type ------------------------------------------------------- */
-
-typedef struct {
-    PyObject_HEAD
-    Py_ssize_t length;          /* Length of raw Unicode data in buffer */
-    Py_UNICODE *str;            /* Raw Unicode buffer */
-    long hash;                  /* Hash value; -1 if not set */
-    PyObject *defenc;           /* (Default) Encoded version as Python
-                                   string, or NULL; this is used for
-                                   implementing the buffer protocol */
-} PyUnicodeObject;
-
-PyAPI_DATA(PyTypeObject) PyUnicode_Type;
-
-#define PyUnicode_Check(op) \
-                 PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_UNICODE_SUBCLASS)
-#define PyUnicode_CheckExact(op) (Py_TYPE(op) == &PyUnicode_Type)
-
-/* Fast access macros */
-#define PyUnicode_GET_SIZE(op) \
-    (((PyUnicodeObject *)(op))->length)
-#define PyUnicode_GET_DATA_SIZE(op) \
-    (((PyUnicodeObject *)(op))->length * sizeof(Py_UNICODE))
-#define PyUnicode_AS_UNICODE(op) \
-    (((PyUnicodeObject *)(op))->str)
-#define PyUnicode_AS_DATA(op) \
-    ((const char *)((PyUnicodeObject *)(op))->str)
-
-/* --- Constants ---------------------------------------------------------- */
-
-/* This Unicode character will be used as replacement character during
-   decoding if the errors argument is set to "replace". Note: the
-   Unicode character U+FFFD is the official REPLACEMENT CHARACTER in
-   Unicode 3.0. */
-
-#define Py_UNICODE_REPLACEMENT_CHARACTER ((Py_UNICODE) 0xFFFD)
-
-/* === Public API ========================================================= */
-
-/* --- Plain Py_UNICODE --------------------------------------------------- */
-
-/* Create a Unicode Object from the Py_UNICODE buffer u of the given
-   size.
-
-   u may be NULL which causes the contents to be undefined. It is the
-   user's responsibility to fill in the needed data afterwards. Note
-   that modifying the Unicode object contents after construction is
-   only allowed if u was set to NULL.
-
-   The buffer is copied into the new object. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_FromUnicode(
-    const Py_UNICODE *u,        /* Unicode buffer */
-    Py_ssize_t size             /* size of buffer */
-    );
-
-/* Similar to PyUnicode_FromUnicode(), but u points to Latin-1 encoded bytes */
-PyAPI_FUNC(PyObject*) PyUnicode_FromStringAndSize(
-    const char *u,        /* char buffer */
-    Py_ssize_t size       /* size of buffer */
-    );
-
-/* Similar to PyUnicode_FromUnicode(), but u points to null-terminated
-   Latin-1 encoded bytes */
-PyAPI_FUNC(PyObject*) PyUnicode_FromString(
-    const char *u        /* string */
-    );
-
-/* Return a read-only pointer to the Unicode object's internal
-   Py_UNICODE buffer. */
-
-PyAPI_FUNC(Py_UNICODE *) PyUnicode_AsUnicode(
-    PyObject *unicode           /* Unicode object */
-    );
-
-/* Get the length of the Unicode object. */
-
-PyAPI_FUNC(Py_ssize_t) PyUnicode_GetSize(
-    PyObject *unicode           /* Unicode object */
-    );
-
-/* Get the maximum ordinal for a Unicode character. */
-PyAPI_FUNC(Py_UNICODE) PyUnicode_GetMax(void);
-
-/* Resize an already allocated Unicode object to the new size length.
-
-   *unicode is modified to point to the new (resized) object and 0
-   returned on success.
-
-   This API may only be called by the function which also called the
-   Unicode constructor. The refcount on the object must be 1. Otherwise,
-   an error is returned.
-
-   Error handling is implemented as follows: an exception is set, -1
-   is returned and *unicode left untouched.
-
-*/
-
-PyAPI_FUNC(int) PyUnicode_Resize(
-    PyObject **unicode,         /* Pointer to the Unicode object */
-    Py_ssize_t length           /* New length */
-    );
-
+    } while (0) 
+ 
+/* Check if substring matches at given offset.  the offset must be 
+   valid, and the substring must not be empty */ 
+ 
+#define Py_UNICODE_MATCH(string, offset, substring) \ 
+    ((*((string)->str + (offset)) == *((substring)->str)) && \ 
+    ((*((string)->str + (offset) + (substring)->length-1) == *((substring)->str + (substring)->length-1))) && \ 
+     !memcmp((string)->str + (offset), (substring)->str, (substring)->length*sizeof(Py_UNICODE))) 
+ 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+/* --- Unicode Type ------------------------------------------------------- */ 
+ 
+typedef struct { 
+    PyObject_HEAD 
+    Py_ssize_t length;          /* Length of raw Unicode data in buffer */ 
+    Py_UNICODE *str;            /* Raw Unicode buffer */ 
+    long hash;                  /* Hash value; -1 if not set */ 
+    PyObject *defenc;           /* (Default) Encoded version as Python 
+                                   string, or NULL; this is used for 
+                                   implementing the buffer protocol */ 
+} PyUnicodeObject; 
+ 
+PyAPI_DATA(PyTypeObject) PyUnicode_Type; 
+ 
+#define PyUnicode_Check(op) \ 
+                 PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_UNICODE_SUBCLASS) 
+#define PyUnicode_CheckExact(op) (Py_TYPE(op) == &PyUnicode_Type) 
+ 
+/* Fast access macros */ 
+#define PyUnicode_GET_SIZE(op) \ 
+    (((PyUnicodeObject *)(op))->length) 
+#define PyUnicode_GET_DATA_SIZE(op) \ 
+    (((PyUnicodeObject *)(op))->length * sizeof(Py_UNICODE)) 
+#define PyUnicode_AS_UNICODE(op) \ 
+    (((PyUnicodeObject *)(op))->str) 
+#define PyUnicode_AS_DATA(op) \ 
+    ((const char *)((PyUnicodeObject *)(op))->str) 
+ 
+/* --- Constants ---------------------------------------------------------- */ 
+ 
+/* This Unicode character will be used as replacement character during 
+   decoding if the errors argument is set to "replace". Note: the 
+   Unicode character U+FFFD is the official REPLACEMENT CHARACTER in 
+   Unicode 3.0. */ 
+ 
+#define Py_UNICODE_REPLACEMENT_CHARACTER ((Py_UNICODE) 0xFFFD) 
+ 
+/* === Public API ========================================================= */ 
+ 
+/* --- Plain Py_UNICODE --------------------------------------------------- */ 
+ 
+/* Create a Unicode Object from the Py_UNICODE buffer u of the given 
+   size. 
+ 
+   u may be NULL which causes the contents to be undefined. It is the 
+   user's responsibility to fill in the needed data afterwards. Note 
+   that modifying the Unicode object contents after construction is 
+   only allowed if u was set to NULL. 
+ 
+   The buffer is copied into the new object. */ 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_FromUnicode( 
+    const Py_UNICODE *u,        /* Unicode buffer */ 
+    Py_ssize_t size             /* size of buffer */ 
+    ); 
+ 
+/* Similar to PyUnicode_FromUnicode(), but u points to Latin-1 encoded bytes */ 
+PyAPI_FUNC(PyObject*) PyUnicode_FromStringAndSize( 
+    const char *u,        /* char buffer */ 
+    Py_ssize_t size       /* size of buffer */ 
+    ); 
+ 
+/* Similar to PyUnicode_FromUnicode(), but u points to null-terminated 
+   Latin-1 encoded bytes */ 
+PyAPI_FUNC(PyObject*) PyUnicode_FromString( 
+    const char *u        /* string */ 
+    ); 
+ 
+/* Return a read-only pointer to the Unicode object's internal 
+   Py_UNICODE buffer. */ 
+ 
+PyAPI_FUNC(Py_UNICODE *) PyUnicode_AsUnicode( 
+    PyObject *unicode           /* Unicode object */ 
+    ); 
+ 
+/* Get the length of the Unicode object. */ 
+ 
+PyAPI_FUNC(Py_ssize_t) PyUnicode_GetSize( 
+    PyObject *unicode           /* Unicode object */ 
+    ); 
+ 
+/* Get the maximum ordinal for a Unicode character. */ 
+PyAPI_FUNC(Py_UNICODE) PyUnicode_GetMax(void); 
+ 
+/* Resize an already allocated Unicode object to the new size length. 
+ 
+   *unicode is modified to point to the new (resized) object and 0 
+   returned on success. 
+ 
+   This API may only be called by the function which also called the 
+   Unicode constructor. The refcount on the object must be 1. Otherwise, 
+   an error is returned. 
+ 
+   Error handling is implemented as follows: an exception is set, -1 
+   is returned and *unicode left untouched. 
+ 
+*/ 
+ 
+PyAPI_FUNC(int) PyUnicode_Resize( 
+    PyObject **unicode,         /* Pointer to the Unicode object */ 
+    Py_ssize_t length           /* New length */ 
+    ); 
+ 
 /* Coerce obj to a Unicode object and return a reference with
-   *incremented* refcount.
-
-   Coercion is done in the following way:
-
-   1. String and other char buffer compatible objects are decoded
-      under the assumptions that they contain data using the current
-      default encoding. Decoding is done in "strict" mode.
-
-   2. All other objects (including Unicode objects) raise an
-      exception.
-
-   The API returns NULL in case of an error. The caller is responsible
-   for decref'ing the returned objects.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_FromEncodedObject(
-    register PyObject *obj,     /* Object */
-    const char *encoding,       /* encoding */
-    const char *errors          /* error handling */
-    );
-
+   *incremented* refcount. 
+ 
+   Coercion is done in the following way: 
+ 
+   1. String and other char buffer compatible objects are decoded 
+      under the assumptions that they contain data using the current 
+      default encoding. Decoding is done in "strict" mode. 
+ 
+   2. All other objects (including Unicode objects) raise an 
+      exception. 
+ 
+   The API returns NULL in case of an error. The caller is responsible 
+   for decref'ing the returned objects. 
+ 
+*/ 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_FromEncodedObject( 
+    register PyObject *obj,     /* Object */ 
+    const char *encoding,       /* encoding */ 
+    const char *errors          /* error handling */ 
+    ); 
+ 
 /* Coerce obj to a Unicode object and return a reference with
-   *incremented* refcount.
-
-   Unicode objects are passed back as-is (subclasses are converted to
-   true Unicode objects), all other objects are delegated to
-   PyUnicode_FromEncodedObject(obj, NULL, "strict") which results in
-   using the default encoding as basis for decoding the object.
-
-   The API returns NULL in case of an error. The caller is responsible
-   for decref'ing the returned objects.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_FromObject(
-    register PyObject *obj      /* Object */
-    );
-
-PyAPI_FUNC(PyObject *) PyUnicode_FromFormatV(const char*, va_list);
-PyAPI_FUNC(PyObject *) PyUnicode_FromFormat(const char*, ...);
-
-/* Format the object based on the format_spec, as defined in PEP 3101
-   (Advanced String Formatting). */
-PyAPI_FUNC(PyObject *) _PyUnicode_FormatAdvanced(PyObject *obj,
-                                                 Py_UNICODE *format_spec,
-                                                 Py_ssize_t format_spec_len);
-
-/* --- wchar_t support for platforms which support it --------------------- */
-
-#ifdef HAVE_WCHAR_H
-
-/* Create a Unicode Object from the whcar_t buffer w of the given
-   size.
-
-   The buffer is copied into the new object. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_FromWideChar(
-    register const wchar_t *w,  /* wchar_t buffer */
-    Py_ssize_t size             /* size of buffer */
-    );
-
-/* Copies the Unicode Object contents into the wchar_t buffer w.  At
-   most size wchar_t characters are copied.
-
-   Note that the resulting wchar_t string may or may not be
-   0-terminated.  It is the responsibility of the caller to make sure
-   that the wchar_t string is 0-terminated in case this is required by
-   the application.
-
-   Returns the number of wchar_t characters copied (excluding a
-   possibly trailing 0-termination character) or -1 in case of an
-   error. */
-
-PyAPI_FUNC(Py_ssize_t) PyUnicode_AsWideChar(
-    PyUnicodeObject *unicode,   /* Unicode object */
-    register wchar_t *w,        /* wchar_t buffer */
-    Py_ssize_t size             /* size of buffer */
-    );
-
-#endif
-
-/* --- Unicode ordinals --------------------------------------------------- */
-
-/* Create a Unicode Object from the given Unicode code point ordinal.
-
-   The ordinal must be in range(0x10000) on narrow Python builds
-   (UCS2), and range(0x110000) on wide builds (UCS4). A ValueError is
-   raised in case it is not.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_FromOrdinal(int ordinal);
-
-/* --- Free-list management ----------------------------------------------- */
-
-/* Clear the free list used by the Unicode implementation.
-
-   This can be used to release memory used for objects on the free
-   list back to the Python memory allocator.
-
-*/
-
-PyAPI_FUNC(int) PyUnicode_ClearFreeList(void);
-
-/* === Builtin Codecs =====================================================
-
-   Many of these APIs take two arguments encoding and errors. These
-   parameters encoding and errors have the same semantics as the ones
-   of the builtin unicode() API.
-
-   Setting encoding to NULL causes the default encoding to be used.
-
-   Error handling is set by errors which may also be set to NULL
-   meaning to use the default handling defined for the codec. Default
-   error handling for all builtin codecs is "strict" (ValueErrors are
-   raised).
-
-   The codecs all use a similar interface. Only deviation from the
-   generic ones are documented.
-
-*/
-
-/* --- Manage the default encoding ---------------------------------------- */
-
-/* Return a Python string holding the default encoded value of the
-   Unicode object.
-
-   The resulting string is cached in the Unicode object for subsequent
-   usage by this function. The cached version is needed to implement
-   the character buffer interface and will live (at least) as long as
-   the Unicode object itself.
-
-   The refcount of the string is *not* incremented.
-
-   *** Exported for internal use by the interpreter only !!! ***
-
-*/
-
-PyAPI_FUNC(PyObject *) _PyUnicode_AsDefaultEncodedString(
-    PyObject *, const char *);
-
-/* Returns the currently active default encoding.
-
-   The default encoding is currently implemented as run-time settable
-   process global.  This may change in future versions of the
-   interpreter to become a parameter which is managed on a per-thread
-   basis.
-
- */
-
-PyAPI_FUNC(const char*) PyUnicode_GetDefaultEncoding(void);
-
-/* Sets the currently active default encoding.
-
-   Returns 0 on success, -1 in case of an error.
-
- */
-
-PyAPI_FUNC(int) PyUnicode_SetDefaultEncoding(
-    const char *encoding        /* Encoding name in standard form */
-    );
-
-/* --- Generic Codecs ----------------------------------------------------- */
-
-/* Create a Unicode object by decoding the encoded string s of the
-   given size. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_Decode(
-    const char *s,              /* encoded string */
-    Py_ssize_t size,            /* size of buffer */
-    const char *encoding,       /* encoding */
-    const char *errors          /* error handling */
-    );
-
-/* Encodes a Py_UNICODE buffer of the given size and returns a
-   Python string object. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_Encode(
-    const Py_UNICODE *s,        /* Unicode char buffer */
-    Py_ssize_t size,            /* number of Py_UNICODE chars to encode */
-    const char *encoding,       /* encoding */
-    const char *errors          /* error handling */
-    );
-
-/* Encodes a Unicode object and returns the result as Python
-   object. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedObject(
-    PyObject *unicode,          /* Unicode object */
-    const char *encoding,       /* encoding */
-    const char *errors          /* error handling */
-    );
-
-/* Encodes a Unicode object and returns the result as Python string
-   object. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedString(
-    PyObject *unicode,          /* Unicode object */
-    const char *encoding,       /* encoding */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_BuildEncodingMap(
-    PyObject* string            /* 256 character map */
-   );
-
-
-/* --- UTF-7 Codecs ------------------------------------------------------- */
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF7(
-    const char *string,         /* UTF-7 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF7Stateful(
-    const char *string,         /* UTF-7 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors,         /* error handling */
-    Py_ssize_t *consumed        /* bytes consumed */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF7(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length,                  /* number of Py_UNICODE chars to encode */
-    int base64SetO,             /* Encode RFC2152 Set O characters in base64 */
-    int base64WhiteSpace,       /* Encode whitespace (sp, ht, nl, cr) in base64 */
-    const char *errors          /* error handling */
-    );
-
-/* --- UTF-8 Codecs ------------------------------------------------------- */
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF8(
-    const char *string,         /* UTF-8 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF8Stateful(
-    const char *string,         /* UTF-8 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors,         /* error handling */
-    Py_ssize_t *consumed                /* bytes consumed */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsUTF8String(
-    PyObject *unicode           /* Unicode object */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF8(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length,                  /* number of Py_UNICODE chars to encode */
-    const char *errors          /* error handling */
-    );
-
-/* --- UTF-32 Codecs ------------------------------------------------------ */
-
-/* Decodes length bytes from a UTF-32 encoded buffer string and returns
-   the corresponding Unicode object.
-
-   errors (if non-NULL) defines the error handling. It defaults
-   to "strict".
-
-   If byteorder is non-NULL, the decoder starts decoding using the
-   given byte order:
-
-    *byteorder == -1: little endian
-    *byteorder == 0:  native order
-    *byteorder == 1:  big endian
-
-   In native mode, the first four bytes of the stream are checked for a
-   BOM mark. If found, the BOM mark is analysed, the byte order
-   adjusted and the BOM skipped.  In the other modes, no BOM mark
-   interpretation is done. After completion, *byteorder is set to the
-   current byte order at the end of input data.
-
-   If byteorder is NULL, the codec starts in native order mode.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF32(
-    const char *string,         /* UTF-32 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors,         /* error handling */
-    int *byteorder              /* pointer to byteorder to use
-                                   0=native;-1=LE,1=BE; updated on
-                                   exit */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF32Stateful(
-    const char *string,         /* UTF-32 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors,         /* error handling */
-    int *byteorder,             /* pointer to byteorder to use
-                                   0=native;-1=LE,1=BE; updated on
-                                   exit */
-    Py_ssize_t *consumed        /* bytes consumed */
-    );
-
-/* Returns a Python string using the UTF-32 encoding in native byte
-   order. The string always starts with a BOM mark.  */
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsUTF32String(
-    PyObject *unicode           /* Unicode object */
-    );
-
-/* Returns a Python string object holding the UTF-32 encoded value of
-   the Unicode data.
-
-   If byteorder is not 0, output is written according to the following
-   byte order:
-
-   byteorder == -1: little endian
-   byteorder == 0:  native byte order (writes a BOM mark)
-   byteorder == 1:  big endian
-
-   If byteorder is 0, the output string will always start with the
-   Unicode BOM mark (U+FEFF). In the other two modes, no BOM mark is
-   prepended.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF32(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length,          /* number of Py_UNICODE chars to encode */
-    const char *errors,         /* error handling */
-    int byteorder               /* byteorder to use 0=BOM+native;-1=LE,1=BE */
-    );
-
-/* --- UTF-16 Codecs ------------------------------------------------------ */
-
-/* Decodes length bytes from a UTF-16 encoded buffer string and returns
-   the corresponding Unicode object.
-
-   errors (if non-NULL) defines the error handling. It defaults
-   to "strict".
-
-   If byteorder is non-NULL, the decoder starts decoding using the
-   given byte order:
-
-    *byteorder == -1: little endian
-    *byteorder == 0:  native order
-    *byteorder == 1:  big endian
-
-   In native mode, the first two bytes of the stream are checked for a
-   BOM mark. If found, the BOM mark is analysed, the byte order
-   adjusted and the BOM skipped.  In the other modes, no BOM mark
-   interpretation is done. After completion, *byteorder is set to the
-   current byte order at the end of input data.
-
-   If byteorder is NULL, the codec starts in native order mode.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF16(
-    const char *string,         /* UTF-16 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors,         /* error handling */
-    int *byteorder              /* pointer to byteorder to use
-                                   0=native;-1=LE,1=BE; updated on
-                                   exit */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF16Stateful(
-    const char *string,         /* UTF-16 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors,         /* error handling */
-    int *byteorder,             /* pointer to byteorder to use
-                                   0=native;-1=LE,1=BE; updated on
-                                   exit */
-    Py_ssize_t *consumed                /* bytes consumed */
-    );
-
-/* Returns a Python string using the UTF-16 encoding in native byte
-   order. The string always starts with a BOM mark.  */
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsUTF16String(
-    PyObject *unicode           /* Unicode object */
-    );
-
-/* Returns a Python string object holding the UTF-16 encoded value of
-   the Unicode data.
-
-   If byteorder is not 0, output is written according to the following
-   byte order:
-
-   byteorder == -1: little endian
-   byteorder == 0:  native byte order (writes a BOM mark)
-   byteorder == 1:  big endian
-
-   If byteorder is 0, the output string will always start with the
-   Unicode BOM mark (U+FEFF). In the other two modes, no BOM mark is
-   prepended.
-
-   Note that Py_UNICODE data is being interpreted as UTF-16 reduced to
-   UCS-2. This trick makes it possible to add full UTF-16 capabilities
-   at a later point without compromising the APIs.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF16(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length,                  /* number of Py_UNICODE chars to encode */
-    const char *errors,         /* error handling */
-    int byteorder               /* byteorder to use 0=BOM+native;-1=LE,1=BE */
-    );
-
-/* --- Unicode-Escape Codecs ---------------------------------------------- */
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUnicodeEscape(
-    const char *string,         /* Unicode-Escape encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsUnicodeEscapeString(
-    PyObject *unicode           /* Unicode object */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeUnicodeEscape(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length                   /* Number of Py_UNICODE chars to encode */
-    );
-
-/* --- Raw-Unicode-Escape Codecs ------------------------------------------ */
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeRawUnicodeEscape(
-    const char *string,         /* Raw-Unicode-Escape encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsRawUnicodeEscapeString(
-    PyObject *unicode           /* Unicode object */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeRawUnicodeEscape(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length                   /* Number of Py_UNICODE chars to encode */
-    );
-
-/* --- Unicode Internal Codec ---------------------------------------------
-
-    Only for internal use in _codecsmodule.c */
-
-PyObject *_PyUnicode_DecodeUnicodeInternal(
-    const char *string,
-    Py_ssize_t length,
-    const char *errors
-    );
-
-/* --- Latin-1 Codecs -----------------------------------------------------
-
-   Note: Latin-1 corresponds to the first 256 Unicode ordinals.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeLatin1(
-    const char *string,         /* Latin-1 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsLatin1String(
-    PyObject *unicode           /* Unicode object */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeLatin1(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length,                  /* Number of Py_UNICODE chars to encode */
-    const char *errors          /* error handling */
-    );
-
-/* --- ASCII Codecs -------------------------------------------------------
-
-   Only 7-bit ASCII data is excepted. All other codes generate errors.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeASCII(
-    const char *string,         /* ASCII encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsASCIIString(
-    PyObject *unicode           /* Unicode object */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeASCII(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length,                  /* Number of Py_UNICODE chars to encode */
-    const char *errors          /* error handling */
-    );
-
-/* --- Character Map Codecs -----------------------------------------------
-
-   This codec uses mappings to encode and decode characters.
-
-   Decoding mappings must map single string characters to single
-   Unicode characters, integers (which are then interpreted as Unicode
-   ordinals) or None (meaning "undefined mapping" and causing an
-   error).
-
-   Encoding mappings must map single Unicode characters to single
-   string characters, integers (which are then interpreted as Latin-1
-   ordinals) or None (meaning "undefined mapping" and causing an
-   error).
-
-   If a character lookup fails with a LookupError, the character is
-   copied as-is meaning that its ordinal value will be interpreted as
-   Unicode or Latin-1 ordinal resp. Because of this mappings only need
-   to contain those mappings which map characters to different code
-   points.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeCharmap(
-    const char *string,         /* Encoded string */
-    Py_ssize_t length,          /* size of string */
-    PyObject *mapping,          /* character mapping
-                                   (char ordinal -> unicode ordinal) */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsCharmapString(
-    PyObject *unicode,          /* Unicode object */
-    PyObject *mapping           /* character mapping
-                                   (unicode ordinal -> char ordinal) */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeCharmap(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length,          /* Number of Py_UNICODE chars to encode */
-    PyObject *mapping,          /* character mapping
-                                   (unicode ordinal -> char ordinal) */
-    const char *errors          /* error handling */
-    );
-
-/* Translate a Py_UNICODE buffer of the given length by applying a
-   character mapping table to it and return the resulting Unicode
-   object.
-
-   The mapping table must map Unicode ordinal integers to Unicode
-   ordinal integers or None (causing deletion of the character).
-
-   Mapping tables may be dictionaries or sequences. Unmapped character
-   ordinals (ones which cause a LookupError) are left untouched and
-   are copied as-is.
-
-*/
-
-PyAPI_FUNC(PyObject *) PyUnicode_TranslateCharmap(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length,                  /* Number of Py_UNICODE chars to encode */
-    PyObject *table,            /* Translate table */
-    const char *errors          /* error handling */
-    );
-
-#ifdef MS_WIN32
-
-/* --- MBCS codecs for Windows -------------------------------------------- */
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeMBCS(
-    const char *string,         /* MBCS encoded string */
-    Py_ssize_t length,              /* size of string */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeMBCSStateful(
-    const char *string,         /* MBCS encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors,         /* error handling */
-    Py_ssize_t *consumed        /* bytes consumed */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsMBCSString(
-    PyObject *unicode           /* Unicode object */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeMBCS(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length,              /* Number of Py_UNICODE chars to encode */
-    const char *errors          /* error handling */
-    );
-
-#endif /* MS_WIN32 */
-
-/* --- Decimal Encoder ---------------------------------------------------- */
-
-/* Takes a Unicode string holding a decimal value and writes it into
-   an output buffer using standard ASCII digit codes.
-
-   The output buffer has to provide at least length+1 bytes of storage
-   area. The output string is 0-terminated.
-
-   The encoder converts whitespace to ' ', decimal characters to their
-   corresponding ASCII digit and all other Latin-1 characters except
-   \0 as-is. Characters outside this range (Unicode ordinals 1-256)
-   are treated as errors. This includes embedded NULL bytes.
-
-   Error handling is defined by the errors argument:
-
-      NULL or "strict": raise a ValueError
-      "ignore": ignore the wrong characters (these are not copied to the
-                output buffer)
-      "replace": replaces illegal characters with '?'
-
-   Returns 0 on success, -1 on failure.
-
-*/
-
-PyAPI_FUNC(int) PyUnicode_EncodeDecimal(
-    Py_UNICODE *s,              /* Unicode buffer */
-    Py_ssize_t length,                  /* Number of Py_UNICODE chars to encode */
-    char *output,               /* Output buffer; must have size >= length */
-    const char *errors          /* error handling */
-    );
-
-/* --- Methods & Slots ----------------------------------------------------
-
-   These are capable of handling Unicode objects and strings on input
-   (we refer to them as strings in the descriptions) and return
+   *incremented* refcount. 
+ 
+   Unicode objects are passed back as-is (subclasses are converted to 
+   true Unicode objects), all other objects are delegated to 
+   PyUnicode_FromEncodedObject(obj, NULL, "strict") which results in 
+   using the default encoding as basis for decoding the object. 
+ 
+   The API returns NULL in case of an error. The caller is responsible 
+   for decref'ing the returned objects. 
+ 
+*/ 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_FromObject( 
+    register PyObject *obj      /* Object */ 
+    ); 
+ 
+PyAPI_FUNC(PyObject *) PyUnicode_FromFormatV(const char*, va_list); 
+PyAPI_FUNC(PyObject *) PyUnicode_FromFormat(const char*, ...); 
+ 
+/* Format the object based on the format_spec, as defined in PEP 3101 
+   (Advanced String Formatting). */ 
+PyAPI_FUNC(PyObject *) _PyUnicode_FormatAdvanced(PyObject *obj, 
+                                                 Py_UNICODE *format_spec, 
+                                                 Py_ssize_t format_spec_len); 
+ 
+/* --- wchar_t support for platforms which support it --------------------- */ 
+ 
+#ifdef HAVE_WCHAR_H 
+ 
+/* Create a Unicode Object from the whcar_t buffer w of the given 
+   size. 
+ 
+   The buffer is copied into the new object. */ 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_FromWideChar( 
+    register const wchar_t *w,  /* wchar_t buffer */ 
+    Py_ssize_t size             /* size of buffer */ 
+    ); 
+ 
+/* Copies the Unicode Object contents into the wchar_t buffer w.  At 
+   most size wchar_t characters are copied. 
+ 
+   Note that the resulting wchar_t string may or may not be 
+   0-terminated.  It is the responsibility of the caller to make sure 
+   that the wchar_t string is 0-terminated in case this is required by 
+   the application. 
+ 
+   Returns the number of wchar_t characters copied (excluding a 
+   possibly trailing 0-termination character) or -1 in case of an 
+   error. */ 
+ 
+PyAPI_FUNC(Py_ssize_t) PyUnicode_AsWideChar( 
+    PyUnicodeObject *unicode,   /* Unicode object */ 
+    register wchar_t *w,        /* wchar_t buffer */ 
+    Py_ssize_t size             /* size of buffer */ 
+    ); 
+ 
+#endif 
+ 
+/* --- Unicode ordinals --------------------------------------------------- */ 
+ 
+/* Create a Unicode Object from the given Unicode code point ordinal. 
+ 
+   The ordinal must be in range(0x10000) on narrow Python builds 
+   (UCS2), and range(0x110000) on wide builds (UCS4). A ValueError is 
+   raised in case it is not. 
+ 
+*/ 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_FromOrdinal(int ordinal); 
+ 
+/* --- Free-list management ----------------------------------------------- */ 
+ 
+/* Clear the free list used by the Unicode implementation. 
+ 
+   This can be used to release memory used for objects on the free 
+   list back to the Python memory allocator. 
+ 
+*/ 
+ 
+PyAPI_FUNC(int) PyUnicode_ClearFreeList(void); 
+ 
+/* === Builtin Codecs ===================================================== 
+ 
+   Many of these APIs take two arguments encoding and errors. These 
+   parameters encoding and errors have the same semantics as the ones 
+   of the builtin unicode() API. 
+ 
+   Setting encoding to NULL causes the default encoding to be used. 
+ 
+   Error handling is set by errors which may also be set to NULL 
+   meaning to use the default handling defined for the codec. Default 
+   error handling for all builtin codecs is "strict" (ValueErrors are 
+   raised). 
+ 
+   The codecs all use a similar interface. Only deviation from the 
+   generic ones are documented. 
+ 
+*/ 
+ 
+/* --- Manage the default encoding ---------------------------------------- */ 
+ 
+/* Return a Python string holding the default encoded value of the 
+   Unicode object. 
+ 
+   The resulting string is cached in the Unicode object for subsequent 
+   usage by this function. The cached version is needed to implement 
+   the character buffer interface and will live (at least) as long as 
+   the Unicode object itself. 
+ 
+   The refcount of the string is *not* incremented. 
+ 
+   *** Exported for internal use by the interpreter only !!! *** 
+ 
+*/ 
+ 
+PyAPI_FUNC(PyObject *) _PyUnicode_AsDefaultEncodedString( 
+    PyObject *, const char *); 
+ 
+/* Returns the currently active default encoding. 
+ 
+   The default encoding is currently implemented as run-time settable 
+   process global.  This may change in future versions of the 
+   interpreter to become a parameter which is managed on a per-thread 
+   basis. 
+ 
+ */ 
+ 
+PyAPI_FUNC(const char*) PyUnicode_GetDefaultEncoding(void); 
+ 
+/* Sets the currently active default encoding. 
+ 
+   Returns 0 on success, -1 in case of an error. 
+ 
+ */ 
+ 
+PyAPI_FUNC(int) PyUnicode_SetDefaultEncoding( 
+    const char *encoding        /* Encoding name in standard form */ 
+    ); 
+ 
+/* --- Generic Codecs ----------------------------------------------------- */ 
+ 
+/* Create a Unicode object by decoding the encoded string s of the 
+   given size. */ 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_Decode( 
+    const char *s,              /* encoded string */ 
+    Py_ssize_t size,            /* size of buffer */ 
+    const char *encoding,       /* encoding */ 
+    const char *errors          /* error handling */ 
+    ); 
+ 
+/* Encodes a Py_UNICODE buffer of the given size and returns a 
+   Python string object. */ 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_Encode( 
+    const Py_UNICODE *s,        /* Unicode char buffer */ 
+    Py_ssize_t size,            /* number of Py_UNICODE chars to encode */ 
+    const char *encoding,       /* encoding */ 
+    const char *errors          /* error handling */ 
+    ); 
+ 
+/* Encodes a Unicode object and returns the result as Python 
+   object. */ 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedObject( 
+    PyObject *unicode,          /* Unicode object */ 
+    const char *encoding,       /* encoding */ 
+    const char *errors          /* error handling */ 
+    ); 
+ 
+/* Encodes a Unicode object and returns the result as Python string 
+   object. */ 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedString( 
+    PyObject *unicode,          /* Unicode object */ 
+    const char *encoding,       /* encoding */ 
+    const char *errors          /* error handling */ 
+    ); 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_BuildEncodingMap( 
+    PyObject* string            /* 256 character map */ 
+   ); 
+ 
+ 
+/* --- UTF-7 Codecs ------------------------------------------------------- */ 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF7( 
+    const char *string,         /* UTF-7 encoded string */ 
+    Py_ssize_t length,          /* size of string */ 
+    const char *errors          /* error handling */ 
+    ); 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF7Stateful( 
+    const char *string,         /* UTF-7 encoded string */ 
+    Py_ssize_t length,          /* size of string */ 
+    const char *errors,         /* error handling */ 
+    Py_ssize_t *consumed        /* bytes consumed */ 
+    ); 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF7( 
+    const Py_UNICODE *data,     /* Unicode char buffer */ 
+    Py_ssize_t length,                  /* number of Py_UNICODE chars to encode */ 
+    int base64SetO,             /* Encode RFC2152 Set O characters in base64 */ 
+    int base64WhiteSpace,       /* Encode whitespace (sp, ht, nl, cr) in base64 */ 
+    const char *errors          /* error handling */ 
+    ); 
+ 
+/* --- UTF-8 Codecs ------------------------------------------------------- */ 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF8( 
+    const char *string,         /* UTF-8 encoded string */ 
+    Py_ssize_t length,          /* size of string */ 
+    const char *errors          /* error handling */ 
+    ); 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF8Stateful( 
+    const char *string,         /* UTF-8 encoded string */ 
+    Py_ssize_t length,          /* size of string */ 
+    const char *errors,         /* error handling */ 
+    Py_ssize_t *consumed                /* bytes consumed */ 
+    ); 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_AsUTF8String( 
+    PyObject *unicode           /* Unicode object */ 
+    ); 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF8( 
+    const Py_UNICODE *data,     /* Unicode char buffer */ 
+    Py_ssize_t length,                  /* number of Py_UNICODE chars to encode */ 
+    const char *errors          /* error handling */ 
+    ); 
+ 
+/* --- UTF-32 Codecs ------------------------------------------------------ */ 
+ 
+/* Decodes length bytes from a UTF-32 encoded buffer string and returns 
+   the corresponding Unicode object. 
+ 
+   errors (if non-NULL) defines the error handling. It defaults 
+   to "strict". 
+ 
+   If byteorder is non-NULL, the decoder starts decoding using the 
+   given byte order: 
+ 
+    *byteorder == -1: little endian 
+    *byteorder == 0:  native order 
+    *byteorder == 1:  big endian 
+ 
+   In native mode, the first four bytes of the stream are checked for a 
+   BOM mark. If found, the BOM mark is analysed, the byte order 
+   adjusted and the BOM skipped.  In the other modes, no BOM mark 
+   interpretation is done. After completion, *byteorder is set to the 
+   current byte order at the end of input data. 
+ 
+   If byteorder is NULL, the codec starts in native order mode. 
+ 
+*/ 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF32( 
+    const char *string,         /* UTF-32 encoded string */ 
+    Py_ssize_t length,          /* size of string */ 
+    const char *errors,         /* error handling */ 
+    int *byteorder              /* pointer to byteorder to use 
+                                   0=native;-1=LE,1=BE; updated on 
+                                   exit */ 
+    ); 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF32Stateful( 
+    const char *string,         /* UTF-32 encoded string */ 
+    Py_ssize_t length,          /* size of string */ 
+    const char *errors,         /* error handling */ 
+    int *byteorder,             /* pointer to byteorder to use 
+                                   0=native;-1=LE,1=BE; updated on 
+                                   exit */ 
+    Py_ssize_t *consumed        /* bytes consumed */ 
+    ); 
+ 
+/* Returns a Python string using the UTF-32 encoding in native byte 
+   order. The string always starts with a BOM mark.  */ 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_AsUTF32String( 
+    PyObject *unicode           /* Unicode object */ 
+    ); 
+ 
+/* Returns a Python string object holding the UTF-32 encoded value of 
+   the Unicode data. 
+ 
+   If byteorder is not 0, output is written according to the following 
+   byte order: 
+ 
+   byteorder == -1: little endian 
+   byteorder == 0:  native byte order (writes a BOM mark) 
+   byteorder == 1:  big endian 
+ 
+   If byteorder is 0, the output string will always start with the 
+   Unicode BOM mark (U+FEFF). In the other two modes, no BOM mark is 
+   prepended. 
+ 
+*/ 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF32( 
+    const Py_UNICODE *data,     /* Unicode char buffer */ 
+    Py_ssize_t length,          /* number of Py_UNICODE chars to encode */ 
+    const char *errors,         /* error handling */ 
+    int byteorder               /* byteorder to use 0=BOM+native;-1=LE,1=BE */ 
+    ); 
+ 
+/* --- UTF-16 Codecs ------------------------------------------------------ */ 
+ 
+/* Decodes length bytes from a UTF-16 encoded buffer string and returns 
+   the corresponding Unicode object. 
+ 
+   errors (if non-NULL) defines the error handling. It defaults 
+   to "strict". 
+ 
+   If byteorder is non-NULL, the decoder starts decoding using the 
+   given byte order: 
+ 
+    *byteorder == -1: little endian 
+    *byteorder == 0:  native order 
+    *byteorder == 1:  big endian 
+ 
+   In native mode, the first two bytes of the stream are checked for a 
+   BOM mark. If found, the BOM mark is analysed, the byte order 
+   adjusted and the BOM skipped.  In the other modes, no BOM mark 
+   interpretation is done. After completion, *byteorder is set to the 
+   current byte order at the end of input data. 
+ 
+   If byteorder is NULL, the codec starts in native order mode. 
+ 
+*/ 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF16( 
+    const char *string,         /* UTF-16 encoded string */ 
+    Py_ssize_t length,          /* size of string */ 
+    const char *errors,         /* error handling */ 
+    int *byteorder              /* pointer to byteorder to use 
+                                   0=native;-1=LE,1=BE; updated on 
+                                   exit */ 
+    ); 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF16Stateful( 
+    const char *string,         /* UTF-16 encoded string */ 
+    Py_ssize_t length,          /* size of string */ 
+    const char *errors,         /* error handling */ 
+    int *byteorder,             /* pointer to byteorder to use 
+                                   0=native;-1=LE,1=BE; updated on 
+                                   exit */ 
+    Py_ssize_t *consumed                /* bytes consumed */ 
+    ); 
+ 
+/* Returns a Python string using the UTF-16 encoding in native byte 
+   order. The string always starts with a BOM mark.  */ 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_AsUTF16String( 
+    PyObject *unicode           /* Unicode object */ 
+    ); 
+ 
+/* Returns a Python string object holding the UTF-16 encoded value of 
+   the Unicode data. 
+ 
+   If byteorder is not 0, output is written according to the following 
+   byte order: 
+ 
+   byteorder == -1: little endian 
+   byteorder == 0:  native byte order (writes a BOM mark) 
+   byteorder == 1:  big endian 
+ 
+   If byteorder is 0, the output string will always start with the 
+   Unicode BOM mark (U+FEFF). In the other two modes, no BOM mark is 
+   prepended. 
+ 
+   Note that Py_UNICODE data is being interpreted as UTF-16 reduced to 
+   UCS-2. This trick makes it possible to add full UTF-16 capabilities 
+   at a later point without compromising the APIs. 
+ 
+*/ 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF16( 
+    const Py_UNICODE *data,     /* Unicode char buffer */ 
+    Py_ssize_t length,                  /* number of Py_UNICODE chars to encode */ 
+    const char *errors,         /* error handling */ 
+    int byteorder               /* byteorder to use 0=BOM+native;-1=LE,1=BE */ 
+    ); 
+ 
+/* --- Unicode-Escape Codecs ---------------------------------------------- */ 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeUnicodeEscape( 
+    const char *string,         /* Unicode-Escape encoded string */ 
+    Py_ssize_t length,          /* size of string */ 
+    const char *errors          /* error handling */ 
+    ); 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_AsUnicodeEscapeString( 
+    PyObject *unicode           /* Unicode object */ 
+    ); 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_EncodeUnicodeEscape( 
+    const Py_UNICODE *data,     /* Unicode char buffer */ 
+    Py_ssize_t length                   /* Number of Py_UNICODE chars to encode */ 
+    ); 
+ 
+/* --- Raw-Unicode-Escape Codecs ------------------------------------------ */ 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeRawUnicodeEscape( 
+    const char *string,         /* Raw-Unicode-Escape encoded string */ 
+    Py_ssize_t length,          /* size of string */ 
+    const char *errors          /* error handling */ 
+    ); 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_AsRawUnicodeEscapeString( 
+    PyObject *unicode           /* Unicode object */ 
+    ); 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_EncodeRawUnicodeEscape( 
+    const Py_UNICODE *data,     /* Unicode char buffer */ 
+    Py_ssize_t length                   /* Number of Py_UNICODE chars to encode */ 
+    ); 
+ 
+/* --- Unicode Internal Codec --------------------------------------------- 
+ 
+    Only for internal use in _codecsmodule.c */ 
+ 
+PyObject *_PyUnicode_DecodeUnicodeInternal( 
+    const char *string, 
+    Py_ssize_t length, 
+    const char *errors 
+    ); 
+ 
+/* --- Latin-1 Codecs ----------------------------------------------------- 
+ 
+   Note: Latin-1 corresponds to the first 256 Unicode ordinals. 
+ 
+*/ 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeLatin1( 
+    const char *string,         /* Latin-1 encoded string */ 
+    Py_ssize_t length,          /* size of string */ 
+    const char *errors          /* error handling */ 
+    ); 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_AsLatin1String( 
+    PyObject *unicode           /* Unicode object */ 
+    ); 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_EncodeLatin1( 
+    const Py_UNICODE *data,     /* Unicode char buffer */ 
+    Py_ssize_t length,                  /* Number of Py_UNICODE chars to encode */ 
+    const char *errors          /* error handling */ 
+    ); 
+ 
+/* --- ASCII Codecs ------------------------------------------------------- 
+ 
+   Only 7-bit ASCII data is excepted. All other codes generate errors. 
+ 
+*/ 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeASCII( 
+    const char *string,         /* ASCII encoded string */ 
+    Py_ssize_t length,          /* size of string */ 
+    const char *errors          /* error handling */ 
+    ); 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_AsASCIIString( 
+    PyObject *unicode           /* Unicode object */ 
+    ); 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_EncodeASCII( 
+    const Py_UNICODE *data,     /* Unicode char buffer */ 
+    Py_ssize_t length,                  /* Number of Py_UNICODE chars to encode */ 
+    const char *errors          /* error handling */ 
+    ); 
+ 
+/* --- Character Map Codecs ----------------------------------------------- 
+ 
+   This codec uses mappings to encode and decode characters. 
+ 
+   Decoding mappings must map single string characters to single 
+   Unicode characters, integers (which are then interpreted as Unicode 
+   ordinals) or None (meaning "undefined mapping" and causing an 
+   error). 
+ 
+   Encoding mappings must map single Unicode characters to single 
+   string characters, integers (which are then interpreted as Latin-1 
+   ordinals) or None (meaning "undefined mapping" and causing an 
+   error). 
+ 
+   If a character lookup fails with a LookupError, the character is 
+   copied as-is meaning that its ordinal value will be interpreted as 
+   Unicode or Latin-1 ordinal resp. Because of this mappings only need 
+   to contain those mappings which map characters to different code 
+   points. 
+ 
+*/ 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeCharmap( 
+    const char *string,         /* Encoded string */ 
+    Py_ssize_t length,          /* size of string */ 
+    PyObject *mapping,          /* character mapping 
+                                   (char ordinal -> unicode ordinal) */ 
+    const char *errors          /* error handling */ 
+    ); 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_AsCharmapString( 
+    PyObject *unicode,          /* Unicode object */ 
+    PyObject *mapping           /* character mapping 
+                                   (unicode ordinal -> char ordinal) */ 
+    ); 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_EncodeCharmap( 
+    const Py_UNICODE *data,     /* Unicode char buffer */ 
+    Py_ssize_t length,          /* Number of Py_UNICODE chars to encode */ 
+    PyObject *mapping,          /* character mapping 
+                                   (unicode ordinal -> char ordinal) */ 
+    const char *errors          /* error handling */ 
+    ); 
+ 
+/* Translate a Py_UNICODE buffer of the given length by applying a 
+   character mapping table to it and return the resulting Unicode 
+   object. 
+ 
+   The mapping table must map Unicode ordinal integers to Unicode 
+   ordinal integers or None (causing deletion of the character). 
+ 
+   Mapping tables may be dictionaries or sequences. Unmapped character 
+   ordinals (ones which cause a LookupError) are left untouched and 
+   are copied as-is. 
+ 
+*/ 
+ 
+PyAPI_FUNC(PyObject *) PyUnicode_TranslateCharmap( 
+    const Py_UNICODE *data,     /* Unicode char buffer */ 
+    Py_ssize_t length,                  /* Number of Py_UNICODE chars to encode */ 
+    PyObject *table,            /* Translate table */ 
+    const char *errors          /* error handling */ 
+    ); 
+ 
+#ifdef MS_WIN32 
+ 
+/* --- MBCS codecs for Windows -------------------------------------------- */ 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeMBCS( 
+    const char *string,         /* MBCS encoded string */ 
+    Py_ssize_t length,              /* size of string */ 
+    const char *errors          /* error handling */ 
+    ); 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeMBCSStateful( 
+    const char *string,         /* MBCS encoded string */ 
+    Py_ssize_t length,          /* size of string */ 
+    const char *errors,         /* error handling */ 
+    Py_ssize_t *consumed        /* bytes consumed */ 
+    ); 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_AsMBCSString( 
+    PyObject *unicode           /* Unicode object */ 
+    ); 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_EncodeMBCS( 
+    const Py_UNICODE *data,     /* Unicode char buffer */ 
+    Py_ssize_t length,              /* Number of Py_UNICODE chars to encode */ 
+    const char *errors          /* error handling */ 
+    ); 
+ 
+#endif /* MS_WIN32 */ 
+ 
+/* --- Decimal Encoder ---------------------------------------------------- */ 
+ 
+/* Takes a Unicode string holding a decimal value and writes it into 
+   an output buffer using standard ASCII digit codes. 
+ 
+   The output buffer has to provide at least length+1 bytes of storage 
+   area. The output string is 0-terminated. 
+ 
+   The encoder converts whitespace to ' ', decimal characters to their 
+   corresponding ASCII digit and all other Latin-1 characters except 
+   \0 as-is. Characters outside this range (Unicode ordinals 1-256) 
+   are treated as errors. This includes embedded NULL bytes. 
+ 
+   Error handling is defined by the errors argument: 
+ 
+      NULL or "strict": raise a ValueError 
+      "ignore": ignore the wrong characters (these are not copied to the 
+                output buffer) 
+      "replace": replaces illegal characters with '?' 
+ 
+   Returns 0 on success, -1 on failure. 
+ 
+*/ 
+ 
+PyAPI_FUNC(int) PyUnicode_EncodeDecimal( 
+    Py_UNICODE *s,              /* Unicode buffer */ 
+    Py_ssize_t length,                  /* Number of Py_UNICODE chars to encode */ 
+    char *output,               /* Output buffer; must have size >= length */ 
+    const char *errors          /* error handling */ 
+    ); 
+ 
+/* --- Methods & Slots ---------------------------------------------------- 
+ 
+   These are capable of handling Unicode objects and strings on input 
+   (we refer to them as strings in the descriptions) and return 
    Unicode objects or integers as appropriate. */
-
-/* Concat two strings giving a new Unicode string. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_Concat(
-    PyObject *left,             /* Left string */
-    PyObject *right             /* Right string */
-    );
-
-/* Split a string giving a list of Unicode strings.
-
-   If sep is NULL, splitting will be done at all whitespace
-   substrings. Otherwise, splits occur at the given separator.
-
-   At most maxsplit splits will be done. If negative, no limit is set.
-
-   Separators are not included in the resulting list.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_Split(
-    PyObject *s,                /* String to split */
-    PyObject *sep,              /* String separator */
-    Py_ssize_t maxsplit         /* Maxsplit count */
-    );
-
-/* Dito, but split at line breaks.
-
-   CRLF is considered to be one line break. Line breaks are not
-   included in the resulting list. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_Splitlines(
-    PyObject *s,                /* String to split */
-    int keepends                /* If true, line end markers are included */
-    );
-
-/* Partition a string using a given separator. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_Partition(
-    PyObject *s,                /* String to partition */
-    PyObject *sep               /* String separator */
-    );
-
-/* Partition a string using a given separator, searching from the end of the
-   string. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_RPartition(
-    PyObject *s,                /* String to partition */
-    PyObject *sep               /* String separator */
-    );
-
-/* Split a string giving a list of Unicode strings.
-
-   If sep is NULL, splitting will be done at all whitespace
-   substrings. Otherwise, splits occur at the given separator.
-
-   At most maxsplit splits will be done. But unlike PyUnicode_Split
-   PyUnicode_RSplit splits from the end of the string. If negative,
-   no limit is set.
-
-   Separators are not included in the resulting list.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_RSplit(
-    PyObject *s,                /* String to split */
-    PyObject *sep,              /* String separator */
-    Py_ssize_t maxsplit         /* Maxsplit count */
-    );
-
-/* Translate a string by applying a character mapping table to it and
-   return the resulting Unicode object.
-
-   The mapping table must map Unicode ordinal integers to Unicode
-   ordinal integers or None (causing deletion of the character).
-
-   Mapping tables may be dictionaries or sequences. Unmapped character
-   ordinals (ones which cause a LookupError) are left untouched and
-   are copied as-is.
-
-*/
-
-PyAPI_FUNC(PyObject *) PyUnicode_Translate(
-    PyObject *str,              /* String */
-    PyObject *table,            /* Translate table */
-    const char *errors          /* error handling */
-    );
-
-/* Join a sequence of strings using the given separator and return
-   the resulting Unicode string. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_Join(
-    PyObject *separator,        /* Separator string */
-    PyObject *seq               /* Sequence object */
-    );
-
-/* Return 1 if substr matches str[start:end] at the given tail end, 0
-   otherwise. */
-
-PyAPI_FUNC(Py_ssize_t) PyUnicode_Tailmatch(
-    PyObject *str,              /* String */
-    PyObject *substr,           /* Prefix or Suffix string */
-    Py_ssize_t start,           /* Start index */
-    Py_ssize_t end,             /* Stop index */
-    int direction               /* Tail end: -1 prefix, +1 suffix */
-    );
-
-/* Return the first position of substr in str[start:end] using the
-   given search direction or -1 if not found. -2 is returned in case
-   an error occurred and an exception is set. */
-
-PyAPI_FUNC(Py_ssize_t) PyUnicode_Find(
-    PyObject *str,              /* String */
-    PyObject *substr,           /* Substring to find */
-    Py_ssize_t start,           /* Start index */
-    Py_ssize_t end,             /* Stop index */
-    int direction               /* Find direction: +1 forward, -1 backward */
-    );
-
-/* Count the number of occurrences of substr in str[start:end]. */
-
-PyAPI_FUNC(Py_ssize_t) PyUnicode_Count(
-    PyObject *str,              /* String */
-    PyObject *substr,           /* Substring to count */
-    Py_ssize_t start,           /* Start index */
-    Py_ssize_t end              /* Stop index */
-    );
-
-/* Replace at most maxcount occurrences of substr in str with replstr
-   and return the resulting Unicode object. */
-
-PyAPI_FUNC(PyObject *) PyUnicode_Replace(
-    PyObject *str,              /* String */
-    PyObject *substr,           /* Substring to find */
-    PyObject *replstr,          /* Substring to replace */
-    Py_ssize_t maxcount         /* Max. number of replacements to apply;
-                                   -1 = all */
-    );
-
-/* Compare two strings and return -1, 0, 1 for less than, equal,
-   greater than resp. */
-
-PyAPI_FUNC(int) PyUnicode_Compare(
-    PyObject *left,             /* Left string */
-    PyObject *right             /* Right string */
-    );
-
-/* Rich compare two strings and return one of the following:
-
-   - NULL in case an exception was raised
+ 
+/* Concat two strings giving a new Unicode string. */ 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_Concat( 
+    PyObject *left,             /* Left string */ 
+    PyObject *right             /* Right string */ 
+    ); 
+ 
+/* Split a string giving a list of Unicode strings. 
+ 
+   If sep is NULL, splitting will be done at all whitespace 
+   substrings. Otherwise, splits occur at the given separator. 
+ 
+   At most maxsplit splits will be done. If negative, no limit is set. 
+ 
+   Separators are not included in the resulting list. 
+ 
+*/ 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_Split( 
+    PyObject *s,                /* String to split */ 
+    PyObject *sep,              /* String separator */ 
+    Py_ssize_t maxsplit         /* Maxsplit count */ 
+    ); 
+ 
+/* Dito, but split at line breaks. 
+ 
+   CRLF is considered to be one line break. Line breaks are not 
+   included in the resulting list. */ 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_Splitlines( 
+    PyObject *s,                /* String to split */ 
+    int keepends                /* If true, line end markers are included */ 
+    ); 
+ 
+/* Partition a string using a given separator. */ 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_Partition( 
+    PyObject *s,                /* String to partition */ 
+    PyObject *sep               /* String separator */ 
+    ); 
+ 
+/* Partition a string using a given separator, searching from the end of the 
+   string. */ 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_RPartition( 
+    PyObject *s,                /* String to partition */ 
+    PyObject *sep               /* String separator */ 
+    ); 
+ 
+/* Split a string giving a list of Unicode strings. 
+ 
+   If sep is NULL, splitting will be done at all whitespace 
+   substrings. Otherwise, splits occur at the given separator. 
+ 
+   At most maxsplit splits will be done. But unlike PyUnicode_Split 
+   PyUnicode_RSplit splits from the end of the string. If negative, 
+   no limit is set. 
+ 
+   Separators are not included in the resulting list. 
+ 
+*/ 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_RSplit( 
+    PyObject *s,                /* String to split */ 
+    PyObject *sep,              /* String separator */ 
+    Py_ssize_t maxsplit         /* Maxsplit count */ 
+    ); 
+ 
+/* Translate a string by applying a character mapping table to it and 
+   return the resulting Unicode object. 
+ 
+   The mapping table must map Unicode ordinal integers to Unicode 
+   ordinal integers or None (causing deletion of the character). 
+ 
+   Mapping tables may be dictionaries or sequences. Unmapped character 
+   ordinals (ones which cause a LookupError) are left untouched and 
+   are copied as-is. 
+ 
+*/ 
+ 
+PyAPI_FUNC(PyObject *) PyUnicode_Translate( 
+    PyObject *str,              /* String */ 
+    PyObject *table,            /* Translate table */ 
+    const char *errors          /* error handling */ 
+    ); 
+ 
+/* Join a sequence of strings using the given separator and return 
+   the resulting Unicode string. */ 
+ 
+PyAPI_FUNC(PyObject*) PyUnicode_Join( 
+    PyObject *separator,        /* Separator string */ 
+    PyObject *seq               /* Sequence object */ 
+    ); 
+ 
+/* Return 1 if substr matches str[start:end] at the given tail end, 0 
+   otherwise. */ 
+ 
+PyAPI_FUNC(Py_ssize_t) PyUnicode_Tailmatch( 
+    PyObject *str,              /* String */ 
+    PyObject *substr,           /* Prefix or Suffix string */ 
+    Py_ssize_t start,           /* Start index */ 
+    Py_ssize_t end,             /* Stop index */ 
+    int direction               /* Tail end: -1 prefix, +1 suffix */ 
+    ); 
+ 
+/* Return the first position of substr in str[start:end] using the 
+   given search direction or -1 if not found. -2 is returned in case 
+   an error occurred and an exception is set. */ 
+ 
+PyAPI_FUNC(Py_ssize_t) PyUnicode_Find( 
+    PyObject *str,              /* String */ 
+    PyObject *substr,           /* Substring to find */ 
+    Py_ssize_t start,           /* Start index */ 
+    Py_ssize_t end,             /* Stop index */ 
+    int direction               /* Find direction: +1 forward, -1 backward */ 
+    ); 
+ 
+/* Count the number of occurrences of substr in str[start:end]. */ 
+ 
+PyAPI_FUNC(Py_ssize_t) PyUnicode_Count( 
+    PyObject *str,              /* String */ 
+    PyObject *substr,           /* Substring to count */ 
+    Py_ssize_t start,           /* Start index */ 
+    Py_ssize_t end              /* Stop index */ 
+    ); 
+ 
+/* Replace at most maxcount occurrences of substr in str with replstr 
+   and return the resulting Unicode object. */ 
+ 
+PyAPI_FUNC(PyObject *) PyUnicode_Replace( 
+    PyObject *str,              /* String */ 
+    PyObject *substr,           /* Substring to find */ 
+    PyObject *replstr,          /* Substring to replace */ 
+    Py_ssize_t maxcount         /* Max. number of replacements to apply; 
+                                   -1 = all */ 
+    ); 
+ 
+/* Compare two strings and return -1, 0, 1 for less than, equal, 
+   greater than resp. */ 
+ 
+PyAPI_FUNC(int) PyUnicode_Compare( 
+    PyObject *left,             /* Left string */ 
+    PyObject *right             /* Right string */ 
+    ); 
+ 
+/* Rich compare two strings and return one of the following: 
+ 
+   - NULL in case an exception was raised 
    - Py_True or Py_False for successful comparisons
-   - Py_NotImplemented in case the type combination is unknown
-
-   Note that Py_EQ and Py_NE comparisons can cause a UnicodeWarning in
-   case the conversion of the arguments to Unicode fails with a
-   UnicodeDecodeError.
-
-   Possible values for op:
-
-     Py_GT, Py_GE, Py_EQ, Py_NE, Py_LT, Py_LE
-
-*/
-
-PyAPI_FUNC(PyObject *) PyUnicode_RichCompare(
-    PyObject *left,             /* Left string */
-    PyObject *right,            /* Right string */
-    int op                      /* Operation: Py_EQ, Py_NE, Py_GT, etc. */
-    );
-
+   - Py_NotImplemented in case the type combination is unknown 
+ 
+   Note that Py_EQ and Py_NE comparisons can cause a UnicodeWarning in 
+   case the conversion of the arguments to Unicode fails with a 
+   UnicodeDecodeError. 
+ 
+   Possible values for op: 
+ 
+     Py_GT, Py_GE, Py_EQ, Py_NE, Py_LT, Py_LE 
+ 
+*/ 
+ 
+PyAPI_FUNC(PyObject *) PyUnicode_RichCompare( 
+    PyObject *left,             /* Left string */ 
+    PyObject *right,            /* Right string */ 
+    int op                      /* Operation: Py_EQ, Py_NE, Py_GT, etc. */ 
+    ); 
+ 
 /* Apply an argument tuple or dictionary to a format string and return
-   the resulting Unicode string. */
-
-PyAPI_FUNC(PyObject *) PyUnicode_Format(
-    PyObject *format,           /* Format string */
-    PyObject *args              /* Argument tuple or dictionary */
-    );
-
-/* Checks whether element is contained in container and return 1/0
-   accordingly.
-
+   the resulting Unicode string. */ 
+ 
+PyAPI_FUNC(PyObject *) PyUnicode_Format( 
+    PyObject *format,           /* Format string */ 
+    PyObject *args              /* Argument tuple or dictionary */ 
+    ); 
+ 
+/* Checks whether element is contained in container and return 1/0 
+   accordingly. 
+ 
    element has to coerce to a one element Unicode string. -1 is
-   returned in case of an error. */
-
-PyAPI_FUNC(int) PyUnicode_Contains(
-    PyObject *container,        /* Container string */
-    PyObject *element           /* Element string */
-    );
-
-/* Externally visible for str.strip(unicode) */
-PyAPI_FUNC(PyObject *) _PyUnicode_XStrip(
-    PyUnicodeObject *self,
-    int striptype,
-    PyObject *sepobj
-    );
-
-/* === Characters Type APIs =============================================== */
-
-/* Helper array used by Py_UNICODE_ISSPACE(). */
-
-PyAPI_DATA(const unsigned char) _Py_ascii_whitespace[];
-
-/* These should not be used directly. Use the Py_UNICODE_IS* and
-   Py_UNICODE_TO* macros instead.
-
-   These APIs are implemented in Objects/unicodectype.c.
-
-*/
-
-PyAPI_FUNC(int) _PyUnicode_IsLowercase(
-    Py_UNICODE ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsUppercase(
-    Py_UNICODE ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsTitlecase(
-    Py_UNICODE ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsWhitespace(
-    const Py_UNICODE ch         /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsLinebreak(
-    const Py_UNICODE ch         /* Unicode character */
-    );
-
-PyAPI_FUNC(Py_UNICODE) _PyUnicode_ToLowercase(
-    Py_UNICODE ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(Py_UNICODE) _PyUnicode_ToUppercase(
-    Py_UNICODE ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(Py_UNICODE) _PyUnicode_ToTitlecase(
-    Py_UNICODE ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_ToDecimalDigit(
-    Py_UNICODE ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_ToDigit(
-    Py_UNICODE ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(double) _PyUnicode_ToNumeric(
-    Py_UNICODE ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsDecimalDigit(
-    Py_UNICODE ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsDigit(
-    Py_UNICODE ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsNumeric(
-    Py_UNICODE ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsAlpha(
-    Py_UNICODE ch       /* Unicode character */
-    );
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* Py_USING_UNICODE */
-#endif /* !Py_UNICODEOBJECT_H */
+   returned in case of an error. */ 
+ 
+PyAPI_FUNC(int) PyUnicode_Contains( 
+    PyObject *container,        /* Container string */ 
+    PyObject *element           /* Element string */ 
+    ); 
+ 
+/* Externally visible for str.strip(unicode) */ 
+PyAPI_FUNC(PyObject *) _PyUnicode_XStrip( 
+    PyUnicodeObject *self, 
+    int striptype, 
+    PyObject *sepobj 
+    ); 
+ 
+/* === Characters Type APIs =============================================== */ 
+ 
+/* Helper array used by Py_UNICODE_ISSPACE(). */ 
+ 
+PyAPI_DATA(const unsigned char) _Py_ascii_whitespace[]; 
+ 
+/* These should not be used directly. Use the Py_UNICODE_IS* and 
+   Py_UNICODE_TO* macros instead. 
+ 
+   These APIs are implemented in Objects/unicodectype.c. 
+ 
+*/ 
+ 
+PyAPI_FUNC(int) _PyUnicode_IsLowercase( 
+    Py_UNICODE ch       /* Unicode character */ 
+    ); 
+ 
+PyAPI_FUNC(int) _PyUnicode_IsUppercase( 
+    Py_UNICODE ch       /* Unicode character */ 
+    ); 
+ 
+PyAPI_FUNC(int) _PyUnicode_IsTitlecase( 
+    Py_UNICODE ch       /* Unicode character */ 
+    ); 
+ 
+PyAPI_FUNC(int) _PyUnicode_IsWhitespace( 
+    const Py_UNICODE ch         /* Unicode character */ 
+    ); 
+ 
+PyAPI_FUNC(int) _PyUnicode_IsLinebreak( 
+    const Py_UNICODE ch         /* Unicode character */ 
+    ); 
+ 
+PyAPI_FUNC(Py_UNICODE) _PyUnicode_ToLowercase( 
+    Py_UNICODE ch       /* Unicode character */ 
+    ); 
+ 
+PyAPI_FUNC(Py_UNICODE) _PyUnicode_ToUppercase( 
+    Py_UNICODE ch       /* Unicode character */ 
+    ); 
+ 
+PyAPI_FUNC(Py_UNICODE) _PyUnicode_ToTitlecase( 
+    Py_UNICODE ch       /* Unicode character */ 
+    ); 
+ 
+PyAPI_FUNC(int) _PyUnicode_ToDecimalDigit( 
+    Py_UNICODE ch       /* Unicode character */ 
+    ); 
+ 
+PyAPI_FUNC(int) _PyUnicode_ToDigit( 
+    Py_UNICODE ch       /* Unicode character */ 
+    ); 
+ 
+PyAPI_FUNC(double) _PyUnicode_ToNumeric( 
+    Py_UNICODE ch       /* Unicode character */ 
+    ); 
+ 
+PyAPI_FUNC(int) _PyUnicode_IsDecimalDigit( 
+    Py_UNICODE ch       /* Unicode character */ 
+    ); 
+ 
+PyAPI_FUNC(int) _PyUnicode_IsDigit( 
+    Py_UNICODE ch       /* Unicode character */ 
+    ); 
+ 
+PyAPI_FUNC(int) _PyUnicode_IsNumeric( 
+    Py_UNICODE ch       /* Unicode character */ 
+    ); 
+ 
+PyAPI_FUNC(int) _PyUnicode_IsAlpha( 
+    Py_UNICODE ch       /* Unicode character */ 
+    ); 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* Py_USING_UNICODE */ 
+#endif /* !Py_UNICODEOBJECT_H */ 
diff --git a/contrib/tools/python/src/Include/warnings.h b/contrib/tools/python/src/Include/warnings.h
index 0818d7a117..b10eaeebcc 100644
--- a/contrib/tools/python/src/Include/warnings.h
+++ b/contrib/tools/python/src/Include/warnings.h
@@ -1,23 +1,23 @@
-#ifndef Py_WARNINGS_H
-#define Py_WARNINGS_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_FUNC(void) _PyWarnings_Init(void);
-
-PyAPI_FUNC(int) PyErr_WarnEx(PyObject *, const char *, Py_ssize_t);
-PyAPI_FUNC(int) PyErr_WarnExplicit(PyObject *, const char *, const char *, int,
-                                    const char *, PyObject *);
-
-#define PyErr_WarnPy3k(msg, stacklevel) \
-  (Py_Py3kWarningFlag ? PyErr_WarnEx(PyExc_DeprecationWarning, msg, stacklevel) : 0)
-
-/* DEPRECATED: Use PyErr_WarnEx() instead. */
-#define PyErr_Warn(category, msg) PyErr_WarnEx(category, msg, 1)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_WARNINGS_H */
-
+#ifndef Py_WARNINGS_H 
+#define Py_WARNINGS_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+PyAPI_FUNC(void) _PyWarnings_Init(void); 
+ 
+PyAPI_FUNC(int) PyErr_WarnEx(PyObject *, const char *, Py_ssize_t); 
+PyAPI_FUNC(int) PyErr_WarnExplicit(PyObject *, const char *, const char *, int, 
+                                    const char *, PyObject *); 
+ 
+#define PyErr_WarnPy3k(msg, stacklevel) \ 
+  (Py_Py3kWarningFlag ? PyErr_WarnEx(PyExc_DeprecationWarning, msg, stacklevel) : 0) 
+ 
+/* DEPRECATED: Use PyErr_WarnEx() instead. */ 
+#define PyErr_Warn(category, msg) PyErr_WarnEx(category, msg, 1) 
+ 
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_WARNINGS_H */ 
+ 
diff --git a/contrib/tools/python/src/Include/weakrefobject.h b/contrib/tools/python/src/Include/weakrefobject.h
index e7c0eae539..a89fef8d64 100644
--- a/contrib/tools/python/src/Include/weakrefobject.h
+++ b/contrib/tools/python/src/Include/weakrefobject.h
@@ -1,82 +1,82 @@
-/* Weak references objects for Python. */
-
-#ifndef Py_WEAKREFOBJECT_H
-#define Py_WEAKREFOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-typedef struct _PyWeakReference PyWeakReference;
-
-/* PyWeakReference is the base struct for the Python ReferenceType, ProxyType,
- * and CallableProxyType.
- */
-struct _PyWeakReference {
-    PyObject_HEAD
-
-    /* The object to which this is a weak reference, or Py_None if none.
-     * Note that this is a stealth reference:  wr_object's refcount is
-     * not incremented to reflect this pointer.
-     */
-    PyObject *wr_object;
-
-    /* A callable to invoke when wr_object dies, or NULL if none. */
-    PyObject *wr_callback;
-
-    /* A cache for wr_object's hash code.  As usual for hashes, this is -1
-     * if the hash code isn't known yet.
-     */
-    long hash;
-
-    /* If wr_object is weakly referenced, wr_object has a doubly-linked NULL-
-     * terminated list of weak references to it.  These are the list pointers.
-     * If wr_object goes away, wr_object is set to Py_None, and these pointers
-     * have no meaning then.
-     */
-    PyWeakReference *wr_prev;
-    PyWeakReference *wr_next;
-};
-
-PyAPI_DATA(PyTypeObject) _PyWeakref_RefType;
-PyAPI_DATA(PyTypeObject) _PyWeakref_ProxyType;
-PyAPI_DATA(PyTypeObject) _PyWeakref_CallableProxyType;
-
-#define PyWeakref_CheckRef(op) PyObject_TypeCheck(op, &_PyWeakref_RefType)
-#define PyWeakref_CheckRefExact(op) \
-        (Py_TYPE(op) == &_PyWeakref_RefType)
-#define PyWeakref_CheckProxy(op) \
-        ((Py_TYPE(op) == &_PyWeakref_ProxyType) || \
-         (Py_TYPE(op) == &_PyWeakref_CallableProxyType))
-
-#define PyWeakref_Check(op) \
-        (PyWeakref_CheckRef(op) || PyWeakref_CheckProxy(op))
-
-
-PyAPI_FUNC(PyObject *) PyWeakref_NewRef(PyObject *ob,
-                                              PyObject *callback);
-PyAPI_FUNC(PyObject *) PyWeakref_NewProxy(PyObject *ob,
-                                                PyObject *callback);
-PyAPI_FUNC(PyObject *) PyWeakref_GetObject(PyObject *ref);
-
-PyAPI_FUNC(Py_ssize_t) _PyWeakref_GetWeakrefCount(PyWeakReference *head);
-
-PyAPI_FUNC(void) _PyWeakref_ClearRef(PyWeakReference *self);
-
+/* Weak references objects for Python. */ 
+ 
+#ifndef Py_WEAKREFOBJECT_H 
+#define Py_WEAKREFOBJECT_H 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
+ 
+typedef struct _PyWeakReference PyWeakReference; 
+ 
+/* PyWeakReference is the base struct for the Python ReferenceType, ProxyType, 
+ * and CallableProxyType. 
+ */ 
+struct _PyWeakReference { 
+    PyObject_HEAD 
+ 
+    /* The object to which this is a weak reference, or Py_None if none. 
+     * Note that this is a stealth reference:  wr_object's refcount is 
+     * not incremented to reflect this pointer. 
+     */ 
+    PyObject *wr_object; 
+ 
+    /* A callable to invoke when wr_object dies, or NULL if none. */ 
+    PyObject *wr_callback; 
+ 
+    /* A cache for wr_object's hash code.  As usual for hashes, this is -1 
+     * if the hash code isn't known yet. 
+     */ 
+    long hash; 
+ 
+    /* If wr_object is weakly referenced, wr_object has a doubly-linked NULL- 
+     * terminated list of weak references to it.  These are the list pointers. 
+     * If wr_object goes away, wr_object is set to Py_None, and these pointers 
+     * have no meaning then. 
+     */ 
+    PyWeakReference *wr_prev; 
+    PyWeakReference *wr_next; 
+}; 
+ 
+PyAPI_DATA(PyTypeObject) _PyWeakref_RefType; 
+PyAPI_DATA(PyTypeObject) _PyWeakref_ProxyType; 
+PyAPI_DATA(PyTypeObject) _PyWeakref_CallableProxyType; 
+ 
+#define PyWeakref_CheckRef(op) PyObject_TypeCheck(op, &_PyWeakref_RefType) 
+#define PyWeakref_CheckRefExact(op) \ 
+        (Py_TYPE(op) == &_PyWeakref_RefType) 
+#define PyWeakref_CheckProxy(op) \ 
+        ((Py_TYPE(op) == &_PyWeakref_ProxyType) || \ 
+         (Py_TYPE(op) == &_PyWeakref_CallableProxyType)) 
+ 
+#define PyWeakref_Check(op) \ 
+        (PyWeakref_CheckRef(op) || PyWeakref_CheckProxy(op)) 
+ 
+ 
+PyAPI_FUNC(PyObject *) PyWeakref_NewRef(PyObject *ob, 
+                                              PyObject *callback); 
+PyAPI_FUNC(PyObject *) PyWeakref_NewProxy(PyObject *ob, 
+                                                PyObject *callback); 
+PyAPI_FUNC(PyObject *) PyWeakref_GetObject(PyObject *ref); 
+ 
+PyAPI_FUNC(Py_ssize_t) _PyWeakref_GetWeakrefCount(PyWeakReference *head); 
+ 
+PyAPI_FUNC(void) _PyWeakref_ClearRef(PyWeakReference *self); 
+ 
 /* Explanation for the Py_REFCNT() check: when a weakref's target is part
    of a long chain of deallocations which triggers the trashcan mechanism,
    clearing the weakrefs can be delayed long after the target's refcount
    has dropped to zero.  In the meantime, code accessing the weakref will
    be able to "see" the target object even though it is supposed to be
    unreachable.  See issue #16602. */
-
+ 
 #define PyWeakref_GET_OBJECT(ref)                           \
     (Py_REFCNT(((PyWeakReference *)(ref))->wr_object) > 0   \
      ? ((PyWeakReference *)(ref))->wr_object                \
      : Py_None)
+ 
 
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_WEAKREFOBJECT_H */
+#ifdef __cplusplus 
+} 
+#endif 
+#endif /* !Py_WEAKREFOBJECT_H */ 
diff --git a/contrib/tools/python/src/LICENSE b/contrib/tools/python/src/LICENSE
index 9dc010d803..69260ff813 100644
--- a/contrib/tools/python/src/LICENSE
+++ b/contrib/tools/python/src/LICENSE
@@ -1,254 +1,254 @@
-A. HISTORY OF THE SOFTWARE
-==========================
-
-Python was created in the early 1990s by Guido van Rossum at Stichting
-Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands
-as a successor of a language called ABC.  Guido remains Python's
-principal author, although it includes many contributions from others.
-
-In 1995, Guido continued his work on Python at the Corporation for
-National Research Initiatives (CNRI, see http://www.cnri.reston.va.us)
-in Reston, Virginia where he released several versions of the
-software.
-
-In May 2000, Guido and the Python core development team moved to
-BeOpen.com to form the BeOpen PythonLabs team.  In October of the same
+A. HISTORY OF THE SOFTWARE 
+========================== 
+ 
+Python was created in the early 1990s by Guido van Rossum at Stichting 
+Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands 
+as a successor of a language called ABC.  Guido remains Python's 
+principal author, although it includes many contributions from others. 
+ 
+In 1995, Guido continued his work on Python at the Corporation for 
+National Research Initiatives (CNRI, see http://www.cnri.reston.va.us) 
+in Reston, Virginia where he released several versions of the 
+software. 
+ 
+In May 2000, Guido and the Python core development team moved to 
+BeOpen.com to form the BeOpen PythonLabs team.  In October of the same 
 year, the PythonLabs team moved to Digital Creations, which became
 Zope Corporation.  In 2001, the Python Software Foundation (PSF, see
 https://www.python.org/psf/) was formed, a non-profit organization
 created specifically to own Python-related Intellectual Property.
 Zope Corporation was a sponsoring member of the PSF.
-
-All Python releases are Open Source (see http://www.opensource.org for
-the Open Source Definition).  Historically, most, but not all, Python
-releases have also been GPL-compatible; the table below summarizes
-the various releases.
-
-    Release         Derived     Year        Owner       GPL-
-                    from                                compatible? (1)
-
-    0.9.0 thru 1.2              1991-1995   CWI         yes
-    1.3 thru 1.5.2  1.2         1995-1999   CNRI        yes
-    1.6             1.5.2       2000        CNRI        no
-    2.0             1.6         2000        BeOpen.com  no
-    1.6.1           1.6         2001        CNRI        yes (2)
-    2.1             2.0+1.6.1   2001        PSF         no
-    2.0.1           2.0+1.6.1   2001        PSF         yes
-    2.1.1           2.1+2.0.1   2001        PSF         yes
-    2.1.2           2.1.1       2002        PSF         yes
-    2.1.3           2.1.2       2002        PSF         yes
+ 
+All Python releases are Open Source (see http://www.opensource.org for 
+the Open Source Definition).  Historically, most, but not all, Python 
+releases have also been GPL-compatible; the table below summarizes 
+the various releases. 
+ 
+    Release         Derived     Year        Owner       GPL- 
+                    from                                compatible? (1) 
+ 
+    0.9.0 thru 1.2              1991-1995   CWI         yes 
+    1.3 thru 1.5.2  1.2         1995-1999   CNRI        yes 
+    1.6             1.5.2       2000        CNRI        no 
+    2.0             1.6         2000        BeOpen.com  no 
+    1.6.1           1.6         2001        CNRI        yes (2) 
+    2.1             2.0+1.6.1   2001        PSF         no 
+    2.0.1           2.0+1.6.1   2001        PSF         yes 
+    2.1.1           2.1+2.0.1   2001        PSF         yes 
+    2.1.2           2.1.1       2002        PSF         yes 
+    2.1.3           2.1.2       2002        PSF         yes 
     2.2 and above   2.1.1       2001-now    PSF         yes
-
-Footnotes:
-
-(1) GPL-compatible doesn't mean that we're distributing Python under
-    the GPL.  All Python licenses, unlike the GPL, let you distribute
-    a modified version without making your changes open source.  The
-    GPL-compatible licenses make it possible to combine Python with
-    other software that is released under the GPL; the others don't.
-
-(2) According to Richard Stallman, 1.6.1 is not GPL-compatible,
-    because its license has a choice of law clause.  According to
-    CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1
-    is "not incompatible" with the GPL.
-
-Thanks to the many outside volunteers who have worked under Guido's
-direction to make these releases possible.
-
-
-B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON
-===============================================================
-
-PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
---------------------------------------------
-
-1. This LICENSE AGREEMENT is between the Python Software Foundation
-("PSF"), and the Individual or Organization ("Licensee") accessing and
-otherwise using this software ("Python") in source or binary form and
-its associated documentation.
-
-2. Subject to the terms and conditions of this License Agreement, PSF hereby
-grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
-analyze, test, perform and/or display publicly, prepare derivative works,
-distribute, and otherwise use Python alone or in any derivative version,
-provided, however, that PSF's License Agreement and PSF's notice of copyright,
-i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+ 
+Footnotes: 
+ 
+(1) GPL-compatible doesn't mean that we're distributing Python under 
+    the GPL.  All Python licenses, unlike the GPL, let you distribute 
+    a modified version without making your changes open source.  The 
+    GPL-compatible licenses make it possible to combine Python with 
+    other software that is released under the GPL; the others don't. 
+ 
+(2) According to Richard Stallman, 1.6.1 is not GPL-compatible, 
+    because its license has a choice of law clause.  According to 
+    CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1 
+    is "not incompatible" with the GPL. 
+ 
+Thanks to the many outside volunteers who have worked under Guido's 
+direction to make these releases possible. 
+ 
+ 
+B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON 
+=============================================================== 
+ 
+PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 
+-------------------------------------------- 
+ 
+1. This LICENSE AGREEMENT is between the Python Software Foundation 
+("PSF"), and the Individual or Organization ("Licensee") accessing and 
+otherwise using this software ("Python") in source or binary form and 
+its associated documentation. 
+ 
+2. Subject to the terms and conditions of this License Agreement, PSF hereby 
+grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, 
+analyze, test, perform and/or display publicly, prepare derivative works, 
+distribute, and otherwise use Python alone or in any derivative version, 
+provided, however, that PSF's License Agreement and PSF's notice of copyright, 
+i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 
 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Python Software Foundation;
 All Rights Reserved" are retained in Python alone or in any derivative version
 prepared by Licensee.
-
-3. In the event Licensee prepares a derivative work that is based on
-or incorporates Python or any part thereof, and wants to make
-the derivative work available to others as provided herein, then
-Licensee hereby agrees to include in any such work a brief summary of
-the changes made to Python.
-
-4. PSF is making Python available to Licensee on an "AS IS"
-basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
-DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
-INFRINGE ANY THIRD PARTY RIGHTS.
-
-5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
-FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
-A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
-OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-6. This License Agreement will automatically terminate upon a material
-breach of its terms and conditions.
-
-7. Nothing in this License Agreement shall be deemed to create any
-relationship of agency, partnership, or joint venture between PSF and
-Licensee.  This License Agreement does not grant permission to use PSF
-trademarks or trade name in a trademark sense to endorse or promote
-products or services of Licensee, or any third party.
-
-8. By copying, installing or otherwise using Python, Licensee
-agrees to be bound by the terms and conditions of this License
-Agreement.
-
-
-BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0
--------------------------------------------
-
-BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
-
-1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an
-office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
-Individual or Organization ("Licensee") accessing and otherwise using
-this software in source or binary form and its associated
-documentation ("the Software").
-
-2. Subject to the terms and conditions of this BeOpen Python License
-Agreement, BeOpen hereby grants Licensee a non-exclusive,
-royalty-free, world-wide license to reproduce, analyze, test, perform
-and/or display publicly, prepare derivative works, distribute, and
-otherwise use the Software alone or in any derivative version,
-provided, however, that the BeOpen Python License is retained in the
-Software, alone or in any derivative version prepared by Licensee.
-
-3. BeOpen is making the Software available to Licensee on an "AS IS"
-basis.  BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
-DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
-INFRINGE ANY THIRD PARTY RIGHTS.
-
-4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
-SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
-AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
-DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-5. This License Agreement will automatically terminate upon a material
-breach of its terms and conditions.
-
-6. This License Agreement shall be governed by and interpreted in all
-respects by the law of the State of California, excluding conflict of
-law provisions.  Nothing in this License Agreement shall be deemed to
-create any relationship of agency, partnership, or joint venture
-between BeOpen and Licensee.  This License Agreement does not grant
-permission to use BeOpen trademarks or trade names in a trademark
-sense to endorse or promote products or services of Licensee, or any
-third party.  As an exception, the "BeOpen Python" logos available at
-http://www.pythonlabs.com/logos.html may be used according to the
-permissions granted on that web page.
-
-7. By copying, installing or otherwise using the software, Licensee
-agrees to be bound by the terms and conditions of this License
-Agreement.
-
-
-CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1
----------------------------------------
-
-1. This LICENSE AGREEMENT is between the Corporation for National
-Research Initiatives, having an office at 1895 Preston White Drive,
-Reston, VA 20191 ("CNRI"), and the Individual or Organization
-("Licensee") accessing and otherwise using Python 1.6.1 software in
-source or binary form and its associated documentation.
-
-2. Subject to the terms and conditions of this License Agreement, CNRI
-hereby grants Licensee a nonexclusive, royalty-free, world-wide
-license to reproduce, analyze, test, perform and/or display publicly,
-prepare derivative works, distribute, and otherwise use Python 1.6.1
-alone or in any derivative version, provided, however, that CNRI's
-License Agreement and CNRI's notice of copyright, i.e., "Copyright (c)
-1995-2001 Corporation for National Research Initiatives; All Rights
-Reserved" are retained in Python 1.6.1 alone or in any derivative
-version prepared by Licensee.  Alternately, in lieu of CNRI's License
-Agreement, Licensee may substitute the following text (omitting the
-quotes): "Python 1.6.1 is made available subject to the terms and
-conditions in CNRI's License Agreement.  This Agreement together with
-Python 1.6.1 may be located on the Internet using the following
-unique, persistent identifier (known as a handle): 1895.22/1013.  This
-Agreement may also be obtained from a proxy server on the Internet
-using the following URL: http://hdl.handle.net/1895.22/1013".
-
-3. In the event Licensee prepares a derivative work that is based on
-or incorporates Python 1.6.1 or any part thereof, and wants to make
-the derivative work available to others as provided herein, then
-Licensee hereby agrees to include in any such work a brief summary of
-the changes made to Python 1.6.1.
-
-4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS"
-basis.  CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
-DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT
-INFRINGE ANY THIRD PARTY RIGHTS.
-
-5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
-1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
-A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,
-OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-6. This License Agreement will automatically terminate upon a material
-breach of its terms and conditions.
-
-7. This License Agreement shall be governed by the federal
-intellectual property law of the United States, including without
-limitation the federal copyright law, and, to the extent such
-U.S. federal law does not apply, by the law of the Commonwealth of
-Virginia, excluding Virginia's conflict of law provisions.
-Notwithstanding the foregoing, with regard to derivative works based
-on Python 1.6.1 that incorporate non-separable material that was
-previously distributed under the GNU General Public License (GPL), the
-law of the Commonwealth of Virginia shall govern this License
-Agreement only as to issues arising under or with respect to
-Paragraphs 4, 5, and 7 of this License Agreement.  Nothing in this
-License Agreement shall be deemed to create any relationship of
-agency, partnership, or joint venture between CNRI and Licensee.  This
-License Agreement does not grant permission to use CNRI trademarks or
-trade name in a trademark sense to endorse or promote products or
-services of Licensee, or any third party.
-
-8. By clicking on the "ACCEPT" button where indicated, or by copying,
-installing or otherwise using Python 1.6.1, Licensee agrees to be
-bound by the terms and conditions of this License Agreement.
-
-        ACCEPT
-
-
-CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
---------------------------------------------------
-
-Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
-The Netherlands.  All rights reserved.
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Stichting Mathematisch
-Centrum or CWI not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
-FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ 
+3. In the event Licensee prepares a derivative work that is based on 
+or incorporates Python or any part thereof, and wants to make 
+the derivative work available to others as provided herein, then 
+Licensee hereby agrees to include in any such work a brief summary of 
+the changes made to Python. 
+ 
+4. PSF is making Python available to Licensee on an "AS IS" 
+basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR 
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND 
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS 
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT 
+INFRINGE ANY THIRD PARTY RIGHTS. 
+ 
+5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON 
+FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS 
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, 
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. 
+ 
+6. This License Agreement will automatically terminate upon a material 
+breach of its terms and conditions. 
+ 
+7. Nothing in this License Agreement shall be deemed to create any 
+relationship of agency, partnership, or joint venture between PSF and 
+Licensee.  This License Agreement does not grant permission to use PSF 
+trademarks or trade name in a trademark sense to endorse or promote 
+products or services of Licensee, or any third party. 
+ 
+8. By copying, installing or otherwise using Python, Licensee 
+agrees to be bound by the terms and conditions of this License 
+Agreement. 
+ 
+ 
+BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0 
+------------------------------------------- 
+ 
+BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1 
+ 
+1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an 
+office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the 
+Individual or Organization ("Licensee") accessing and otherwise using 
+this software in source or binary form and its associated 
+documentation ("the Software"). 
+ 
+2. Subject to the terms and conditions of this BeOpen Python License 
+Agreement, BeOpen hereby grants Licensee a non-exclusive, 
+royalty-free, world-wide license to reproduce, analyze, test, perform 
+and/or display publicly, prepare derivative works, distribute, and 
+otherwise use the Software alone or in any derivative version, 
+provided, however, that the BeOpen Python License is retained in the 
+Software, alone or in any derivative version prepared by Licensee. 
+ 
+3. BeOpen is making the Software available to Licensee on an "AS IS" 
+basis.  BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR 
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND 
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS 
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT 
+INFRINGE ANY THIRD PARTY RIGHTS. 
+ 
+4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE 
+SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS 
+AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY 
+DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. 
+ 
+5. This License Agreement will automatically terminate upon a material 
+breach of its terms and conditions. 
+ 
+6. This License Agreement shall be governed by and interpreted in all 
+respects by the law of the State of California, excluding conflict of 
+law provisions.  Nothing in this License Agreement shall be deemed to 
+create any relationship of agency, partnership, or joint venture 
+between BeOpen and Licensee.  This License Agreement does not grant 
+permission to use BeOpen trademarks or trade names in a trademark 
+sense to endorse or promote products or services of Licensee, or any 
+third party.  As an exception, the "BeOpen Python" logos available at 
+http://www.pythonlabs.com/logos.html may be used according to the 
+permissions granted on that web page. 
+ 
+7. By copying, installing or otherwise using the software, Licensee 
+agrees to be bound by the terms and conditions of this License 
+Agreement. 
+ 
+ 
+CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1 
+--------------------------------------- 
+ 
+1. This LICENSE AGREEMENT is between the Corporation for National 
+Research Initiatives, having an office at 1895 Preston White Drive, 
+Reston, VA 20191 ("CNRI"), and the Individual or Organization 
+("Licensee") accessing and otherwise using Python 1.6.1 software in 
+source or binary form and its associated documentation. 
+ 
+2. Subject to the terms and conditions of this License Agreement, CNRI 
+hereby grants Licensee a nonexclusive, royalty-free, world-wide 
+license to reproduce, analyze, test, perform and/or display publicly, 
+prepare derivative works, distribute, and otherwise use Python 1.6.1 
+alone or in any derivative version, provided, however, that CNRI's 
+License Agreement and CNRI's notice of copyright, i.e., "Copyright (c) 
+1995-2001 Corporation for National Research Initiatives; All Rights 
+Reserved" are retained in Python 1.6.1 alone or in any derivative 
+version prepared by Licensee.  Alternately, in lieu of CNRI's License 
+Agreement, Licensee may substitute the following text (omitting the 
+quotes): "Python 1.6.1 is made available subject to the terms and 
+conditions in CNRI's License Agreement.  This Agreement together with 
+Python 1.6.1 may be located on the Internet using the following 
+unique, persistent identifier (known as a handle): 1895.22/1013.  This 
+Agreement may also be obtained from a proxy server on the Internet 
+using the following URL: http://hdl.handle.net/1895.22/1013". 
+ 
+3. In the event Licensee prepares a derivative work that is based on 
+or incorporates Python 1.6.1 or any part thereof, and wants to make 
+the derivative work available to others as provided herein, then 
+Licensee hereby agrees to include in any such work a brief summary of 
+the changes made to Python 1.6.1. 
+ 
+4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS" 
+basis.  CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR 
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND 
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS 
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT 
+INFRINGE ANY THIRD PARTY RIGHTS. 
+ 
+5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON 
+1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS 
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1, 
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. 
+ 
+6. This License Agreement will automatically terminate upon a material 
+breach of its terms and conditions. 
+ 
+7. This License Agreement shall be governed by the federal 
+intellectual property law of the United States, including without 
+limitation the federal copyright law, and, to the extent such 
+U.S. federal law does not apply, by the law of the Commonwealth of 
+Virginia, excluding Virginia's conflict of law provisions. 
+Notwithstanding the foregoing, with regard to derivative works based 
+on Python 1.6.1 that incorporate non-separable material that was 
+previously distributed under the GNU General Public License (GPL), the 
+law of the Commonwealth of Virginia shall govern this License 
+Agreement only as to issues arising under or with respect to 
+Paragraphs 4, 5, and 7 of this License Agreement.  Nothing in this 
+License Agreement shall be deemed to create any relationship of 
+agency, partnership, or joint venture between CNRI and Licensee.  This 
+License Agreement does not grant permission to use CNRI trademarks or 
+trade name in a trademark sense to endorse or promote products or 
+services of Licensee, or any third party. 
+ 
+8. By clicking on the "ACCEPT" button where indicated, or by copying, 
+installing or otherwise using Python 1.6.1, Licensee agrees to be 
+bound by the terms and conditions of this License Agreement. 
+ 
+        ACCEPT 
+ 
+ 
+CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2 
+-------------------------------------------------- 
+ 
+Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, 
+The Netherlands.  All rights reserved. 
+ 
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that 
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Stichting Mathematisch 
+Centrum or CWI not be used in advertising or publicity pertaining to 
+distribution of the software without specific, written prior 
+permission. 
+ 
+STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO 
+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND 
+FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE 
+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT 
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 
diff --git a/contrib/tools/python/src/README b/contrib/tools/python/src/README
index 689a3e38dc..e2c5b433f9 100644
--- a/contrib/tools/python/src/README
+++ b/contrib/tools/python/src/README
@@ -1,196 +1,196 @@
 This is Python version 2.7.16
 =============================
-
-Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+ 
+Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 
 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Python Software Foundation.  All
 rights reserved.
-
-Copyright (c) 2000 BeOpen.com.
-All rights reserved.
-
-Copyright (c) 1995-2001 Corporation for National Research Initiatives.
-All rights reserved.
-
-Copyright (c) 1991-1995 Stichting Mathematisch Centrum.
-All rights reserved.
-
-
-License information
--------------------
-
-See the file "LICENSE" for information on the history of this
-software, terms & conditions for usage, and a DISCLAIMER OF ALL
-WARRANTIES.
-
-This Python distribution contains no GNU General Public Licensed
-(GPLed) code so it may be used in proprietary projects just like prior
-Python distributions.  There are interfaces to some GNU code but these
-are entirely optional.
-
-All trademarks referenced herein are property of their respective
-holders.
-
-
-What's new in this release?
----------------------------
-
-See the file "Misc/NEWS".
-
-
-If you don't read instructions
-------------------------------
-
-Congratulations on getting this far. :-)
-
-To start building right away (on UNIX): type "./configure" in the
-current directory and when it finishes, type "make".  This creates an
-executable "./python"; to install in /usr/local, first do "su root"
-and then "make install".
-
-The section `Build instructions' below is still recommended reading.
-
-
-What is Python anyway?
-----------------------
-
-Python is an interpreted, interactive object-oriented programming
-language suitable (amongst other uses) for distributed application
-development, scripting, numeric computing and system testing.  Python
-is often compared to Tcl, Perl, Java, JavaScript, Visual Basic or
-Scheme.  To find out more about what Python can do for you, point your
-browser to http://www.python.org/.
-
-
-How do I learn Python?
-----------------------
-
-The official tutorial is still a good place to start; see
-http://docs.python.org/ for online and downloadable versions, as well
-as a list of other introductions, and reference documentation.
-
-There's a quickly growing set of books on Python.  See
-http://wiki.python.org/moin/PythonBooks for a list.
-
-
-Documentation
--------------
-
-All documentation is provided online in a variety of formats.  In
-order of importance for new users: Tutorial, Library Reference,
-Language Reference, Extending & Embedding, and the Python/C API.  The
-Library Reference is especially of immense value since much of
-Python's power is described there, including the built-in data types
-and functions!
-
-All documentation is also available online at the Python web site
-(http://docs.python.org/, see below).  It is available online for occasional
-reference, or can be downloaded in many formats for faster access.  The
-documentation is downloadable in HTML, PostScript, PDF, LaTeX, and
-reStructuredText (2.6+) formats; the LaTeX and reStructuredText versions are
-primarily for documentation authors, translators, and people with special
-formatting requirements.
-
+ 
+Copyright (c) 2000 BeOpen.com. 
+All rights reserved. 
+ 
+Copyright (c) 1995-2001 Corporation for National Research Initiatives. 
+All rights reserved. 
+ 
+Copyright (c) 1991-1995 Stichting Mathematisch Centrum. 
+All rights reserved. 
+ 
+ 
+License information 
+------------------- 
+ 
+See the file "LICENSE" for information on the history of this 
+software, terms & conditions for usage, and a DISCLAIMER OF ALL 
+WARRANTIES. 
+ 
+This Python distribution contains no GNU General Public Licensed 
+(GPLed) code so it may be used in proprietary projects just like prior 
+Python distributions.  There are interfaces to some GNU code but these 
+are entirely optional. 
+ 
+All trademarks referenced herein are property of their respective 
+holders. 
+ 
+ 
+What's new in this release? 
+--------------------------- 
+ 
+See the file "Misc/NEWS". 
+ 
+ 
+If you don't read instructions 
+------------------------------ 
+ 
+Congratulations on getting this far. :-) 
+ 
+To start building right away (on UNIX): type "./configure" in the 
+current directory and when it finishes, type "make".  This creates an 
+executable "./python"; to install in /usr/local, first do "su root" 
+and then "make install". 
+ 
+The section `Build instructions' below is still recommended reading. 
+ 
+ 
+What is Python anyway? 
+---------------------- 
+ 
+Python is an interpreted, interactive object-oriented programming 
+language suitable (amongst other uses) for distributed application 
+development, scripting, numeric computing and system testing.  Python 
+is often compared to Tcl, Perl, Java, JavaScript, Visual Basic or 
+Scheme.  To find out more about what Python can do for you, point your 
+browser to http://www.python.org/. 
+ 
+ 
+How do I learn Python? 
+---------------------- 
+ 
+The official tutorial is still a good place to start; see 
+http://docs.python.org/ for online and downloadable versions, as well 
+as a list of other introductions, and reference documentation. 
+ 
+There's a quickly growing set of books on Python.  See 
+http://wiki.python.org/moin/PythonBooks for a list. 
+ 
+ 
+Documentation 
+------------- 
+ 
+All documentation is provided online in a variety of formats.  In 
+order of importance for new users: Tutorial, Library Reference, 
+Language Reference, Extending & Embedding, and the Python/C API.  The 
+Library Reference is especially of immense value since much of 
+Python's power is described there, including the built-in data types 
+and functions! 
+ 
+All documentation is also available online at the Python web site 
+(http://docs.python.org/, see below).  It is available online for occasional 
+reference, or can be downloaded in many formats for faster access.  The 
+documentation is downloadable in HTML, PostScript, PDF, LaTeX, and 
+reStructuredText (2.6+) formats; the LaTeX and reStructuredText versions are 
+primarily for documentation authors, translators, and people with special 
+formatting requirements. 
+ 
 If you would like to contribute to the development of Python, relevant
 documentation is available at:
-
+ 
     http://docs.python.org/devguide/
 
 For information about building Python's documentation, refer to Doc/README.txt.
 
 
-Web sites
----------
-
-New Python releases and related technologies are published at
-http://www.python.org/.  Come visit us!
-
-
-Newsgroups and Mailing Lists
-----------------------------
-
-Read comp.lang.python, a high-volume discussion newsgroup about
-Python, or comp.lang.python.announce, a low-volume moderated newsgroup
-for Python-related announcements.  These are also accessible as
-mailing lists: see http://www.python.org/community/lists/ for an
-overview of these and many other Python-related mailing lists.
-
-Archives are accessible via the Google Groups Usenet archive; see
-http://groups.google.com/.  The mailing lists are also archived, see
-http://www.python.org/community/lists/ for details.
-
-
-Bug reports
------------
-
-To report or search for bugs, please use the Python Bug
-Tracker at http://bugs.python.org/.
-
-
-Patches and contributions
--------------------------
-
-To submit a patch or other contribution, please use the Python Patch
-Manager at http://bugs.python.org/.  Guidelines
-for patch submission may be found at http://www.python.org/dev/patches/.
-
-If you have a proposal to change Python, you may want to send an email to the
-comp.lang.python or python-ideas mailing lists for inital feedback. A Python
-Enhancement Proposal (PEP) may be submitted if your idea gains ground. All
-current PEPs, as well as guidelines for submitting a new PEP, are listed at
-http://www.python.org/dev/peps/.
-
-
-Questions
----------
-
-For help, if you can't find it in the manuals or on the web site, it's
-best to post to the comp.lang.python or the Python mailing list (see
-above).  If you specifically don't want to involve the newsgroup or
-mailing list, send questions to help@python.org (a group of volunteers
-who answer questions as they can).  The newsgroup is the most
-efficient way to ask public questions.
-
-
-Build instructions
-==================
-
-Before you can build Python, you must first configure it.
-Fortunately, the configuration and build process has been automated
-for Unix and Linux installations, so all you usually have to do is
-type a few commands and sit back.  There are some platforms where
-things are not quite as smooth; see the platform specific notes below.
-If you want to build for multiple platforms sharing the same source
-tree, see the section on VPATH below.
-
-Start by running the script "./configure", which determines your
-system configuration and creates the Makefile.  (It takes a minute or
-two -- please be patient!)  You may want to pass options to the
-configure script -- see the section below on configuration options and
-variables.  When it's done, you are ready to run make.
-
-To build Python, you normally type "make" in the toplevel directory.
-If you have changed the configuration, the Makefile may have to be
-rebuilt.  In this case, you may have to run make again to correctly
-build your desired target.  The interpreter executable is built in the
-top level directory.
-
+Web sites 
+--------- 
+ 
+New Python releases and related technologies are published at 
+http://www.python.org/.  Come visit us! 
+ 
+ 
+Newsgroups and Mailing Lists 
+---------------------------- 
+ 
+Read comp.lang.python, a high-volume discussion newsgroup about 
+Python, or comp.lang.python.announce, a low-volume moderated newsgroup 
+for Python-related announcements.  These are also accessible as 
+mailing lists: see http://www.python.org/community/lists/ for an 
+overview of these and many other Python-related mailing lists. 
+ 
+Archives are accessible via the Google Groups Usenet archive; see 
+http://groups.google.com/.  The mailing lists are also archived, see 
+http://www.python.org/community/lists/ for details. 
+ 
+ 
+Bug reports 
+----------- 
+ 
+To report or search for bugs, please use the Python Bug 
+Tracker at http://bugs.python.org/. 
+ 
+ 
+Patches and contributions 
+------------------------- 
+ 
+To submit a patch or other contribution, please use the Python Patch 
+Manager at http://bugs.python.org/.  Guidelines 
+for patch submission may be found at http://www.python.org/dev/patches/. 
+ 
+If you have a proposal to change Python, you may want to send an email to the 
+comp.lang.python or python-ideas mailing lists for inital feedback. A Python 
+Enhancement Proposal (PEP) may be submitted if your idea gains ground. All 
+current PEPs, as well as guidelines for submitting a new PEP, are listed at 
+http://www.python.org/dev/peps/. 
+ 
+ 
+Questions 
+--------- 
+ 
+For help, if you can't find it in the manuals or on the web site, it's 
+best to post to the comp.lang.python or the Python mailing list (see 
+above).  If you specifically don't want to involve the newsgroup or 
+mailing list, send questions to help@python.org (a group of volunteers 
+who answer questions as they can).  The newsgroup is the most 
+efficient way to ask public questions. 
+ 
+ 
+Build instructions 
+================== 
+ 
+Before you can build Python, you must first configure it. 
+Fortunately, the configuration and build process has been automated 
+for Unix and Linux installations, so all you usually have to do is 
+type a few commands and sit back.  There are some platforms where 
+things are not quite as smooth; see the platform specific notes below. 
+If you want to build for multiple platforms sharing the same source 
+tree, see the section on VPATH below. 
+ 
+Start by running the script "./configure", which determines your 
+system configuration and creates the Makefile.  (It takes a minute or 
+two -- please be patient!)  You may want to pass options to the 
+configure script -- see the section below on configuration options and 
+variables.  When it's done, you are ready to run make. 
+ 
+To build Python, you normally type "make" in the toplevel directory. 
+If you have changed the configuration, the Makefile may have to be 
+rebuilt.  In this case, you may have to run make again to correctly 
+build your desired target.  The interpreter executable is built in the 
+top level directory. 
+ 
 To get an optimized build of Python, "configure --enable-optimizations" before
 you run make.  This sets the default make targets up to enable Profile Guided
 Optimization (PGO) and may be used to auto-enable Link Time Optimization (LTO)
 on some platforms.  For more details, see the sections bellow.
 
-Once you have built a Python interpreter, see the subsections below on
-testing and installation.  If you run into trouble, see the next
-section.
-
-Previous versions of Python used a manual configuration process that
-involved editing the file Modules/Setup.  While this file still exists
-and manual configuration is still supported, it is rarely needed any
-more: almost all modules are automatically built as appropriate under
-guidance of the setup.py script, which is run by Make after the
-interpreter has been built.
-
-
+Once you have built a Python interpreter, see the subsections below on 
+testing and installation.  If you run into trouble, see the next 
+section. 
+ 
+Previous versions of Python used a manual configuration process that 
+involved editing the file Modules/Setup.  While this file still exists 
+and manual configuration is still supported, it is rarely needed any 
+more: almost all modules are automatically built as appropriate under 
+guidance of the setup.py script, which is run by Make after the 
+interpreter has been built. 
+ 
+ 
 Profile Guided Optimization
 ---------------------------
 
@@ -224,1052 +224,1052 @@ boundary when building final executables or shared libraries for additional
 performance gains.
 
 
-Troubleshooting
----------------
-
-See also the platform specific notes in the next section.
-
-If you run into other trouble, see the FAQ
-(http://www.python.org/doc/faq/) for hints on what can go wrong, and
-how to fix it.
-
-If you rerun the configure script with different options, remove all
-object files by running "make clean" before rebuilding.  Believe it or
-not, "make clean" sometimes helps to clean up other inexplicable
-problems as well.  Try it before sending in a bug report!
-
-If the configure script fails or doesn't seem to find things that
-should be there, inspect the config.log file.
-
-If you get a warning for every file about the -Olimit option being no
-longer supported, you can ignore it.  There's no foolproof way to know
-whether this option is needed; all we can do is test whether it is
-accepted without error.  On some systems, e.g. older SGI compilers, it
-is essential for performance (specifically when compiling ceval.c,
-which has more basic blocks than the default limit of 1000).  If the
-warning bothers you, edit the Makefile to remove "-Olimit 1500" from
-the OPT variable.
-
-If you get failures in test_long, or sys.maxint gets set to -1, you
-are probably experiencing compiler bugs, usually related to
-optimization.  This is a common problem with some versions of gcc, and
-some vendor-supplied compilers, which can sometimes be worked around
-by turning off optimization.  Consider switching to stable versions
-(gcc 2.95.2, gcc 3.x, or contact your vendor.)
-
-From Python 2.0 onward, all Python C code is ANSI C.  Compiling using
-old K&R-C-only compilers is no longer possible.  ANSI C compilers are
-available for all modern systems, either in the form of updated
-compilers from the vendor, or one of the free compilers (gcc).
-
-If "make install" fails mysteriously during the "compiling the library"
-step, make sure that you don't have any of the PYTHONPATH or PYTHONHOME
-environment variables set, as they may interfere with the newly built
-executable which is compiling the library.
-
-Unsupported systems
--------------------
-
-A number of systems are not supported in Python 2.7 anymore. Some
-support code is still present, but will be removed in later versions.
-If you still need to use current Python versions on these systems,
-please send a message to python-dev@python.org indicating that you
-volunteer to support this system. For a more detailed discussion 
-regarding no-longer-supported and resupporting platforms, as well
-as a list of platforms that became or will be unsupported, see PEP 11.
-
-More specifically, the following systems are not supported any
-longer:
-- SunOS 4
-- DYNIX
-- dgux
-- Minix
-- NeXT
-- Irix 4 and --with-sgi-dl
-- Linux 1
+Troubleshooting 
+--------------- 
+ 
+See also the platform specific notes in the next section. 
+ 
+If you run into other trouble, see the FAQ 
+(http://www.python.org/doc/faq/) for hints on what can go wrong, and 
+how to fix it. 
+ 
+If you rerun the configure script with different options, remove all 
+object files by running "make clean" before rebuilding.  Believe it or 
+not, "make clean" sometimes helps to clean up other inexplicable 
+problems as well.  Try it before sending in a bug report! 
+ 
+If the configure script fails or doesn't seem to find things that 
+should be there, inspect the config.log file. 
+ 
+If you get a warning for every file about the -Olimit option being no 
+longer supported, you can ignore it.  There's no foolproof way to know 
+whether this option is needed; all we can do is test whether it is 
+accepted without error.  On some systems, e.g. older SGI compilers, it 
+is essential for performance (specifically when compiling ceval.c, 
+which has more basic blocks than the default limit of 1000).  If the 
+warning bothers you, edit the Makefile to remove "-Olimit 1500" from 
+the OPT variable. 
+ 
+If you get failures in test_long, or sys.maxint gets set to -1, you 
+are probably experiencing compiler bugs, usually related to 
+optimization.  This is a common problem with some versions of gcc, and 
+some vendor-supplied compilers, which can sometimes be worked around 
+by turning off optimization.  Consider switching to stable versions 
+(gcc 2.95.2, gcc 3.x, or contact your vendor.) 
+ 
+From Python 2.0 onward, all Python C code is ANSI C.  Compiling using 
+old K&R-C-only compilers is no longer possible.  ANSI C compilers are 
+available for all modern systems, either in the form of updated 
+compilers from the vendor, or one of the free compilers (gcc). 
+ 
+If "make install" fails mysteriously during the "compiling the library" 
+step, make sure that you don't have any of the PYTHONPATH or PYTHONHOME 
+environment variables set, as they may interfere with the newly built 
+executable which is compiling the library. 
+ 
+Unsupported systems 
+------------------- 
+ 
+A number of systems are not supported in Python 2.7 anymore. Some 
+support code is still present, but will be removed in later versions. 
+If you still need to use current Python versions on these systems, 
+please send a message to python-dev@python.org indicating that you 
+volunteer to support this system. For a more detailed discussion  
+regarding no-longer-supported and resupporting platforms, as well 
+as a list of platforms that became or will be unsupported, see PEP 11. 
+ 
+More specifically, the following systems are not supported any 
+longer: 
+- SunOS 4 
+- DYNIX 
+- dgux 
+- Minix 
+- NeXT 
+- Irix 4 and --with-sgi-dl 
+- Linux 1 
 - Systems defining __d6_pthread_create (configure.ac)
-- Systems defining PY_PTHREAD_D4, PY_PTHREAD_D6,
-  or PY_PTHREAD_D7 in thread_pthread.h
-- Systems using --with-dl-dld
-- Systems using --without-universal-newlines
-- MacOS 9
-- Systems using --with-wctype-functions
-- Win9x, WinME
-
-
-Platform specific notes
------------------------
-
-(Some of these may no longer apply.  If you find you can build Python
-on these platforms without the special directions mentioned here,
-submit a documentation bug report to SourceForge (see Bug Reports
-above) so we can remove them!)
-
-Unix platforms: If your vendor still ships (and you still use) Berkeley DB
-        1.85 you will need to edit Modules/Setup to build the bsddb185
-        module and add a line to sitecustomize.py which makes it the
-        default.  In Modules/Setup a line like
-
-            bsddb185 bsddbmodule.c
-
-        should work.  (You may need to add -I, -L or -l flags to direct the
-        compiler and linker to your include files and libraries.)
-
-XXX I think this next bit is out of date:
-
-64-bit platforms: The modules audioop, and imageop don't work.
-        The setup.py script disables them on 64-bit installations.
-        Don't try to enable them in the Modules/Setup file.  They
-        contain code that is quite wordsize sensitive.  (If you have a
-        fix, let us know!)
-
-Solaris: When using Sun's C compiler with threads, at least on Solaris
-        2.5.1, you need to add the "-mt" compiler option (the simplest
-        way is probably to specify the compiler with this option as
-        the "CC" environment variable when running the configure
-        script).
-
-        When using GCC on Solaris, beware of binutils 2.13 or GCC
-        versions built using it.  This mistakenly enables the
-        -zcombreloc option which creates broken shared libraries on
-        Solaris.  binutils 2.12 works, and the binutils maintainers
-        are aware of the problem.  Binutils 2.13.1 only partially
-        fixed things.  It appears that 2.13.2 solves the problem
-        completely.  This problem is known to occur with Solaris 2.7
-        and 2.8, but may also affect earlier and later versions of the
-        OS.
-
-        When the dynamic loader complains about errors finding shared
-        libraries, such as
-
-        ld.so.1: ./python: fatal: libstdc++.so.5: open failed:
-        No such file or directory
-
-        you need to first make sure that the library is available on
-        your system. Then, you need to instruct the dynamic loader how
-        to find it. You can choose any of the following strategies:
-
-        1. When compiling Python, set LD_RUN_PATH to the directories
-           containing missing libraries.
-        2. When running Python, set LD_LIBRARY_PATH to these directories.
-        3. Use crle(8) to extend the search path of the loader.
-        4. Modify the installed GCC specs file, adding -R options into the
-           *link: section.
-
-        The complex object fails to compile on Solaris 10 with gcc 3.4 (at
-        least up to 3.4.3).  To work around it, define Py_HUGE_VAL as
-        HUGE_VAL(), e.g.:
-
-          make CPPFLAGS='-D"Py_HUGE_VAL=HUGE_VAL()" -I. -I$(srcdir)/Include'
-          ./python setup.py CPPFLAGS='-D"Py_HUGE_VAL=HUGE_VAL()"'
-
-Linux:  A problem with threads and fork() was tracked down to a bug in
-        the pthreads code in glibc version 2.0.5; glibc version 2.0.7
-        solves the problem.  This causes the popen2 test to fail;
-        problem and solution reported by Pablo Bleyer.
-
-Red Hat Linux: Red Hat 9 built Python2.2 in UCS-4 mode and hacked
-        Tcl to support it. To compile Python2.3 with Tkinter, you will
-        need to pass --enable-unicode=ucs4 flag to ./configure.
-
-        There's an executable /usr/bin/python which is Python
-        1.5.2 on most older Red Hat installations; several key Red Hat tools
-        require this version.  Python 2.1.x may be installed as
-        /usr/bin/python2.  The Makefile installs Python as
-        /usr/local/bin/python, which may or may not take precedence
-        over /usr/bin/python, depending on how you have set up $PATH.
-
-FreeBSD 3.x and probably platforms with NCurses that use libmytinfo or
-        similar: When using cursesmodule, the linking is not done in
-        the correct order with the defaults.  Remove "-ltermcap" from
-        the readline entry in Setup, and use as curses entry: "curses
-        cursesmodule.c -lmytinfo -lncurses -ltermcap" - "mytinfo" (so
-        called on FreeBSD) should be the name of the auxiliary library
-        required on your platform.  Normally, it would be linked
-        automatically, but not necessarily in the correct order.
-
-BSDI:   BSDI versions before 4.1 have known problems with threads,
-        which can cause strange errors in a number of modules (for
-        instance, the 'test_signal' test script will hang forever.)
-        Turning off threads (with --with-threads=no) or upgrading to
-        BSDI 4.1 solves this problem.
-
-DEC Unix: Run configure with --with-dec-threads, or with
-        --with-threads=no if no threads are desired (threads are on by
-        default).  When using GCC, it is possible to get an internal
-        compiler error if optimization is used.  This was reported for
-        GCC 2.7.2.3 on selectmodule.c.  Manually compile the affected
-        file without optimization to solve the problem.
-
-DEC Ultrix: compile with GCC to avoid bugs in the native compiler,
-        and pass SHELL=/bin/sh5 to Make when installing.
-
-AIX:    A complete overhaul of the shared library support is now in
-        place.  See Misc/AIX-NOTES for some notes on how it's done.
-        (The optimizer bug reported at this place in previous releases
-        has been worked around by a minimal code change.) If you get
-        errors about pthread_* functions, during compile or during
-        testing, try setting CC to a thread-safe (reentrant) compiler,
-        like "cc_r".  For full C++ module support, set CC="xlC_r" (or
-        CC="xlC" without thread support).
-
-AIX 5.3: To build a 64-bit version with IBM's compiler, I used the
-        following:
-
-        export PATH=/usr/bin:/usr/vacpp/bin
-        ./configure --with-gcc="xlc_r -q64" --with-cxx="xlC_r -q64" \
-                    --disable-ipv6 AR="ar -X64"
-        make
-
-HP-UX:  When using threading, you may have to add -D_REENTRANT to the
-        OPT variable in the top-level Makefile; reported by Pat Knight,
-        this seems to make a difference (at least for HP-UX 10.20)
-        even though pyconfig.h defines it. This seems unnecessary when
-        using HP/UX 11 and later - threading seems to work "out of the
-        box".
-
-HP-UX ia64: When building on the ia64 (Itanium) platform using HP's
-        compiler, some experience has shown that the compiler's
-        optimiser produces a completely broken version of python
-        (see http://bugs.python.org/814976). To work around this,
-        edit the Makefile and remove -O from the OPT line.
-
-        To build a 64-bit executable on an Itanium 2 system using HP's
-        compiler, use these environment variables:
-
-                CC=cc
-                CXX=aCC
-                BASECFLAGS="+DD64"
-                LDFLAGS="+DD64 -lxnet"
-
-        and call configure as:
-
-                ./configure --without-gcc
-
-        then *unset* the environment variables again before running
-        make.  (At least one of these flags causes the build to fail
-        if it remains set.)  You still have to edit the Makefile and
-        remove -O from the OPT line.
-
-HP PA-RISC 2.0: A recent bug report (http://bugs.python.org/546117)
-        suggests that the C compiler in this 64-bit system has bugs
-        in the optimizer that break Python.  Compiling without
-        optimization solves the problems.
-
-SCO:    The following apply to SCO 3 only; Python builds out of the box
-        on SCO 5 (or so we've heard).
-
-        1) Everything works much better if you add -U__STDC__ to the
-        defs.  This is because all the SCO header files are broken.
-        Anything that isn't mentioned in the C standard is
-        conditionally excluded when __STDC__ is defined.
-
-        2) Due to the U.S. export restrictions, SCO broke the crypt
-        stuff out into a separate library, libcrypt_i.a so the LIBS
-        needed be set to:
-
-                LIBS=' -lsocket -lcrypt_i'
-
-UnixWare: There are known bugs in the math library of the system, as well as
-        problems in the handling of threads (calling fork in one
-        thread may interrupt system calls in others). Therefore, test_math and
-        tests involving threads will fail until those problems are fixed.
-
-QNX:    Chris Herborth (chrish@qnx.com) writes:
-        configure works best if you use GNU bash; a port is available on
-        ftp.qnx.com in /usr/free.  I used the following process to build,
-        test and install Python 1.5.x under QNX:
-
-        1) CONFIG_SHELL=/usr/local/bin/bash CC=cc RANLIB=: \
-            ./configure --verbose --without-gcc --with-libm=""
-
-        2) edit Modules/Setup to activate everything that makes sense for
-           your system... tested here at QNX with the following modules:
-
-                array, audioop, binascii, cPickle, cStringIO, cmath,
-                crypt, curses, errno, fcntl, gdbm, grp, imageop,
-                _locale, math, md5, new, operator, parser, pcre,
-                posix, pwd, readline, regex, reop,
-                select, signal, socket, soundex, strop, struct,
-                syslog, termios, time, timing, zlib, audioop, imageop
-
-        3) make SHELL=/usr/local/bin/bash
-
-           or, if you feel the need for speed:
-
-           make SHELL=/usr/local/bin/bash OPT="-5 -Oil+nrt"
-
-        4) make SHELL=/usr/local/bin/bash test
-
-           Using GNU readline 2.2 seems to behave strangely, but I
-           think that's a problem with my readline 2.2 port.  :-\
-
-        5) make SHELL=/usr/local/bin/bash install
-
-        If you get SIGSEGVs while running Python (I haven't yet, but
-        I've only run small programs and the test cases), you're
-        probably running out of stack; the default 32k could be a
-        little tight.  To increase the stack size, edit the Makefile
-        to read: LDFLAGS = -N 48k
-
-BeOS:   See Misc/BeOS-NOTES for notes about compiling/installing
-        Python on BeOS R3 or later.  Note that only the PowerPC
-        platform is supported for R3; both PowerPC and x86 are
-        supported for R4.
-
-Cray T3E: Mark Hadfield (m.hadfield@niwa.co.nz) writes:
-        Python can be built satisfactorily on a Cray T3E but based on
-        my experience with the NIWA T3E (2002-05-22, version 2.2.1)
-        there are a few bugs and gotchas. For more information see a
-        thread on comp.lang.python in May 2002 entitled "Building
-        Python on Cray T3E".
-
-        1) Use Cray's cc and not gcc. The latter was reported not to
-           work by Konrad Hinsen. It may work now, but it may not.
-
-        2) To set sys.platform to something sensible, pass the
-           following environment variable to the configure script:
-
-             MACHDEP=unicosmk
-
-        2) Run configure with option "--enable-unicode=ucs4".
-
-        3) The Cray T3E does not support dynamic linking, so extension
-           modules have to be built by adding (or uncommenting) lines
-           in Modules/Setup. The minimum set of modules is
-
-             posix, new, _sre, unicodedata
-
-           On NIWA's vanilla T3E system the following have also been
-           included successfully:
-
-             _codecs, _locale, _socket, _symtable, _testcapi, _weakref
-             array, binascii, cmath, cPickle, crypt, cStringIO, dbm
-             errno, fcntl, grp, math, md5, operator, parser, pcre, pwd
-             regex, rotor, select, struct, strop, syslog, termios
-             time, timing, xreadlines
-
-        4) Once the python executable and library have been built, make
-           will execute setup.py, which will attempt to build remaining
-           extensions and link them dynamically. Each of these attempts
-           will fail but should not halt the make process. This is
-           normal.
-
-        5) Running "make test" uses a lot of resources and causes
-           problems on our system. You might want to try running tests
-           singly or in small groups.
-
-SGI:    SGI's standard "make" utility (/bin/make or /usr/bin/make)
-        does not check whether a command actually changed the file it
-        is supposed to build.  This means that whenever you say "make"
-        it will redo the link step.  The remedy is to use SGI's much
-        smarter "smake" utility (/usr/sbin/smake), or GNU make.  If
-        you set the first line of the Makefile to #!/usr/sbin/smake
-        smake will be invoked by make (likewise for GNU make).
-
-        WARNING: There are bugs in the optimizer of some versions of
-        SGI's compilers that can cause bus errors or other strange
-        behavior, especially on numerical operations.  To avoid this,
-        try building with "make OPT=".
-
-OS/2:   If you are running Warp3 or Warp4 and have IBM's VisualAge C/C++
-        compiler installed, just change into the pc\os2vacpp directory
-        and type NMAKE.  Threading and sockets are supported by default
-        in the resulting binaries of PYTHON15.DLL and PYTHON.EXE.
-
-Reliant UNIX: The thread support does not compile on Reliant UNIX, and
-        there is a (minor) problem in the configure script for that
-        platform as well.  This should be resolved in time for a
-        future release.
-
-MacOSX: The tests will crash on both 10.1 and 10.2 with SEGV in
-        test_re and test_sre due to the small default stack size.  If
-        you set the stack size to 2048 before doing a "make test" the
-        failure can be avoided.  If you're using the tcsh or csh shells,
-        use "limit stacksize 2048" and for the bash shell (the default
-        as of OSX 10.3), use "ulimit -s 2048".
-
-        On naked Darwin you may want to add the configure option
-        "--disable-toolbox-glue" to disable the glue code for the Carbon
-        interface modules. The modules themselves are currently only built
-        if you add the --enable-framework option, see below.
-
-        On a clean OSX /usr/local does not exist. Do a
-        "sudo mkdir -m 775 /usr/local"
-        before you do a make install. It is probably not a good idea to
-        do "sudo make install" which installs everything as superuser,
-        as this may later cause problems when installing distutils-based
-        additions.
-
-        Some people have reported problems building Python after using "fink"
-        to install additional unix software. Disabling fink (remove all 
-        references to /sw from your .profile or .login) should solve this.
-
-        You may want to try the configure option "--enable-framework"
-        which installs Python as a framework. The location can be set
-        as argument to the --enable-framework option (default
-        /Library/Frameworks). A framework install is probably needed if you
-        want to use any Aqua-based GUI toolkit (whether Tkinter, wxPython,
-        Carbon, Cocoa or anything else).
-
-        You may also want to try the configure option "--enable-universalsdk"
-        which builds Python as a universal binary with support for the 
-        i386 and PPC architetures. This requires Xcode 2.1 or later to build.
-
-        See Mac/README for more information on framework and 
-        universal builds.
-
-Cygwin: With recent (relative to the time of writing, 2001-12-19)
-        Cygwin installations, there are problems with the interaction
-        of dynamic linking and fork().  This manifests itself in build
-        failures during the execution of setup.py.
-
-        There are two workarounds that both enable Python (albeit
-        without threading support) to build and pass all tests on
-        NT/2000 (and most likely XP as well, though reports of testing
-        on XP would be appreciated).
-
-        The workarounds:
-
-        (a) the band-aid fix is to link the _socket module statically
-        rather than dynamically (which is the default).
-
-        To do this, run "./configure --with-threads=no" including any
-        other options you need (--prefix, etc.).  Then in Modules/Setup
-        uncomment the lines:
-
-        #SSL=/usr/local/ssl
-        #_socket socketmodule.c \
-        #       -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
-        #       -L$(SSL)/lib -lssl -lcrypto
-
-        and remove "local/" from the SSL variable.  Finally, just run
-        "make"!
-
-        (b) The "proper" fix is to rebase the Cygwin DLLs to prevent
-        base address conflicts.  Details on how to do this can be
-        found in the following mail:
-
-           http://sources.redhat.com/ml/cygwin/2001-12/msg00894.html
-
-        It is hoped that a version of this solution will be
-        incorporated into the Cygwin distribution fairly soon.
-
-        Two additional problems:
-
-        (1) Threading support should still be disabled due to a known
-        bug in Cygwin pthreads that causes test_threadedtempfile to
-        hang.
-
-        (2) The _curses module does not build.  This is a known
-        Cygwin ncurses problem that should be resolved the next time
-        that this package is released.
-
-        On older versions of Cygwin, test_poll may hang and test_strftime
-        may fail.
-
-        The situation on 9X/Me is not accurately known at present.
-        Some time ago, there were reports that the following
-        regression tests failed:
-
-            test_pwd
-            test_select (hang)
-            test_socket
-
-        Due to the test_select hang on 9X/Me, one should run the
-        regression test using the following:
-
-            make TESTOPTS='-l -x test_select' test
-
-        News regarding these platforms with more recent Cygwin
-        versions would be appreciated!
-
-Windows: When executing Python scripts on the command line using file type
-        associations (i.e. starting "script.py" instead of "python script.py"),
-        redirects may not work unless you set a specific registry key.  See
-        the Knowledge Base article <http://support.microsoft.com/kb/321788>.
-
-
-Configuring the bsddb and dbm modules
--------------------------------------
-
-Beginning with Python version 2.3, the PyBsddb package
-<http://pybsddb.sf.net/> was adopted into Python as the bsddb package,
-exposing a set of package-level functions which provide
-backwards-compatible behavior.  Only versions 3.3 through 4.4 of
-Sleepycat's libraries provide the necessary API, so older versions
-aren't supported through this interface.  The old bsddb module has
-been retained as bsddb185, though it is not built by default.  Users
-wishing to use it will have to tweak Modules/Setup to build it.  The
-dbm module will still be built against the Sleepycat libraries if
-other preferred alternatives (ndbm, gdbm) are not found.
-
-Building the sqlite3 module
----------------------------
-
-To build the sqlite3 module, you'll need the sqlite3 or libsqlite3
-packages installed, including the header files. Many modern operating
-systems distribute the headers in a separate package to the library -
-often it will be the same name as the main package, but with a -dev or
--devel suffix. 
-
-The version of pysqlite2 that's including in Python needs sqlite3 3.0.8
-or later. setup.py attempts to check that it can find a correct version.
-
-Configuring threads
--------------------
-
-As of Python 2.0, threads are enabled by default.  If you wish to
-compile without threads, or if your thread support is broken, pass the
---with-threads=no switch to configure.  Unfortunately, on some
-platforms, additional compiler and/or linker options are required for
-threads to work properly.  Below is a table of those options,
-collected by Bill Janssen.  We would love to automate this process
-more, but the information below is not enough to write a patch for the
+- Systems defining PY_PTHREAD_D4, PY_PTHREAD_D6, 
+  or PY_PTHREAD_D7 in thread_pthread.h 
+- Systems using --with-dl-dld 
+- Systems using --without-universal-newlines 
+- MacOS 9 
+- Systems using --with-wctype-functions 
+- Win9x, WinME 
+ 
+ 
+Platform specific notes 
+----------------------- 
+ 
+(Some of these may no longer apply.  If you find you can build Python 
+on these platforms without the special directions mentioned here, 
+submit a documentation bug report to SourceForge (see Bug Reports 
+above) so we can remove them!) 
+ 
+Unix platforms: If your vendor still ships (and you still use) Berkeley DB 
+        1.85 you will need to edit Modules/Setup to build the bsddb185 
+        module and add a line to sitecustomize.py which makes it the 
+        default.  In Modules/Setup a line like 
+ 
+            bsddb185 bsddbmodule.c 
+ 
+        should work.  (You may need to add -I, -L or -l flags to direct the 
+        compiler and linker to your include files and libraries.) 
+ 
+XXX I think this next bit is out of date: 
+ 
+64-bit platforms: The modules audioop, and imageop don't work. 
+        The setup.py script disables them on 64-bit installations. 
+        Don't try to enable them in the Modules/Setup file.  They 
+        contain code that is quite wordsize sensitive.  (If you have a 
+        fix, let us know!) 
+ 
+Solaris: When using Sun's C compiler with threads, at least on Solaris 
+        2.5.1, you need to add the "-mt" compiler option (the simplest 
+        way is probably to specify the compiler with this option as 
+        the "CC" environment variable when running the configure 
+        script). 
+ 
+        When using GCC on Solaris, beware of binutils 2.13 or GCC 
+        versions built using it.  This mistakenly enables the 
+        -zcombreloc option which creates broken shared libraries on 
+        Solaris.  binutils 2.12 works, and the binutils maintainers 
+        are aware of the problem.  Binutils 2.13.1 only partially 
+        fixed things.  It appears that 2.13.2 solves the problem 
+        completely.  This problem is known to occur with Solaris 2.7 
+        and 2.8, but may also affect earlier and later versions of the 
+        OS. 
+ 
+        When the dynamic loader complains about errors finding shared 
+        libraries, such as 
+ 
+        ld.so.1: ./python: fatal: libstdc++.so.5: open failed: 
+        No such file or directory 
+ 
+        you need to first make sure that the library is available on 
+        your system. Then, you need to instruct the dynamic loader how 
+        to find it. You can choose any of the following strategies: 
+ 
+        1. When compiling Python, set LD_RUN_PATH to the directories 
+           containing missing libraries. 
+        2. When running Python, set LD_LIBRARY_PATH to these directories. 
+        3. Use crle(8) to extend the search path of the loader. 
+        4. Modify the installed GCC specs file, adding -R options into the 
+           *link: section. 
+ 
+        The complex object fails to compile on Solaris 10 with gcc 3.4 (at 
+        least up to 3.4.3).  To work around it, define Py_HUGE_VAL as 
+        HUGE_VAL(), e.g.: 
+ 
+          make CPPFLAGS='-D"Py_HUGE_VAL=HUGE_VAL()" -I. -I$(srcdir)/Include' 
+          ./python setup.py CPPFLAGS='-D"Py_HUGE_VAL=HUGE_VAL()"' 
+ 
+Linux:  A problem with threads and fork() was tracked down to a bug in 
+        the pthreads code in glibc version 2.0.5; glibc version 2.0.7 
+        solves the problem.  This causes the popen2 test to fail; 
+        problem and solution reported by Pablo Bleyer. 
+ 
+Red Hat Linux: Red Hat 9 built Python2.2 in UCS-4 mode and hacked 
+        Tcl to support it. To compile Python2.3 with Tkinter, you will 
+        need to pass --enable-unicode=ucs4 flag to ./configure. 
+ 
+        There's an executable /usr/bin/python which is Python 
+        1.5.2 on most older Red Hat installations; several key Red Hat tools 
+        require this version.  Python 2.1.x may be installed as 
+        /usr/bin/python2.  The Makefile installs Python as 
+        /usr/local/bin/python, which may or may not take precedence 
+        over /usr/bin/python, depending on how you have set up $PATH. 
+ 
+FreeBSD 3.x and probably platforms with NCurses that use libmytinfo or 
+        similar: When using cursesmodule, the linking is not done in 
+        the correct order with the defaults.  Remove "-ltermcap" from 
+        the readline entry in Setup, and use as curses entry: "curses 
+        cursesmodule.c -lmytinfo -lncurses -ltermcap" - "mytinfo" (so 
+        called on FreeBSD) should be the name of the auxiliary library 
+        required on your platform.  Normally, it would be linked 
+        automatically, but not necessarily in the correct order. 
+ 
+BSDI:   BSDI versions before 4.1 have known problems with threads, 
+        which can cause strange errors in a number of modules (for 
+        instance, the 'test_signal' test script will hang forever.) 
+        Turning off threads (with --with-threads=no) or upgrading to 
+        BSDI 4.1 solves this problem. 
+ 
+DEC Unix: Run configure with --with-dec-threads, or with 
+        --with-threads=no if no threads are desired (threads are on by 
+        default).  When using GCC, it is possible to get an internal 
+        compiler error if optimization is used.  This was reported for 
+        GCC 2.7.2.3 on selectmodule.c.  Manually compile the affected 
+        file without optimization to solve the problem. 
+ 
+DEC Ultrix: compile with GCC to avoid bugs in the native compiler, 
+        and pass SHELL=/bin/sh5 to Make when installing. 
+ 
+AIX:    A complete overhaul of the shared library support is now in 
+        place.  See Misc/AIX-NOTES for some notes on how it's done. 
+        (The optimizer bug reported at this place in previous releases 
+        has been worked around by a minimal code change.) If you get 
+        errors about pthread_* functions, during compile or during 
+        testing, try setting CC to a thread-safe (reentrant) compiler, 
+        like "cc_r".  For full C++ module support, set CC="xlC_r" (or 
+        CC="xlC" without thread support). 
+ 
+AIX 5.3: To build a 64-bit version with IBM's compiler, I used the 
+        following: 
+ 
+        export PATH=/usr/bin:/usr/vacpp/bin 
+        ./configure --with-gcc="xlc_r -q64" --with-cxx="xlC_r -q64" \ 
+                    --disable-ipv6 AR="ar -X64" 
+        make 
+ 
+HP-UX:  When using threading, you may have to add -D_REENTRANT to the 
+        OPT variable in the top-level Makefile; reported by Pat Knight, 
+        this seems to make a difference (at least for HP-UX 10.20) 
+        even though pyconfig.h defines it. This seems unnecessary when 
+        using HP/UX 11 and later - threading seems to work "out of the 
+        box". 
+ 
+HP-UX ia64: When building on the ia64 (Itanium) platform using HP's 
+        compiler, some experience has shown that the compiler's 
+        optimiser produces a completely broken version of python 
+        (see http://bugs.python.org/814976). To work around this, 
+        edit the Makefile and remove -O from the OPT line. 
+ 
+        To build a 64-bit executable on an Itanium 2 system using HP's 
+        compiler, use these environment variables: 
+ 
+                CC=cc 
+                CXX=aCC 
+                BASECFLAGS="+DD64" 
+                LDFLAGS="+DD64 -lxnet" 
+ 
+        and call configure as: 
+ 
+                ./configure --without-gcc 
+ 
+        then *unset* the environment variables again before running 
+        make.  (At least one of these flags causes the build to fail 
+        if it remains set.)  You still have to edit the Makefile and 
+        remove -O from the OPT line. 
+ 
+HP PA-RISC 2.0: A recent bug report (http://bugs.python.org/546117) 
+        suggests that the C compiler in this 64-bit system has bugs 
+        in the optimizer that break Python.  Compiling without 
+        optimization solves the problems. 
+ 
+SCO:    The following apply to SCO 3 only; Python builds out of the box 
+        on SCO 5 (or so we've heard). 
+ 
+        1) Everything works much better if you add -U__STDC__ to the 
+        defs.  This is because all the SCO header files are broken. 
+        Anything that isn't mentioned in the C standard is 
+        conditionally excluded when __STDC__ is defined. 
+ 
+        2) Due to the U.S. export restrictions, SCO broke the crypt 
+        stuff out into a separate library, libcrypt_i.a so the LIBS 
+        needed be set to: 
+ 
+                LIBS=' -lsocket -lcrypt_i' 
+ 
+UnixWare: There are known bugs in the math library of the system, as well as 
+        problems in the handling of threads (calling fork in one 
+        thread may interrupt system calls in others). Therefore, test_math and 
+        tests involving threads will fail until those problems are fixed. 
+ 
+QNX:    Chris Herborth (chrish@qnx.com) writes: 
+        configure works best if you use GNU bash; a port is available on 
+        ftp.qnx.com in /usr/free.  I used the following process to build, 
+        test and install Python 1.5.x under QNX: 
+ 
+        1) CONFIG_SHELL=/usr/local/bin/bash CC=cc RANLIB=: \ 
+            ./configure --verbose --without-gcc --with-libm="" 
+ 
+        2) edit Modules/Setup to activate everything that makes sense for 
+           your system... tested here at QNX with the following modules: 
+ 
+                array, audioop, binascii, cPickle, cStringIO, cmath, 
+                crypt, curses, errno, fcntl, gdbm, grp, imageop, 
+                _locale, math, md5, new, operator, parser, pcre, 
+                posix, pwd, readline, regex, reop, 
+                select, signal, socket, soundex, strop, struct, 
+                syslog, termios, time, timing, zlib, audioop, imageop 
+ 
+        3) make SHELL=/usr/local/bin/bash 
+ 
+           or, if you feel the need for speed: 
+ 
+           make SHELL=/usr/local/bin/bash OPT="-5 -Oil+nrt" 
+ 
+        4) make SHELL=/usr/local/bin/bash test 
+ 
+           Using GNU readline 2.2 seems to behave strangely, but I 
+           think that's a problem with my readline 2.2 port.  :-\ 
+ 
+        5) make SHELL=/usr/local/bin/bash install 
+ 
+        If you get SIGSEGVs while running Python (I haven't yet, but 
+        I've only run small programs and the test cases), you're 
+        probably running out of stack; the default 32k could be a 
+        little tight.  To increase the stack size, edit the Makefile 
+        to read: LDFLAGS = -N 48k 
+ 
+BeOS:   See Misc/BeOS-NOTES for notes about compiling/installing 
+        Python on BeOS R3 or later.  Note that only the PowerPC 
+        platform is supported for R3; both PowerPC and x86 are 
+        supported for R4. 
+ 
+Cray T3E: Mark Hadfield (m.hadfield@niwa.co.nz) writes: 
+        Python can be built satisfactorily on a Cray T3E but based on 
+        my experience with the NIWA T3E (2002-05-22, version 2.2.1) 
+        there are a few bugs and gotchas. For more information see a 
+        thread on comp.lang.python in May 2002 entitled "Building 
+        Python on Cray T3E". 
+ 
+        1) Use Cray's cc and not gcc. The latter was reported not to 
+           work by Konrad Hinsen. It may work now, but it may not. 
+ 
+        2) To set sys.platform to something sensible, pass the 
+           following environment variable to the configure script: 
+ 
+             MACHDEP=unicosmk 
+ 
+        2) Run configure with option "--enable-unicode=ucs4". 
+ 
+        3) The Cray T3E does not support dynamic linking, so extension 
+           modules have to be built by adding (or uncommenting) lines 
+           in Modules/Setup. The minimum set of modules is 
+ 
+             posix, new, _sre, unicodedata 
+ 
+           On NIWA's vanilla T3E system the following have also been 
+           included successfully: 
+ 
+             _codecs, _locale, _socket, _symtable, _testcapi, _weakref 
+             array, binascii, cmath, cPickle, crypt, cStringIO, dbm 
+             errno, fcntl, grp, math, md5, operator, parser, pcre, pwd 
+             regex, rotor, select, struct, strop, syslog, termios 
+             time, timing, xreadlines 
+ 
+        4) Once the python executable and library have been built, make 
+           will execute setup.py, which will attempt to build remaining 
+           extensions and link them dynamically. Each of these attempts 
+           will fail but should not halt the make process. This is 
+           normal. 
+ 
+        5) Running "make test" uses a lot of resources and causes 
+           problems on our system. You might want to try running tests 
+           singly or in small groups. 
+ 
+SGI:    SGI's standard "make" utility (/bin/make or /usr/bin/make) 
+        does not check whether a command actually changed the file it 
+        is supposed to build.  This means that whenever you say "make" 
+        it will redo the link step.  The remedy is to use SGI's much 
+        smarter "smake" utility (/usr/sbin/smake), or GNU make.  If 
+        you set the first line of the Makefile to #!/usr/sbin/smake 
+        smake will be invoked by make (likewise for GNU make). 
+ 
+        WARNING: There are bugs in the optimizer of some versions of 
+        SGI's compilers that can cause bus errors or other strange 
+        behavior, especially on numerical operations.  To avoid this, 
+        try building with "make OPT=". 
+ 
+OS/2:   If you are running Warp3 or Warp4 and have IBM's VisualAge C/C++ 
+        compiler installed, just change into the pc\os2vacpp directory 
+        and type NMAKE.  Threading and sockets are supported by default 
+        in the resulting binaries of PYTHON15.DLL and PYTHON.EXE. 
+ 
+Reliant UNIX: The thread support does not compile on Reliant UNIX, and 
+        there is a (minor) problem in the configure script for that 
+        platform as well.  This should be resolved in time for a 
+        future release. 
+ 
+MacOSX: The tests will crash on both 10.1 and 10.2 with SEGV in 
+        test_re and test_sre due to the small default stack size.  If 
+        you set the stack size to 2048 before doing a "make test" the 
+        failure can be avoided.  If you're using the tcsh or csh shells, 
+        use "limit stacksize 2048" and for the bash shell (the default 
+        as of OSX 10.3), use "ulimit -s 2048". 
+ 
+        On naked Darwin you may want to add the configure option 
+        "--disable-toolbox-glue" to disable the glue code for the Carbon 
+        interface modules. The modules themselves are currently only built 
+        if you add the --enable-framework option, see below. 
+ 
+        On a clean OSX /usr/local does not exist. Do a 
+        "sudo mkdir -m 775 /usr/local" 
+        before you do a make install. It is probably not a good idea to 
+        do "sudo make install" which installs everything as superuser, 
+        as this may later cause problems when installing distutils-based 
+        additions. 
+ 
+        Some people have reported problems building Python after using "fink" 
+        to install additional unix software. Disabling fink (remove all  
+        references to /sw from your .profile or .login) should solve this. 
+ 
+        You may want to try the configure option "--enable-framework" 
+        which installs Python as a framework. The location can be set 
+        as argument to the --enable-framework option (default 
+        /Library/Frameworks). A framework install is probably needed if you 
+        want to use any Aqua-based GUI toolkit (whether Tkinter, wxPython, 
+        Carbon, Cocoa or anything else). 
+ 
+        You may also want to try the configure option "--enable-universalsdk" 
+        which builds Python as a universal binary with support for the  
+        i386 and PPC architetures. This requires Xcode 2.1 or later to build. 
+ 
+        See Mac/README for more information on framework and  
+        universal builds. 
+ 
+Cygwin: With recent (relative to the time of writing, 2001-12-19) 
+        Cygwin installations, there are problems with the interaction 
+        of dynamic linking and fork().  This manifests itself in build 
+        failures during the execution of setup.py. 
+ 
+        There are two workarounds that both enable Python (albeit 
+        without threading support) to build and pass all tests on 
+        NT/2000 (and most likely XP as well, though reports of testing 
+        on XP would be appreciated). 
+ 
+        The workarounds: 
+ 
+        (a) the band-aid fix is to link the _socket module statically 
+        rather than dynamically (which is the default). 
+ 
+        To do this, run "./configure --with-threads=no" including any 
+        other options you need (--prefix, etc.).  Then in Modules/Setup 
+        uncomment the lines: 
+ 
+        #SSL=/usr/local/ssl 
+        #_socket socketmodule.c \ 
+        #       -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ 
+        #       -L$(SSL)/lib -lssl -lcrypto 
+ 
+        and remove "local/" from the SSL variable.  Finally, just run 
+        "make"! 
+ 
+        (b) The "proper" fix is to rebase the Cygwin DLLs to prevent 
+        base address conflicts.  Details on how to do this can be 
+        found in the following mail: 
+ 
+           http://sources.redhat.com/ml/cygwin/2001-12/msg00894.html 
+ 
+        It is hoped that a version of this solution will be 
+        incorporated into the Cygwin distribution fairly soon. 
+ 
+        Two additional problems: 
+ 
+        (1) Threading support should still be disabled due to a known 
+        bug in Cygwin pthreads that causes test_threadedtempfile to 
+        hang. 
+ 
+        (2) The _curses module does not build.  This is a known 
+        Cygwin ncurses problem that should be resolved the next time 
+        that this package is released. 
+ 
+        On older versions of Cygwin, test_poll may hang and test_strftime 
+        may fail. 
+ 
+        The situation on 9X/Me is not accurately known at present. 
+        Some time ago, there were reports that the following 
+        regression tests failed: 
+ 
+            test_pwd 
+            test_select (hang) 
+            test_socket 
+ 
+        Due to the test_select hang on 9X/Me, one should run the 
+        regression test using the following: 
+ 
+            make TESTOPTS='-l -x test_select' test 
+ 
+        News regarding these platforms with more recent Cygwin 
+        versions would be appreciated! 
+ 
+Windows: When executing Python scripts on the command line using file type 
+        associations (i.e. starting "script.py" instead of "python script.py"), 
+        redirects may not work unless you set a specific registry key.  See 
+        the Knowledge Base article <http://support.microsoft.com/kb/321788>. 
+ 
+ 
+Configuring the bsddb and dbm modules 
+------------------------------------- 
+ 
+Beginning with Python version 2.3, the PyBsddb package 
+<http://pybsddb.sf.net/> was adopted into Python as the bsddb package, 
+exposing a set of package-level functions which provide 
+backwards-compatible behavior.  Only versions 3.3 through 4.4 of 
+Sleepycat's libraries provide the necessary API, so older versions 
+aren't supported through this interface.  The old bsddb module has 
+been retained as bsddb185, though it is not built by default.  Users 
+wishing to use it will have to tweak Modules/Setup to build it.  The 
+dbm module will still be built against the Sleepycat libraries if 
+other preferred alternatives (ndbm, gdbm) are not found. 
+ 
+Building the sqlite3 module 
+--------------------------- 
+ 
+To build the sqlite3 module, you'll need the sqlite3 or libsqlite3 
+packages installed, including the header files. Many modern operating 
+systems distribute the headers in a separate package to the library - 
+often it will be the same name as the main package, but with a -dev or 
+-devel suffix.  
+ 
+The version of pysqlite2 that's including in Python needs sqlite3 3.0.8 
+or later. setup.py attempts to check that it can find a correct version. 
+ 
+Configuring threads 
+------------------- 
+ 
+As of Python 2.0, threads are enabled by default.  If you wish to 
+compile without threads, or if your thread support is broken, pass the 
+--with-threads=no switch to configure.  Unfortunately, on some 
+platforms, additional compiler and/or linker options are required for 
+threads to work properly.  Below is a table of those options, 
+collected by Bill Janssen.  We would love to automate this process 
+more, but the information below is not enough to write a patch for the 
 configure.ac file, so manual intervention is required.  If you patch
 the configure.ac file and are confident that the patch works, please
-send in the patch.  (Don't bother patching the configure script itself
+send in the patch.  (Don't bother patching the configure script itself 
 -- it is regenerated each time the configure.ac file changes.)
-
-Compiler switches for threads
-.............................
-
-The definition of _REENTRANT should be configured automatically, if
-that does not work on your system, or if _REENTRANT is defined
-incorrectly, please report that as a bug.
-
-    OS/Compiler/threads                     Switches for use with threads
-    (POSIX is draft 10, DCE is draft 4)     compile & link
-
-    SunOS 5.{1-5}/{gcc,SunPro cc}/solaris   -mt
-    SunOS 5.5/{gcc,SunPro cc}/POSIX         (nothing)
-    DEC OSF/1 3.x/cc/DCE                    -threads
-            (butenhof@zko.dec.com)
-    Digital UNIX 4.x/cc/DCE                 -threads
-            (butenhof@zko.dec.com)
-    Digital UNIX 4.x/cc/POSIX               -pthread
-            (butenhof@zko.dec.com)
-    AIX 4.1.4/cc_r/d7                       (nothing)
-            (buhrt@iquest.net)
-    AIX 4.1.4/cc_r4/DCE                     (nothing)
-            (buhrt@iquest.net)
-    IRIX 6.2/cc/POSIX                       (nothing)
-            (robertl@cwi.nl)
-
-
-Linker (ld) libraries and flags for threads
-...........................................
-
-    OS/threads                          Libraries/switches for use with threads
-
-    SunOS 5.{1-5}/solaris               -lthread
-    SunOS 5.5/POSIX                     -lpthread
-    DEC OSF/1 3.x/DCE                   -lpthreads -lmach -lc_r -lc
-            (butenhof@zko.dec.com)
-    Digital UNIX 4.x/DCE                -lpthreads -lpthread -lmach -lexc -lc
-            (butenhof@zko.dec.com)
-    Digital UNIX 4.x/POSIX              -lpthread -lmach -lexc -lc
-            (butenhof@zko.dec.com)
-    AIX 4.1.4/{draft7,DCE}              (nothing)
-            (buhrt@iquest.net)
-    IRIX 6.2/POSIX                      -lpthread
-            (jph@emilia.engr.sgi.com)
-
-
-Building a shared libpython
----------------------------
-
-Starting with Python 2.3, the majority of the interpreter can be built
-into a shared library, which can then be used by the interpreter
-executable, and by applications embedding Python. To enable this feature,
-configure with --enable-shared.
-
-If you enable this feature, the same object files will be used to create
-a static library.  In particular, the static library will contain object
-files using position-independent code (PIC) on platforms where PIC flags
-are needed for the shared library.
-
-
-Configuring additional built-in modules
----------------------------------------
-
-Starting with Python 2.1, the setup.py script at the top of the source
-distribution attempts to detect which modules can be built and
-automatically compiles them.  Autodetection doesn't always work, so
-you can still customize the configuration by editing the Modules/Setup
-file; but this should be considered a last resort.  The rest of this
-section only applies if you decide to edit the Modules/Setup file.
-You also need this to enable static linking of certain modules (which
-is needed to enable profiling on some systems).
-
-This file is initially copied from Setup.dist by the configure script;
-if it does not exist yet, create it by copying Modules/Setup.dist
-yourself (configure will never overwrite it).  Never edit Setup.dist
--- always edit Setup or Setup.local (see below).  Read the comments in
-the file for information on what kind of edits are allowed.  When you
-have edited Setup in the Modules directory, the interpreter will
-automatically be rebuilt the next time you run make (in the toplevel
-directory).
-
-Many useful modules can be built on any Unix system, but some optional
-modules can't be reliably autodetected.  Often the quickest way to
-determine whether a particular module works or not is to see if it
-will build: enable it in Setup, then if you get compilation or link
-errors, disable it -- you're either missing support or need to adjust
-the compilation and linking parameters for that module.
-
-On SGI IRIX, there are modules that interface to many SGI specific
-system libraries, e.g. the GL library and the audio hardware.  These
-modules will not be built by the setup.py script.
-
-In addition to the file Setup, you can also edit the file Setup.local.
-(the makesetup script processes both).  You may find it more
-convenient to edit Setup.local and leave Setup alone.  Then, when
-installing a new Python version, you can copy your old Setup.local
-file.
-
-
-Setting the optimization/debugging options
-------------------------------------------
-
-If you want or need to change the optimization/debugging options for
-the C compiler, assign to the OPT variable on the toplevel make
-command; e.g. "make OPT=-g" will build a debugging version of Python
-on most platforms.  The default is OPT=-O; a value for OPT in the
-environment when the configure script is run overrides this default
-(likewise for CC; and the initial value for LIBS is used as the base
-set of libraries to link with).
-
-When compiling with GCC, the default value of OPT will also include
-the -Wall and -Wstrict-prototypes options.
-
-Additional debugging code to help debug memory management problems can
-be enabled by using the --with-pydebug option to the configure script.
-
-For flags that change binary compatibility, use the EXTRA_CFLAGS
-variable.
-
-
-Profiling
----------
-
-If you want C profiling turned on, the easiest way is to run configure
-with the CC environment variable to the necessary compiler
-invocation.  For example, on Linux, this works for profiling using
-gprof(1):
-
-    CC="gcc -pg" ./configure
-
-Note that on Linux, gprof apparently does not work for shared
-libraries.  The Makefile/Setup mechanism can be used to compile and
-link most extension modules statically.
-
-
-Coverage checking
------------------
-
-For C coverage checking using gcov, run "make coverage".  This will
-build a Python binary with profiling activated, and a ".gcno" and
-".gcda" file for every source file compiled with that option.  With
-the built binary, now run the code whose coverage you want to check.
-Then, you can see coverage statistics for each individual source file
-by running gcov, e.g.
-
-    gcov -o Modules zlibmodule
-
-This will create a "zlibmodule.c.gcov" file in the current directory
-containing coverage info for that source file.
-
-This works only for source files statically compiled into the
-executable; use the Makefile/Setup mechanism to compile and link
-extension modules you want to coverage-check statically.
-
-
-Testing
--------
-
-To test the interpreter, type "make test" in the top-level directory.
-This runs the test set twice (once with no compiled files, once with
-the compiled files left by the previous test run).  The test set
-produces some output.  You can generally ignore the messages about
-skipped tests due to optional features which can't be imported.
-If a message is printed about a failed test or a traceback or core
-dump is produced, something is wrong.  On some Linux systems (those
-that are not yet using glibc 6), test_strftime fails due to a
-non-standard implementation of strftime() in the C library. Please
-ignore this, or upgrade to glibc version 6.
-
-By default, tests are prevented from overusing resources like disk space and
-memory.  To enable these tests, run "make testall".
-
-IMPORTANT: If the tests fail and you decide to mail a bug report,
-*don't* include the output of "make test".  It is useless.  Run the
-failing test manually, as follows:
-
-        ./python Lib/test/regrtest.py -v test_whatever
-
-(substituting the top of the source tree for '.' if you built in a
-different directory).  This runs the test in verbose mode.
-
-
-Installing
-----------
-
-To install the Python binary, library modules, shared library modules
-(see below), include files, configuration files, and the manual page,
-just type
-
-        make install
-
-This will install all platform-independent files in subdirectories of
-the directory given with the --prefix option to configure or to the
-`prefix' Make variable (default /usr/local).  All binary and other
-platform-specific files will be installed in subdirectories if the
-directory given by --exec-prefix or the `exec_prefix' Make variable
-(defaults to the --prefix directory) is given.
-
-If DESTDIR is set, it will be taken as the root directory of the
-installation, and files will be installed into $(DESTDIR)$(prefix),
-$(DESTDIR)$(exec_prefix), etc.
-
-All subdirectories created will have Python's version number in their
-name, e.g. the library modules are installed in
-"/usr/local/lib/python<version>/" by default, where <version> is the
-<major>.<minor> release number (e.g. "2.1").  The Python binary is
-installed as "python<version>" and a hard link named "python" is
-created.  The only file not installed with a version number in its
-name is the manual page, installed as "/usr/local/man/man1/python.1"
-by default.
-
-If you want to install multiple versions of Python see the section below
-entitled "Installing multiple versions".
-
-The only thing you may have to install manually is the Python mode for
-Emacs found in Misc/python-mode.el.  (But then again, more recent
-versions of Emacs may already have it.)  Follow the instructions that
-came with Emacs for installation of site-specific files.
-
-On Mac OS X, if you have configured Python with --enable-framework, you
-should use "make frameworkinstall" to do the installation. Note that this
-installs the Python executable in a place that is not normally on your
-PATH, you may want to set up a symlink in /usr/local/bin.
-
-
-Installing multiple versions
-----------------------------
-
-On Unix and Mac systems if you intend to install multiple versions of Python
-using the same installation prefix (--prefix argument to the configure
-script) you must take care that your primary python executable is not
-overwritten by the installation of a different version.  All files and
-directories installed using "make altinstall" contain the major and minor
-version and can thus live side-by-side.  "make install" also creates
-${prefix}/bin/python which refers to ${prefix}/bin/pythonX.Y.  If you intend
-to install multiple versions using the same prefix you must decide which
-version (if any) is your "primary" version.  Install that version using
-"make install".  Install all other versions using "make altinstall".
-
-For example, if you want to install Python 2.5, 2.6 and 3.0 with 2.6 being
-the primary version, you would execute "make install" in your 2.6 build
-directory and "make altinstall" in the others.
-
-
-Configuration options and variables
------------------------------------
-
-Some special cases are handled by passing options to the configure
-script.
-
-WARNING: if you rerun the configure script with different options, you
-must run "make clean" before rebuilding.  Exceptions to this rule:
-after changing --prefix or --exec-prefix, all you need to do is remove
-Modules/getpath.o.
-
---with(out)-gcc: The configure script uses gcc (the GNU C compiler) if
-        it finds it.  If you don't want this, or if this compiler is
-        installed but broken on your platform, pass the option
-        --without-gcc.  You can also pass "CC=cc" (or whatever the
-        name of the proper C compiler is) in the environment, but the
-        advantage of using --without-gcc is that this option is
-        remembered by the config.status script for its --recheck
-        option.
-
---prefix, --exec-prefix: If you want to install the binaries and the
-        Python library somewhere else than in /usr/local/{bin,lib},
-        you can pass the option --prefix=DIRECTORY; the interpreter
-        binary will be installed as DIRECTORY/bin/python and the
-        library files as DIRECTORY/lib/python/*.  If you pass
-        --exec-prefix=DIRECTORY (as well) this overrides the
-        installation prefix for architecture-dependent files (like the
-        interpreter binary).  Note that --prefix=DIRECTORY also
-        affects the default module search path (sys.path), when
-        Modules/config.c is compiled.  Passing make the option
-        prefix=DIRECTORY (and/or exec_prefix=DIRECTORY) overrides the
-        prefix set at configuration time; this may be more convenient
-        than re-running the configure script if you change your mind
-        about the install prefix.
-
---with-readline: This option is no longer supported.  GNU
-        readline is automatically enabled by setup.py when present.
-
---with-threads: On most Unix systems, you can now use multiple
-        threads, and support for this is enabled by default.  To
-        disable this, pass --with-threads=no.  If the library required
-        for threads lives in a peculiar place, you can use
-        --with-thread=DIRECTORY.  IMPORTANT: run "make clean" after
-        changing (either enabling or disabling) this option, or you
-        will get link errors!  Note: for DEC Unix use
-        --with-dec-threads instead.
-
---with-sgi-dl: On SGI IRIX 4, dynamic loading of extension modules is
-        supported by the "dl" library by Jack Jansen, which is
-        ftp'able from ftp://ftp.cwi.nl/pub/dynload/dl-1.6.tar.Z.
-        This is enabled (after you've ftp'ed and compiled the dl
-        library) by passing --with-sgi-dl=DIRECTORY where DIRECTORY
-        is the absolute pathname of the dl library.  (Don't bother on
-        IRIX 5, it already has dynamic linking using SunOS style
-        shared libraries.)  THIS OPTION IS UNSUPPORTED.
-
---with-dl-dld: Dynamic loading of modules is rumored to be supported
-        on some other systems: VAX (Ultrix), Sun3 (SunOS 3.4), Sequent
-        Symmetry (Dynix), and Atari ST.  This is done using a
-        combination of the GNU dynamic loading package
-        (ftp://ftp.cwi.nl/pub/dynload/dl-dld-1.1.tar.Z) and an
-        emulation of the SGI dl library mentioned above (the emulation
-        can be found at
-        ftp://ftp.cwi.nl/pub/dynload/dld-3.2.3.tar.Z).  To
-        enable this, ftp and compile both libraries, then call
-        configure, passing it the option
-        --with-dl-dld=DL_DIRECTORY,DLD_DIRECTORY where DL_DIRECTORY is
-        the absolute pathname of the dl emulation library and
-        DLD_DIRECTORY is the absolute pathname of the GNU dld library.
-        (Don't bother on SunOS 4 or 5, they already have dynamic
-        linking using shared libraries.)  THIS OPTION IS UNSUPPORTED.
-
---with-libm, --with-libc: It is possible to specify alternative
-        versions for the Math library (default -lm) and the C library
-        (default the empty string) using the options
-        --with-libm=STRING and --with-libc=STRING, respectively.  For
-        example, if your system requires that you pass -lc_s to the C
-        compiler to use the shared C library, you can pass
-        --with-libc=-lc_s. These libraries are passed after all other
-        libraries, the C library last.
-
---with-libs='libs': Add 'libs' to the LIBS that the python interpreter
-        is linked against.
-
---with-cxx-main=<compiler>: If you plan to use C++ extension modules,
-        then -- on some platforms -- you need to compile python's main()
-        function with the C++ compiler. With this option, make will use
-        <compiler> to compile main() *and* to link the python executable.
-        It is likely that the resulting executable depends on the C++
-        runtime library of <compiler>. (The default is --without-cxx-main.)
-
-        There are platforms that do not require you to build Python
-        with a C++ compiler in order to use C++ extension modules.
-        E.g., x86 Linux with ELF shared binaries and GCC 3.x, 4.x is such
-        a platform. We recommend that you configure Python
-        --without-cxx-main on those platforms because a mismatch
-        between the C++ compiler version used to build Python and to
-        build a C++ extension module is likely to cause a crash at
-        runtime.
-
-        The Python installation also stores the variable CXX that
-        determines, e.g., the C++ compiler distutils calls by default
-        to build C++ extensions. If you set CXX on the configure command
-        line to any string of non-zero length, then configure won't
-        change CXX. If you do not preset CXX but pass
-        --with-cxx-main=<compiler>, then configure sets CXX=<compiler>.
-        In all other cases, configure looks for a C++ compiler by
-        some common names (c++, g++, gcc, CC, cxx, cc++, cl) and sets
-        CXX to the first compiler it finds. If it does not find any
-        C++ compiler, then it sets CXX="".
-
-        Similarly, if you want to change the command used to link the
-        python executable, then set LINKCC on the configure command line.
-
-
---with-pydebug:  Enable additional debugging code to help track down
-        memory management problems.  This allows printing a list of all
-        live objects when the interpreter terminates.
-
---with(out)-universal-newlines: enable reading of text files with
-        foreign newline convention (default: enabled). In other words,
-        any of \r, \n or \r\n is acceptable as end-of-line character.
-        If enabled import and execfile will automatically accept any newline
-        in files. Python code can open a file with open(file, 'U') to
-        read it in universal newline mode. THIS OPTION IS UNSUPPORTED.
-
---with-tsc: Profile using the Pentium timestamping counter (TSC).
-
---with-system-ffi:  Build the _ctypes extension module using an ffi
-        library installed on the system.
-
---with-dbmliborder=db1:db2:...:  Specify the order that backends for the
-	dbm extension are checked. Valid value is a colon separated string
-	with the backend names `ndbm', `gdbm' and `bdb'.
-
-Building for multiple architectures (using the VPATH feature)
--------------------------------------------------------------
-
-If your file system is shared between multiple architectures, it
-usually is not necessary to make copies of the sources for each
-architecture you want to support.  If the make program supports the
-VPATH feature, you can create an empty build directory for each
-architecture, and in each directory run the configure script (on the
-appropriate machine with the appropriate options).  This creates the
-necessary subdirectories and the Makefiles therein.  The Makefiles
-contain a line VPATH=... which points to a directory containing the
-actual sources.  (On SGI systems, use "smake -J1" instead of "make" if
-you use VPATH -- don't try gnumake.)
-
-For example, the following is all you need to build a minimal Python
-in /usr/tmp/python (assuming ~guido/src/python is the toplevel
-directory and you want to build in /usr/tmp/python):
-
-        $ mkdir /usr/tmp/python
-        $ cd /usr/tmp/python
-        $ ~guido/src/python/configure
-        [...]
-        $ make
-        [...]
-        $
-
-Note that configure copies the original Setup file to the build
-directory if it finds no Setup file there.  This means that you can
-edit the Setup file for each architecture independently.  For this
-reason, subsequent changes to the original Setup file are not tracked
-automatically, as they might overwrite local changes.  To force a copy
-of a changed original Setup file, delete the target Setup file.  (The
-makesetup script supports multiple input files, so if you want to be
-fancy you can change the rules to create an empty Setup.local if it
-doesn't exist and run it with arguments $(srcdir)/Setup Setup.local;
-however this assumes that you only need to add modules.)
-
-Also note that you can't use a workspace for VPATH and non VPATH builds. The
-object files left behind by one version confuses the other.
-
-
-Building on non-UNIX systems
-----------------------------
-
-For Windows (2000/NT/ME/98/95), assuming you have MS VC++ 7.1, the
-project files are in PCbuild, the workspace is pcbuild.dsw.  See
-PCbuild\readme.txt for detailed instructions.
-
-For other non-Unix Windows compilers, in particular MS VC++ 6.0 and
-for OS/2, enter the directory "PC" and read the file "readme.txt".
-
-For the Mac, a separate source distribution will be made available,
-for use with the CodeWarrior compiler.  If you are interested in Mac
-development, join the PythonMac Special Interest Group
-(http://www.python.org/sigs/pythonmac-sig/, or send email to
-pythonmac-sig-request@python.org).
-
-Of course, there are also binary distributions available for these
-platforms -- see http://www.python.org/.
-
-To port Python to a new non-UNIX system, you will have to fake the
-effect of running the configure script manually (for Mac and PC, this
-has already been done for you).  A good start is to copy the file
-pyconfig.h.in to pyconfig.h and edit the latter to reflect the actual
-configuration of your system.  Most symbols must simply be defined as
-1 only if the corresponding feature is present and can be left alone
-otherwise; however the *_t type symbols must be defined as some
-variant of int if they need to be defined at all.
-
-For all platforms, it's important that the build arrange to define the
-preprocessor symbol NDEBUG on the compiler command line in a release
-build of Python (else assert() calls remain in the code, hurting
-release-build performance).  The Unix, Windows and Mac builds already
-do this.
-
-
-Miscellaneous issues
-====================
-
-Emacs mode
-----------
-
-There's an excellent Emacs editing mode for Python code; see the file
-Misc/python-mode.el.  Originally written by the famous Tim Peters, it is now
-maintained by the equally famous Barry Warsaw.  The latest version, along with
-various other contributed Python-related Emacs goodies, is online at
-http://launchpad.net/python-mode/.
-
-
-Tkinter
--------
-
-The setup.py script automatically configures this when it detects a
-usable Tcl/Tk installation.  This requires Tcl/Tk version 8.0 or
-higher.
-
-For more Tkinter information, see the Tkinter Resource page:
-http://www.python.org/topics/tkinter/
-
-There are demos in the Demo/tkinter directory.
-
-Note that there's a Python module called "Tkinter" (capital T) which
-lives in Lib/lib-tk/Tkinter.py, and a C module called "_tkinter"
-(lower case t and leading underscore) which lives in
-Modules/_tkinter.c.  Demos and normal Tk applications import only the
-Python Tkinter module -- only the latter imports the C _tkinter
-module.  In order to find the C _tkinter module, it must be compiled
-and linked into the Python interpreter -- the setup.py script does
-this.  In order to find the Python Tkinter module, sys.path must be
-set correctly -- normal installation takes care of this.
-
-
-Distribution structure
-----------------------
-
-Most subdirectories have their own README files.  Most files have
-comments.
-
-Demo/           Demonstration scripts, modules and programs
-Doc/            Documentation sources (reStructuredText)
-Grammar/        Input for the parser generator
-Include/        Public header files
-LICENSE         Licensing information
-Lib/            Python library modules
-Mac/            Macintosh specific resources
-Makefile.pre.in Source from which config.status creates the Makefile.pre
-Misc/           Miscellaneous useful files
-Modules/        Implementation of most built-in modules
-Objects/        Implementation of most built-in object types
-PC/             Files specific to PC ports (DOS, Windows, OS/2)
-PCbuild/        Build directory for Microsoft Visual C++
-Parser/         The parser and tokenizer and their input handling
-Python/         The byte-compiler and interpreter
-README          The file you're reading now
-RISCOS/         Files specific to RISC OS port
-Tools/          Some useful programs written in Python
-pyconfig.h.in   Source from which pyconfig.h is created (GNU autoheader output)
-configure       Configuration shell script (GNU autoconf output)
+ 
+Compiler switches for threads 
+............................. 
+ 
+The definition of _REENTRANT should be configured automatically, if 
+that does not work on your system, or if _REENTRANT is defined 
+incorrectly, please report that as a bug. 
+ 
+    OS/Compiler/threads                     Switches for use with threads 
+    (POSIX is draft 10, DCE is draft 4)     compile & link 
+ 
+    SunOS 5.{1-5}/{gcc,SunPro cc}/solaris   -mt 
+    SunOS 5.5/{gcc,SunPro cc}/POSIX         (nothing) 
+    DEC OSF/1 3.x/cc/DCE                    -threads 
+            (butenhof@zko.dec.com) 
+    Digital UNIX 4.x/cc/DCE                 -threads 
+            (butenhof@zko.dec.com) 
+    Digital UNIX 4.x/cc/POSIX               -pthread 
+            (butenhof@zko.dec.com) 
+    AIX 4.1.4/cc_r/d7                       (nothing) 
+            (buhrt@iquest.net) 
+    AIX 4.1.4/cc_r4/DCE                     (nothing) 
+            (buhrt@iquest.net) 
+    IRIX 6.2/cc/POSIX                       (nothing) 
+            (robertl@cwi.nl) 
+ 
+ 
+Linker (ld) libraries and flags for threads 
+........................................... 
+ 
+    OS/threads                          Libraries/switches for use with threads 
+ 
+    SunOS 5.{1-5}/solaris               -lthread 
+    SunOS 5.5/POSIX                     -lpthread 
+    DEC OSF/1 3.x/DCE                   -lpthreads -lmach -lc_r -lc 
+            (butenhof@zko.dec.com) 
+    Digital UNIX 4.x/DCE                -lpthreads -lpthread -lmach -lexc -lc 
+            (butenhof@zko.dec.com) 
+    Digital UNIX 4.x/POSIX              -lpthread -lmach -lexc -lc 
+            (butenhof@zko.dec.com) 
+    AIX 4.1.4/{draft7,DCE}              (nothing) 
+            (buhrt@iquest.net) 
+    IRIX 6.2/POSIX                      -lpthread 
+            (jph@emilia.engr.sgi.com) 
+ 
+ 
+Building a shared libpython 
+--------------------------- 
+ 
+Starting with Python 2.3, the majority of the interpreter can be built 
+into a shared library, which can then be used by the interpreter 
+executable, and by applications embedding Python. To enable this feature, 
+configure with --enable-shared. 
+ 
+If you enable this feature, the same object files will be used to create 
+a static library.  In particular, the static library will contain object 
+files using position-independent code (PIC) on platforms where PIC flags 
+are needed for the shared library. 
+ 
+ 
+Configuring additional built-in modules 
+--------------------------------------- 
+ 
+Starting with Python 2.1, the setup.py script at the top of the source 
+distribution attempts to detect which modules can be built and 
+automatically compiles them.  Autodetection doesn't always work, so 
+you can still customize the configuration by editing the Modules/Setup 
+file; but this should be considered a last resort.  The rest of this 
+section only applies if you decide to edit the Modules/Setup file. 
+You also need this to enable static linking of certain modules (which 
+is needed to enable profiling on some systems). 
+ 
+This file is initially copied from Setup.dist by the configure script; 
+if it does not exist yet, create it by copying Modules/Setup.dist 
+yourself (configure will never overwrite it).  Never edit Setup.dist 
+-- always edit Setup or Setup.local (see below).  Read the comments in 
+the file for information on what kind of edits are allowed.  When you 
+have edited Setup in the Modules directory, the interpreter will 
+automatically be rebuilt the next time you run make (in the toplevel 
+directory). 
+ 
+Many useful modules can be built on any Unix system, but some optional 
+modules can't be reliably autodetected.  Often the quickest way to 
+determine whether a particular module works or not is to see if it 
+will build: enable it in Setup, then if you get compilation or link 
+errors, disable it -- you're either missing support or need to adjust 
+the compilation and linking parameters for that module. 
+ 
+On SGI IRIX, there are modules that interface to many SGI specific 
+system libraries, e.g. the GL library and the audio hardware.  These 
+modules will not be built by the setup.py script. 
+ 
+In addition to the file Setup, you can also edit the file Setup.local. 
+(the makesetup script processes both).  You may find it more 
+convenient to edit Setup.local and leave Setup alone.  Then, when 
+installing a new Python version, you can copy your old Setup.local 
+file. 
+ 
+ 
+Setting the optimization/debugging options 
+------------------------------------------ 
+ 
+If you want or need to change the optimization/debugging options for 
+the C compiler, assign to the OPT variable on the toplevel make 
+command; e.g. "make OPT=-g" will build a debugging version of Python 
+on most platforms.  The default is OPT=-O; a value for OPT in the 
+environment when the configure script is run overrides this default 
+(likewise for CC; and the initial value for LIBS is used as the base 
+set of libraries to link with). 
+ 
+When compiling with GCC, the default value of OPT will also include 
+the -Wall and -Wstrict-prototypes options. 
+ 
+Additional debugging code to help debug memory management problems can 
+be enabled by using the --with-pydebug option to the configure script. 
+ 
+For flags that change binary compatibility, use the EXTRA_CFLAGS 
+variable. 
+ 
+ 
+Profiling 
+--------- 
+ 
+If you want C profiling turned on, the easiest way is to run configure 
+with the CC environment variable to the necessary compiler 
+invocation.  For example, on Linux, this works for profiling using 
+gprof(1): 
+ 
+    CC="gcc -pg" ./configure 
+ 
+Note that on Linux, gprof apparently does not work for shared 
+libraries.  The Makefile/Setup mechanism can be used to compile and 
+link most extension modules statically. 
+ 
+ 
+Coverage checking 
+----------------- 
+ 
+For C coverage checking using gcov, run "make coverage".  This will 
+build a Python binary with profiling activated, and a ".gcno" and 
+".gcda" file for every source file compiled with that option.  With 
+the built binary, now run the code whose coverage you want to check. 
+Then, you can see coverage statistics for each individual source file 
+by running gcov, e.g. 
+ 
+    gcov -o Modules zlibmodule 
+ 
+This will create a "zlibmodule.c.gcov" file in the current directory 
+containing coverage info for that source file. 
+ 
+This works only for source files statically compiled into the 
+executable; use the Makefile/Setup mechanism to compile and link 
+extension modules you want to coverage-check statically. 
+ 
+ 
+Testing 
+------- 
+ 
+To test the interpreter, type "make test" in the top-level directory. 
+This runs the test set twice (once with no compiled files, once with 
+the compiled files left by the previous test run).  The test set 
+produces some output.  You can generally ignore the messages about 
+skipped tests due to optional features which can't be imported. 
+If a message is printed about a failed test or a traceback or core 
+dump is produced, something is wrong.  On some Linux systems (those 
+that are not yet using glibc 6), test_strftime fails due to a 
+non-standard implementation of strftime() in the C library. Please 
+ignore this, or upgrade to glibc version 6. 
+ 
+By default, tests are prevented from overusing resources like disk space and 
+memory.  To enable these tests, run "make testall". 
+ 
+IMPORTANT: If the tests fail and you decide to mail a bug report, 
+*don't* include the output of "make test".  It is useless.  Run the 
+failing test manually, as follows: 
+ 
+        ./python Lib/test/regrtest.py -v test_whatever 
+ 
+(substituting the top of the source tree for '.' if you built in a 
+different directory).  This runs the test in verbose mode. 
+ 
+ 
+Installing 
+---------- 
+ 
+To install the Python binary, library modules, shared library modules 
+(see below), include files, configuration files, and the manual page, 
+just type 
+ 
+        make install 
+ 
+This will install all platform-independent files in subdirectories of 
+the directory given with the --prefix option to configure or to the 
+`prefix' Make variable (default /usr/local).  All binary and other 
+platform-specific files will be installed in subdirectories if the 
+directory given by --exec-prefix or the `exec_prefix' Make variable 
+(defaults to the --prefix directory) is given. 
+ 
+If DESTDIR is set, it will be taken as the root directory of the 
+installation, and files will be installed into $(DESTDIR)$(prefix), 
+$(DESTDIR)$(exec_prefix), etc. 
+ 
+All subdirectories created will have Python's version number in their 
+name, e.g. the library modules are installed in 
+"/usr/local/lib/python<version>/" by default, where <version> is the 
+<major>.<minor> release number (e.g. "2.1").  The Python binary is 
+installed as "python<version>" and a hard link named "python" is 
+created.  The only file not installed with a version number in its 
+name is the manual page, installed as "/usr/local/man/man1/python.1" 
+by default. 
+ 
+If you want to install multiple versions of Python see the section below 
+entitled "Installing multiple versions". 
+ 
+The only thing you may have to install manually is the Python mode for 
+Emacs found in Misc/python-mode.el.  (But then again, more recent 
+versions of Emacs may already have it.)  Follow the instructions that 
+came with Emacs for installation of site-specific files. 
+ 
+On Mac OS X, if you have configured Python with --enable-framework, you 
+should use "make frameworkinstall" to do the installation. Note that this 
+installs the Python executable in a place that is not normally on your 
+PATH, you may want to set up a symlink in /usr/local/bin. 
+ 
+ 
+Installing multiple versions 
+---------------------------- 
+ 
+On Unix and Mac systems if you intend to install multiple versions of Python 
+using the same installation prefix (--prefix argument to the configure 
+script) you must take care that your primary python executable is not 
+overwritten by the installation of a different version.  All files and 
+directories installed using "make altinstall" contain the major and minor 
+version and can thus live side-by-side.  "make install" also creates 
+${prefix}/bin/python which refers to ${prefix}/bin/pythonX.Y.  If you intend 
+to install multiple versions using the same prefix you must decide which 
+version (if any) is your "primary" version.  Install that version using 
+"make install".  Install all other versions using "make altinstall". 
+ 
+For example, if you want to install Python 2.5, 2.6 and 3.0 with 2.6 being 
+the primary version, you would execute "make install" in your 2.6 build 
+directory and "make altinstall" in the others. 
+ 
+ 
+Configuration options and variables 
+----------------------------------- 
+ 
+Some special cases are handled by passing options to the configure 
+script. 
+ 
+WARNING: if you rerun the configure script with different options, you 
+must run "make clean" before rebuilding.  Exceptions to this rule: 
+after changing --prefix or --exec-prefix, all you need to do is remove 
+Modules/getpath.o. 
+ 
+--with(out)-gcc: The configure script uses gcc (the GNU C compiler) if 
+        it finds it.  If you don't want this, or if this compiler is 
+        installed but broken on your platform, pass the option 
+        --without-gcc.  You can also pass "CC=cc" (or whatever the 
+        name of the proper C compiler is) in the environment, but the 
+        advantage of using --without-gcc is that this option is 
+        remembered by the config.status script for its --recheck 
+        option. 
+ 
+--prefix, --exec-prefix: If you want to install the binaries and the 
+        Python library somewhere else than in /usr/local/{bin,lib}, 
+        you can pass the option --prefix=DIRECTORY; the interpreter 
+        binary will be installed as DIRECTORY/bin/python and the 
+        library files as DIRECTORY/lib/python/*.  If you pass 
+        --exec-prefix=DIRECTORY (as well) this overrides the 
+        installation prefix for architecture-dependent files (like the 
+        interpreter binary).  Note that --prefix=DIRECTORY also 
+        affects the default module search path (sys.path), when 
+        Modules/config.c is compiled.  Passing make the option 
+        prefix=DIRECTORY (and/or exec_prefix=DIRECTORY) overrides the 
+        prefix set at configuration time; this may be more convenient 
+        than re-running the configure script if you change your mind 
+        about the install prefix. 
+ 
+--with-readline: This option is no longer supported.  GNU 
+        readline is automatically enabled by setup.py when present. 
+ 
+--with-threads: On most Unix systems, you can now use multiple 
+        threads, and support for this is enabled by default.  To 
+        disable this, pass --with-threads=no.  If the library required 
+        for threads lives in a peculiar place, you can use 
+        --with-thread=DIRECTORY.  IMPORTANT: run "make clean" after 
+        changing (either enabling or disabling) this option, or you 
+        will get link errors!  Note: for DEC Unix use 
+        --with-dec-threads instead. 
+ 
+--with-sgi-dl: On SGI IRIX 4, dynamic loading of extension modules is 
+        supported by the "dl" library by Jack Jansen, which is 
+        ftp'able from ftp://ftp.cwi.nl/pub/dynload/dl-1.6.tar.Z. 
+        This is enabled (after you've ftp'ed and compiled the dl 
+        library) by passing --with-sgi-dl=DIRECTORY where DIRECTORY 
+        is the absolute pathname of the dl library.  (Don't bother on 
+        IRIX 5, it already has dynamic linking using SunOS style 
+        shared libraries.)  THIS OPTION IS UNSUPPORTED. 
+ 
+--with-dl-dld: Dynamic loading of modules is rumored to be supported 
+        on some other systems: VAX (Ultrix), Sun3 (SunOS 3.4), Sequent 
+        Symmetry (Dynix), and Atari ST.  This is done using a 
+        combination of the GNU dynamic loading package 
+        (ftp://ftp.cwi.nl/pub/dynload/dl-dld-1.1.tar.Z) and an 
+        emulation of the SGI dl library mentioned above (the emulation 
+        can be found at 
+        ftp://ftp.cwi.nl/pub/dynload/dld-3.2.3.tar.Z).  To 
+        enable this, ftp and compile both libraries, then call 
+        configure, passing it the option 
+        --with-dl-dld=DL_DIRECTORY,DLD_DIRECTORY where DL_DIRECTORY is 
+        the absolute pathname of the dl emulation library and 
+        DLD_DIRECTORY is the absolute pathname of the GNU dld library. 
+        (Don't bother on SunOS 4 or 5, they already have dynamic 
+        linking using shared libraries.)  THIS OPTION IS UNSUPPORTED. 
+ 
+--with-libm, --with-libc: It is possible to specify alternative 
+        versions for the Math library (default -lm) and the C library 
+        (default the empty string) using the options 
+        --with-libm=STRING and --with-libc=STRING, respectively.  For 
+        example, if your system requires that you pass -lc_s to the C 
+        compiler to use the shared C library, you can pass 
+        --with-libc=-lc_s. These libraries are passed after all other 
+        libraries, the C library last. 
+ 
+--with-libs='libs': Add 'libs' to the LIBS that the python interpreter 
+        is linked against. 
+ 
+--with-cxx-main=<compiler>: If you plan to use C++ extension modules, 
+        then -- on some platforms -- you need to compile python's main() 
+        function with the C++ compiler. With this option, make will use 
+        <compiler> to compile main() *and* to link the python executable. 
+        It is likely that the resulting executable depends on the C++ 
+        runtime library of <compiler>. (The default is --without-cxx-main.) 
+ 
+        There are platforms that do not require you to build Python 
+        with a C++ compiler in order to use C++ extension modules. 
+        E.g., x86 Linux with ELF shared binaries and GCC 3.x, 4.x is such 
+        a platform. We recommend that you configure Python 
+        --without-cxx-main on those platforms because a mismatch 
+        between the C++ compiler version used to build Python and to 
+        build a C++ extension module is likely to cause a crash at 
+        runtime. 
+ 
+        The Python installation also stores the variable CXX that 
+        determines, e.g., the C++ compiler distutils calls by default 
+        to build C++ extensions. If you set CXX on the configure command 
+        line to any string of non-zero length, then configure won't 
+        change CXX. If you do not preset CXX but pass 
+        --with-cxx-main=<compiler>, then configure sets CXX=<compiler>. 
+        In all other cases, configure looks for a C++ compiler by 
+        some common names (c++, g++, gcc, CC, cxx, cc++, cl) and sets 
+        CXX to the first compiler it finds. If it does not find any 
+        C++ compiler, then it sets CXX="". 
+ 
+        Similarly, if you want to change the command used to link the 
+        python executable, then set LINKCC on the configure command line. 
+ 
+ 
+--with-pydebug:  Enable additional debugging code to help track down 
+        memory management problems.  This allows printing a list of all 
+        live objects when the interpreter terminates. 
+ 
+--with(out)-universal-newlines: enable reading of text files with 
+        foreign newline convention (default: enabled). In other words, 
+        any of \r, \n or \r\n is acceptable as end-of-line character. 
+        If enabled import and execfile will automatically accept any newline 
+        in files. Python code can open a file with open(file, 'U') to 
+        read it in universal newline mode. THIS OPTION IS UNSUPPORTED. 
+ 
+--with-tsc: Profile using the Pentium timestamping counter (TSC). 
+ 
+--with-system-ffi:  Build the _ctypes extension module using an ffi 
+        library installed on the system. 
+ 
+--with-dbmliborder=db1:db2:...:  Specify the order that backends for the 
+	dbm extension are checked. Valid value is a colon separated string 
+	with the backend names `ndbm', `gdbm' and `bdb'. 
+ 
+Building for multiple architectures (using the VPATH feature) 
+------------------------------------------------------------- 
+ 
+If your file system is shared between multiple architectures, it 
+usually is not necessary to make copies of the sources for each 
+architecture you want to support.  If the make program supports the 
+VPATH feature, you can create an empty build directory for each 
+architecture, and in each directory run the configure script (on the 
+appropriate machine with the appropriate options).  This creates the 
+necessary subdirectories and the Makefiles therein.  The Makefiles 
+contain a line VPATH=... which points to a directory containing the 
+actual sources.  (On SGI systems, use "smake -J1" instead of "make" if 
+you use VPATH -- don't try gnumake.) 
+ 
+For example, the following is all you need to build a minimal Python 
+in /usr/tmp/python (assuming ~guido/src/python is the toplevel 
+directory and you want to build in /usr/tmp/python): 
+ 
+        $ mkdir /usr/tmp/python 
+        $ cd /usr/tmp/python 
+        $ ~guido/src/python/configure 
+        [...] 
+        $ make 
+        [...] 
+        $ 
+ 
+Note that configure copies the original Setup file to the build 
+directory if it finds no Setup file there.  This means that you can 
+edit the Setup file for each architecture independently.  For this 
+reason, subsequent changes to the original Setup file are not tracked 
+automatically, as they might overwrite local changes.  To force a copy 
+of a changed original Setup file, delete the target Setup file.  (The 
+makesetup script supports multiple input files, so if you want to be 
+fancy you can change the rules to create an empty Setup.local if it 
+doesn't exist and run it with arguments $(srcdir)/Setup Setup.local; 
+however this assumes that you only need to add modules.) 
+ 
+Also note that you can't use a workspace for VPATH and non VPATH builds. The 
+object files left behind by one version confuses the other. 
+ 
+ 
+Building on non-UNIX systems 
+---------------------------- 
+ 
+For Windows (2000/NT/ME/98/95), assuming you have MS VC++ 7.1, the 
+project files are in PCbuild, the workspace is pcbuild.dsw.  See 
+PCbuild\readme.txt for detailed instructions. 
+ 
+For other non-Unix Windows compilers, in particular MS VC++ 6.0 and 
+for OS/2, enter the directory "PC" and read the file "readme.txt". 
+ 
+For the Mac, a separate source distribution will be made available, 
+for use with the CodeWarrior compiler.  If you are interested in Mac 
+development, join the PythonMac Special Interest Group 
+(http://www.python.org/sigs/pythonmac-sig/, or send email to 
+pythonmac-sig-request@python.org). 
+ 
+Of course, there are also binary distributions available for these 
+platforms -- see http://www.python.org/. 
+ 
+To port Python to a new non-UNIX system, you will have to fake the 
+effect of running the configure script manually (for Mac and PC, this 
+has already been done for you).  A good start is to copy the file 
+pyconfig.h.in to pyconfig.h and edit the latter to reflect the actual 
+configuration of your system.  Most symbols must simply be defined as 
+1 only if the corresponding feature is present and can be left alone 
+otherwise; however the *_t type symbols must be defined as some 
+variant of int if they need to be defined at all. 
+ 
+For all platforms, it's important that the build arrange to define the 
+preprocessor symbol NDEBUG on the compiler command line in a release 
+build of Python (else assert() calls remain in the code, hurting 
+release-build performance).  The Unix, Windows and Mac builds already 
+do this. 
+ 
+ 
+Miscellaneous issues 
+==================== 
+ 
+Emacs mode 
+---------- 
+ 
+There's an excellent Emacs editing mode for Python code; see the file 
+Misc/python-mode.el.  Originally written by the famous Tim Peters, it is now 
+maintained by the equally famous Barry Warsaw.  The latest version, along with 
+various other contributed Python-related Emacs goodies, is online at 
+http://launchpad.net/python-mode/. 
+ 
+ 
+Tkinter 
+------- 
+ 
+The setup.py script automatically configures this when it detects a 
+usable Tcl/Tk installation.  This requires Tcl/Tk version 8.0 or 
+higher. 
+ 
+For more Tkinter information, see the Tkinter Resource page: 
+http://www.python.org/topics/tkinter/ 
+ 
+There are demos in the Demo/tkinter directory. 
+ 
+Note that there's a Python module called "Tkinter" (capital T) which 
+lives in Lib/lib-tk/Tkinter.py, and a C module called "_tkinter" 
+(lower case t and leading underscore) which lives in 
+Modules/_tkinter.c.  Demos and normal Tk applications import only the 
+Python Tkinter module -- only the latter imports the C _tkinter 
+module.  In order to find the C _tkinter module, it must be compiled 
+and linked into the Python interpreter -- the setup.py script does 
+this.  In order to find the Python Tkinter module, sys.path must be 
+set correctly -- normal installation takes care of this. 
+ 
+ 
+Distribution structure 
+---------------------- 
+ 
+Most subdirectories have their own README files.  Most files have 
+comments. 
+ 
+Demo/           Demonstration scripts, modules and programs 
+Doc/            Documentation sources (reStructuredText) 
+Grammar/        Input for the parser generator 
+Include/        Public header files 
+LICENSE         Licensing information 
+Lib/            Python library modules 
+Mac/            Macintosh specific resources 
+Makefile.pre.in Source from which config.status creates the Makefile.pre 
+Misc/           Miscellaneous useful files 
+Modules/        Implementation of most built-in modules 
+Objects/        Implementation of most built-in object types 
+PC/             Files specific to PC ports (DOS, Windows, OS/2) 
+PCbuild/        Build directory for Microsoft Visual C++ 
+Parser/         The parser and tokenizer and their input handling 
+Python/         The byte-compiler and interpreter 
+README          The file you're reading now 
+RISCOS/         Files specific to RISC OS port 
+Tools/          Some useful programs written in Python 
+pyconfig.h.in   Source from which pyconfig.h is created (GNU autoheader output) 
+configure       Configuration shell script (GNU autoconf output) 
 configure.ac    Configuration specification (input for GNU autoconf)
-install-sh      Shell script used to install files
-setup.py        Python script used to build extension modules
-
-The following files will (may) be created in the toplevel directory by
-the configuration and build processes:
-
-Makefile        Build rules
-Makefile.pre    Build rules before running Modules/makesetup
-buildno         Keeps track of the build number
-config.cache    Cache of configuration variables
-pyconfig.h      Configuration header
-config.log      Log from last configure run
-config.status   Status from last run of the configure script
-getbuildinfo.o  Object file from Modules/getbuildinfo.c
-libpython<version>.a    The library archive
-python          The executable interpreter
-reflog.txt      Output from running the regression suite with the -R flag 
-tags, TAGS      Tags files for vi and Emacs
-
-
-That's all, folks!
-------------------
-
-
---Guido van Rossum (home page: http://www.python.org/~guido/)
+install-sh      Shell script used to install files 
+setup.py        Python script used to build extension modules 
+ 
+The following files will (may) be created in the toplevel directory by 
+the configuration and build processes: 
+ 
+Makefile        Build rules 
+Makefile.pre    Build rules before running Modules/makesetup 
+buildno         Keeps track of the build number 
+config.cache    Cache of configuration variables 
+pyconfig.h      Configuration header 
+config.log      Log from last configure run 
+config.status   Status from last run of the configure script 
+getbuildinfo.o  Object file from Modules/getbuildinfo.c 
+libpython<version>.a    The library archive 
+python          The executable interpreter 
+reflog.txt      Output from running the regression suite with the -R flag  
+tags, TAGS      Tags files for vi and Emacs 
+ 
+ 
+That's all, folks! 
+------------------ 
+ 
+ 
+--Guido van Rossum (home page: http://www.python.org/~guido/) 
diff --git a/contrib/tools/python/src/config_init.c b/contrib/tools/python/src/config_init.c
index 2fa47000b8..13189c0dea 100644
--- a/contrib/tools/python/src/config_init.c
+++ b/contrib/tools/python/src/config_init.c
@@ -1,56 +1,56 @@
-/* Generated automatically by ../modules.py */
-
-#include "config_platform.h"
-
-extern void init_bisect(void);
-extern void init_collections(void);
-extern void init_csv(void);
+/* Generated automatically by ../modules.py */ 
+ 
+#include "config_platform.h" 
+ 
+extern void init_bisect(void); 
+extern void init_collections(void); 
+extern void init_csv(void); 
 extern void init_elementtree(void);
-extern void init_functools(void);
-extern void init_hashlib(void);
-extern void init_heapq(void);
-extern void init_hotshot(void);
-extern void init_io(void);
-extern void init_json(void);
-extern void init_locale(void);
-extern void init_lsprof(void);
-extern void init_md5(void);
-extern void init_multibytecodec(void);
-extern void init_random(void);
-extern void init_sha(void);
-extern void init_sha256(void);
-extern void init_sha512(void);
-extern void init_ssl(void);
-extern void init_struct(void);
-extern void initarray(void);
-extern void initaudioop(void);
-extern void initbinascii(void);
-extern void initbz2(void);
-extern void initcPickle(void);
-extern void initcStringIO(void);
-extern void initcmath(void);
-extern void initdatetime(void);
-extern void initfuture_builtins(void);
-extern void inititertools(void);
-extern void initmath(void);
-extern void initmmap(void);
-extern void initoperator(void);
-extern void initparser(void);
-extern void initstrop(void);
-extern void inittime(void);
-extern void initunicodedata(void);
-extern void initzlib(void);
-
-#ifdef _FREEBSD_
-extern void init_multiprocessing(void);
-extern void init_multiprocessing(void);
-#endif
-
-#ifdef _LINUX_
-extern void init_multiprocessing(void);
-extern void initspwd(void);
-#endif
-
+extern void init_functools(void); 
+extern void init_hashlib(void); 
+extern void init_heapq(void); 
+extern void init_hotshot(void); 
+extern void init_io(void); 
+extern void init_json(void); 
+extern void init_locale(void); 
+extern void init_lsprof(void); 
+extern void init_md5(void); 
+extern void init_multibytecodec(void); 
+extern void init_random(void); 
+extern void init_sha(void); 
+extern void init_sha256(void); 
+extern void init_sha512(void); 
+extern void init_ssl(void); 
+extern void init_struct(void); 
+extern void initarray(void); 
+extern void initaudioop(void); 
+extern void initbinascii(void); 
+extern void initbz2(void); 
+extern void initcPickle(void); 
+extern void initcStringIO(void); 
+extern void initcmath(void); 
+extern void initdatetime(void); 
+extern void initfuture_builtins(void); 
+extern void inititertools(void); 
+extern void initmath(void); 
+extern void initmmap(void); 
+extern void initoperator(void); 
+extern void initparser(void); 
+extern void initstrop(void); 
+extern void inittime(void); 
+extern void initunicodedata(void); 
+extern void initzlib(void); 
+ 
+#ifdef _FREEBSD_ 
+extern void init_multiprocessing(void); 
+extern void init_multiprocessing(void); 
+#endif 
+ 
+#ifdef _LINUX_ 
+extern void init_multiprocessing(void); 
+extern void initspwd(void); 
+#endif 
+ 
 #ifdef _DARWIN_
 #ifndef __IOS__
 extern void init_multiprocessing(void);
@@ -62,30 +62,30 @@ extern void init_scproxy(void);
 extern void init_multiprocessing(void);
 #endif
 
-#ifdef _UNIX_
-extern void init_socket(void);
-extern void initcrypt(void);
-extern void initfcntl(void);
-extern void initgrp(void);
-extern void initposix(void);
-extern void initpwd(void);
-extern void initpyexpat(void);
-extern void initresource(void);
-extern void initselect(void);
-extern void initsyslog(void);
-extern void inittermios(void);
-#endif
-
-#ifdef _WIN32_
-extern void init_multiprocessing(void);
-extern void init_socket(void);
-extern void initnt(void);
-extern void initpyexpat(void);
-extern void initselect(void);
+#ifdef _UNIX_ 
+extern void init_socket(void); 
+extern void initcrypt(void); 
+extern void initfcntl(void); 
+extern void initgrp(void); 
+extern void initposix(void); 
+extern void initpwd(void); 
+extern void initpyexpat(void); 
+extern void initresource(void); 
+extern void initselect(void); 
+extern void initsyslog(void); 
+extern void inittermios(void); 
+#endif 
+ 
+#ifdef _WIN32_ 
+extern void init_multiprocessing(void); 
+extern void init_socket(void); 
+extern void initnt(void); 
+extern void initpyexpat(void); 
+extern void initselect(void); 
 extern void initmsvcrt(void);
 extern void init_subprocess(void);
 extern void init_winreg(void);
-#endif
+#endif 
 
 #if !defined(_CYGWIN_)
 extern void init_ctypes(void);
diff --git a/contrib/tools/python/src/config_map.c b/contrib/tools/python/src/config_map.c
index 6bfe125ddd..ac01270dba 100644
--- a/contrib/tools/python/src/config_map.c
+++ b/contrib/tools/python/src/config_map.c
@@ -1,56 +1,56 @@
-/* Generated automatically by ../modules.py */
-
-#include "config_platform.h"
-
-{"_bisect", init_bisect},
-{"_collections", init_collections},
-{"_csv", init_csv},
+/* Generated automatically by ../modules.py */ 
+ 
+#include "config_platform.h" 
+ 
+{"_bisect", init_bisect}, 
+{"_collections", init_collections}, 
+{"_csv", init_csv}, 
 {"_elementtree", init_elementtree},
-{"_functools", init_functools},
-{"_hashlib", init_hashlib},
-{"_heapq", init_heapq},
-{"_hotshot", init_hotshot},
-{"_io", init_io},
-{"_json", init_json},
-{"_locale", init_locale},
-{"_lsprof", init_lsprof},
-{"_md5", init_md5},
-{"_multibytecodec", init_multibytecodec},
-{"_random", init_random},
-{"_sha", init_sha},
-{"_sha256", init_sha256},
-{"_sha512", init_sha512},
-{"_ssl", init_ssl},
-{"_struct", init_struct},
-{"array", initarray},
-{"audioop", initaudioop},
-{"binascii", initbinascii},
-{"bz2", initbz2},
-{"cPickle", initcPickle},
-{"cStringIO", initcStringIO},
-{"cmath", initcmath},
-{"datetime", initdatetime},
-{"future_builtins", initfuture_builtins},
-{"itertools", inititertools},
-{"math", initmath},
-{"mmap", initmmap},
-{"operator", initoperator},
-{"parser", initparser},
-{"strop", initstrop},
-{"time", inittime},
-{"unicodedata", initunicodedata},
-{"zlib", initzlib},
-
-#ifdef _FREEBSD_
-{"_multiprocessing", init_multiprocessing},
-{"_multiprocessing", init_multiprocessing},
-#endif
-
-#ifdef _LINUX_
-{"_multiprocessing", init_multiprocessing},
-{"spwd", initspwd},
-#endif
-
+{"_functools", init_functools}, 
+{"_hashlib", init_hashlib}, 
+{"_heapq", init_heapq}, 
+{"_hotshot", init_hotshot}, 
+{"_io", init_io}, 
+{"_json", init_json}, 
+{"_locale", init_locale}, 
+{"_lsprof", init_lsprof}, 
+{"_md5", init_md5}, 
+{"_multibytecodec", init_multibytecodec}, 
+{"_random", init_random}, 
+{"_sha", init_sha}, 
+{"_sha256", init_sha256}, 
+{"_sha512", init_sha512}, 
+{"_ssl", init_ssl}, 
+{"_struct", init_struct}, 
+{"array", initarray}, 
+{"audioop", initaudioop}, 
+{"binascii", initbinascii}, 
+{"bz2", initbz2}, 
+{"cPickle", initcPickle}, 
+{"cStringIO", initcStringIO}, 
+{"cmath", initcmath}, 
+{"datetime", initdatetime}, 
+{"future_builtins", initfuture_builtins}, 
+{"itertools", inititertools}, 
+{"math", initmath}, 
+{"mmap", initmmap}, 
+{"operator", initoperator}, 
+{"parser", initparser}, 
+{"strop", initstrop}, 
+{"time", inittime}, 
+{"unicodedata", initunicodedata}, 
+{"zlib", initzlib}, 
+ 
+#ifdef _FREEBSD_ 
+{"_multiprocessing", init_multiprocessing}, 
+{"_multiprocessing", init_multiprocessing}, 
+#endif 
+ 
+#ifdef _LINUX_ 
+{"_multiprocessing", init_multiprocessing}, 
+{"spwd", initspwd}, 
+#endif 
+ 
 #ifdef _DARWIN_
 #ifndef __IOS__
 {"_multiprocessing", init_multiprocessing},
@@ -62,30 +62,30 @@
 {"_multiprocessing", init_multiprocessing},
 #endif
 
-#ifdef _UNIX_
-{"_socket", init_socket},
-{"crypt", initcrypt},
-{"fcntl", initfcntl},
-{"grp", initgrp},
-{"posix", initposix},
-{"pwd", initpwd},
-{"pyexpat", initpyexpat},
-{"resource", initresource},
-{"select", initselect},
-{"syslog", initsyslog},
-{"termios", inittermios},
-#endif
-
-#ifdef _WIN32_
-{"_multiprocessing", init_multiprocessing},
-{"_socket", init_socket},
-{"nt", initnt},
-{"pyexpat", initpyexpat},
-{"select", initselect},
+#ifdef _UNIX_ 
+{"_socket", init_socket}, 
+{"crypt", initcrypt}, 
+{"fcntl", initfcntl}, 
+{"grp", initgrp}, 
+{"posix", initposix}, 
+{"pwd", initpwd}, 
+{"pyexpat", initpyexpat}, 
+{"resource", initresource}, 
+{"select", initselect}, 
+{"syslog", initsyslog}, 
+{"termios", inittermios}, 
+#endif 
+ 
+#ifdef _WIN32_ 
+{"_multiprocessing", init_multiprocessing}, 
+{"_socket", init_socket}, 
+{"nt", initnt}, 
+{"pyexpat", initpyexpat}, 
+{"select", initselect}, 
 {"msvcrt", initmsvcrt},
 {"_subprocess", init_subprocess},
 {"_winreg", init_winreg},
-#endif
+#endif 
 
 #if defined(_x86_) && !defined(_CYGWIN_) || defined(__powerpc__) || defined(__aarch64__)
 {"_ctypes", init_ctypes},
diff --git a/contrib/tools/python/ya.make b/contrib/tools/python/ya.make
index fc95aaca64..2d717744ce 100644
--- a/contrib/tools/python/ya.make
+++ b/contrib/tools/python/ya.make
@@ -1,5 +1,5 @@
-PROGRAM(python)
-
+PROGRAM(python) 
+ 
 OWNER(g:contrib orivej)
 
 LICENSE(PSF-2.0)
@@ -12,8 +12,8 @@ PEERDIR(
     contrib/tools/python/libpython
     contrib/tools/python/src/Modules/_sqlite
 )
-
-END()
+ 
+END() 
 
 RECURSE_FOR_TESTS(
     tests