summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndi Albrecht <albrecht.andi@gmail.com>2013-10-24 21:22:32 +0200
committerAndi Albrecht <albrecht.andi@gmail.com>2013-10-24 21:22:32 +0200
commit1acf52dc96f595d972375c0f2a185a668929a211 (patch)
treeda79c8b8ce71b66c150355a213747487c6696281
parentc08c750e799af5c17ccbebf9b34b95a38f8cfb55 (diff)
downloadsqlparse-1acf52dc96f595d972375c0f2a185a668929a211.tar.gz
Actually import setup, even without setuptools (fixes #115).
-rw-r--r--CHANGES1
-rw-r--r--setup.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index ffb8079..1b6a0f5 100644
--- 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
index ef8e30c..2c6dce8 100644
--- a/setup.py
+++ b/setup.py
@@ -12,6 +12,7 @@ try:
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']