[Python-checkins] cpython (merge 3.3 -> default): Issue #18517: merge from 3.3

[ned.deily]

http://hg.python.org/cpython/rev/1d832bc857e2
changeset:   84974:1d832bc857e2
parent:      84972:454e9db1c750
parent:      84973:e5607874e8ff
user:        Ned Deily <nad at acm.org>
date:        Thu Aug 01 23:53:24 2013 -0700
summary:
  Issue #18517: merge from 3.3

files:
  setup.py |  17 +++++++++--------
  1 files changed, 9 insertions(+), 8 deletions(-)


diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -1534,6 +1534,15 @@
         if '_tkinter' not in [e.name for e in self.extensions]:
             missing.append('_tkinter')
 
+##         # Uncomment these lines if you want to play with xxmodule.c
+##         ext = Extension('xx', ['xxmodule.c'])
+##         self.extensions.append(ext)
+
+        if 'd' not in sys.abiflags:
+            ext = Extension('xxlimited', ['xxlimited.c'],
+                            define_macros=[('Py_LIMITED_API', 1)])
+            self.extensions.append(ext)
+
         return missing
 
     def detect_tkinter_darwin(self, inc_dirs, lib_dirs):
@@ -1731,14 +1740,6 @@
                         )
         self.extensions.append(ext)
 
-##         # Uncomment these lines if you want to play with xxmodule.c
-##         ext = Extension('xx', ['xxmodule.c'])
-##         self.extensions.append(ext)
-        if 'd' not in sys.abiflags:
-            ext = Extension('xxlimited', ['xxlimited.c'],
-                            define_macros=[('Py_LIMITED_API', 1)])
-            self.extensions.append(ext)
-
         # XXX handle these, but how to detect?
         # *** Uncomment and edit for PIL (TkImaging) extension only:
         #       -DWITH_PIL -I../Extensions/Imaging/libImaging  tkImaging.c \

-- 
Repository URL: http://hg.python.org/cpython