[Python-checkins] cpython (merge 3.3 -> 3.3): Merge heads

Mon Dec 16 14:22:58 CET 2013

http://hg.python.org/cpython/rev/46c5adfeba9d
changeset: 87993:46c5adfeba9d
branch: 3.3
parent: 87989:129105f8457d
parent: 87983:e696c1057c98
user: Serhiy Storchaka <storchaka at gmail.com>
date: Mon Dec 16 15:16:35 2013 +0200
summary:
 Merge heads
files:
 Lib/test/test_devpoll.py | 1 +
 Makefile.pre.in | 3 ++-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Lib/test/test_devpoll.py b/Lib/test/test_devpoll.py
--- a/Lib/test/test_devpoll.py
+++ b/Lib/test/test_devpoll.py
@@ -4,6 +4,7 @@
 
 import os, select, random, unittest, sys
 from test.support import TESTFN, run_unittest
+from _testcapi import USHRT_MAX
 
 try:
 select.devpoll
diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -848,7 +848,8 @@
 		$(srcdir)/Include/warnings.h \
 		$(srcdir)/Include/weakrefobject.h \
 		pyconfig.h \
-		$(PARSER_HEADERS)
+		$(PARSER_HEADERS) \
+		$(AST_H)
 
 $(LIBRARY_OBJS) $(MODOBJS) Modules/python.o: $(PYTHON_HEADERS)
 
-- 
Repository URL: http://hg.python.org/cpython
