From: Philip Jenvey <pjenvey@underboss.org>
Date: Thu, 14 Apr 2011 01:45:58 +0000 (-0700)
Subject: explicitly disable the cextension on Python 3 until it's updated for it
X-Git-Tag: rel_0_7b4~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6fd32e17380dfe758050fab12987e14c46f70c4;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

explicitly disable the cextension on Python 3 until it's updated for it
---

diff --git a/CHANGES b/CHANGES
index 16cd316c66..b1810f8742 100644
--- a/CHANGES
+++ b/CHANGES
@@ -92,9 +92,9 @@ CHANGES
     (also in 0.6.7)
 
 - engine
-  - The C extension is now enabled by default with a
-    fallback to pure python if it fails to compile.
-    [ticket:2129]
+  - The C extension is now enabled by default on CPython
+    2.x with a fallback to pure python if it fails to
+    compile.  [ticket:2129]
 
 - schema
   - The 'useexisting' flag on Table has been superceded
diff --git a/setup.py b/setup.py
index f21b21454e..6dcdd83455 100644
--- a/setup.py
+++ b/setup.py
@@ -16,10 +16,13 @@ except ImportError:
     from distutils.core import setup, Extension
     Feature = None
 
+pypy = hasattr(sys, 'pypy_version_info')
+py3k = False
 extra = {}
 if sys.version_info < (2, 4):
     raise Exception("SQLAlchemy requires Python 2.4 or higher.")
 elif sys.version_info >= (3, 0):
+    py3k = True
     # monkeypatch our preprocessor
     # onto the 2to3 tool.
     from sa2to3 import refactor_string
@@ -29,7 +32,6 @@ elif sys.version_info >= (3, 0):
     extra.update(
         use_2to3=True,
     )
-IS_PYPY = hasattr(sys, 'pypy_translation_info')
 
 ext_modules = [
     Extension('sqlalchemy.cprocessors',
@@ -243,7 +245,7 @@ def run_setup(with_cext):
 
 try:
     # Likely don't want the cextension built on PyPy+CPyExt
-    run_setup(not IS_PYPY)
+    run_setup(not (pypy or py3k))
 except BuildFailed, exc:
     print '*' * 75
     print exc.cause