Actually import setup, even without setuptools (fixes #115).

andialbrecht · Oct 24, 2013 · 1acf52d · 1acf52d
1 parent c08c750
commit 1acf52d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/CHANGES b/CHANGES
@@ -4,6 +4,7 @@ Development Version
 Bug Fixes
 * Removed buffered reading again, it obviously causes wrong parsing in some rare
   cases (issue114).
+* Fix regression in setup.py introduced 10 months ago (issue115).
 
 Enhancements
 * Improved support for JOINs, by Alexander Beedie.

diff --git a/setup.py b/setup.py
@@ -12,6 +12,7 @@
 except ImportError:
     if sys.version_info[0] == 3:
         raise RuntimeError('distribute is required to install this package.')
+    from distutils.core import setup
     packages = ['sqlparse', 'sqlparse.engine']