changeset: 93337:c2a3865a59f4 user: Steve Dower date: Sat Nov 01 15:15:16 2014 -0700 files: Lib/test/test_marshal.py Python/marshal.c description: #22734 marshal needs a lower stack depth for debug builds on Windows diff -r a944fe09fae8 -r c2a3865a59f4 Lib/test/test_marshal.py --- a/Lib/test/test_marshal.py Sat Nov 01 15:14:27 2014 -0700 +++ b/Lib/test/test_marshal.py Sat Nov 01 15:15:16 2014 -0700 @@ -188,7 +188,7 @@ head = last = [] # The max stack depth should match the value in Python/marshal.c. if os.name == 'nt' and hasattr(sys, 'gettotalrefcount'): - MAX_MARSHAL_STACK_DEPTH = 1500 + MAX_MARSHAL_STACK_DEPTH = 1000 else: MAX_MARSHAL_STACK_DEPTH = 2000 for i in range(MAX_MARSHAL_STACK_DEPTH - 2): diff -r a944fe09fae8 -r c2a3865a59f4 Python/marshal.c --- a/Python/marshal.c Sat Nov 01 15:14:27 2014 -0700 +++ b/Python/marshal.c Sat Nov 01 15:15:16 2014 -0700 @@ -19,7 +19,7 @@ * On Windows debug builds, reduce this value. */ #if defined(MS_WINDOWS) && defined(_DEBUG) -#define MAX_MARSHAL_STACK_DEPTH 1500 +#define MAX_MARSHAL_STACK_DEPTH 1000 #else #define MAX_MARSHAL_STACK_DEPTH 2000 #endif