Merge pull request #70 from piranna/milestone_0.1.5milestone_0.1.5

Milestone 0.1.5

1 files changed, 7 insertions, 3 deletions

diff --git a/sqlparse/formatter.py b/sqlparse/formatter.py
index f182850..39e5d28 100644
--- a/sqlparse/formatter.py
+++ b/sqlparse/formatter.py
@@ -9,6 +9,9 @@ from sqlparse import SQLParseError
 from sqlparse import filters
 
 
+INDENT_WIDTH = 2
+
+
 def validate_options(options):
     """Validates options."""
 
@@ -57,7 +60,7 @@ def validate_options(options):
         options['indent_char'] = ' '
 
     # indent_width
-    indent_width = options.get('indent_width', 2)
+    indent_width = options.get('indent_width', INDENT_WIDTH)
     try:
         indent_width = int(indent_width)
     except (TypeError, ValueError):
@@ -70,7 +73,7 @@ def validate_options(options):
 
     # right_margin
     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):
@@ -112,7 +115,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()