Merge branch 'milestone_0.1.5' into milestone_0.2.0

Conflicts:
	sqlparse/filters.py
	sqlparse/formatter.py

1 files changed, 9 insertions, 3 deletions

diff --git a/sqlparse/formatter.py b/sqlparse/formatter.py
index 75f21a8..edbafa1 100644
--- a/sqlparse/formatter.py
+++ b/sqlparse/formatter.py
@@ -13,6 +13,9 @@ class SQLParseError(Exception):
     """Base class for exceptions in this module."""
 
 
+INDENT_WIDTH = 2
+
+
 def validate_options(options):
     """Validates options."""
     kwcase = options.get('keyword_case', None)
@@ -50,7 +53,9 @@ def validate_options(options):
         options['indent_char'] = '\t'
     else:
         options['indent_char'] = ' '
-    indent_width = options.get('indent_width', 2)
+
+    # indent_width
+    indent_width = options.get('indent_width', INDENT_WIDTH)
     try:
         indent_width = int(indent_width)
     except (TypeError, ValueError):
@@ -60,7 +65,7 @@ def validate_options(options):
     options['indent_width'] = indent_width
 
     right_margin = options.get('right_margin', None)
-    if right_margin is not None:
+    if right_margin:
         try:
             right_margin = int(right_margin)
         except (TypeError, ValueError):
@@ -102,7 +107,8 @@ def build_filter_stack(stack, options):
         stack.enable_grouping()
         stack.stmtprocess.append(
             filters.ReindentFilter(char=options['indent_char'],
-                                   width=options['indent_width']))
+                                   width=options['indent_width'],
+                                   line_width=options['right_margin']))
 
     if options.get('right_margin', False):
         stack.enable_grouping()