Update init and misc files

2 files changed, 10 insertions, 9 deletions

diff --git a/sqlparse/__init__.py b/sqlparse/__init__.py
index cb83a71..e5baf4c 100644
--- a/sqlparse/__init__.py
+++ b/sqlparse/__init__.py
@@ -7,16 +7,17 @@
 
 """Parse SQL statements."""
 
-
-__version__ = '0.2.0.dev0'
-
-
 # Setup namespace
-from sqlparse import engine  # noqa
-from sqlparse import filters  # noqa
-from sqlparse import formatter  # noqa
+from sqlparse import sql
+from sqlparse import engine
+from sqlparse import tokens
+from sqlparse import filters
+from sqlparse import formatter
+
+from sqlparse.compat import u
 
-from sqlparse.compat import u  # noqa
+__version__ = '0.2.0.dev0'
+__all__ = ['engine', 'filters', 'formatter', 'sql', 'tokens']
 
 
 def parse(sql, encoding=None):
diff --git a/sqlparse/compat.py b/sqlparse/compat.py
index 0defd86..a41b18b 100644
--- a/sqlparse/compat.py
+++ b/sqlparse/compat.py
@@ -50,5 +50,5 @@ elif PY2:
 
 
     text_type = unicode
-    string_types = (basestring,)
+    string_types = (str, unicode,)
     from StringIO import StringIO