fixed tests

wolph · Jan 20, 2017 · 611c8b8 · 611c8b8
1 parent 27ebcc7
commit 611c8b8
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/formatter2/formatter.py b/formatter2/formatter.py
@@ -1,3 +1,5 @@
+from __future__ import print_function
+
 import os
 import sys
 import logging
@@ -25,12 +27,11 @@ def __call__(self, input_file, seek=True):
         else:
             with open(input_file) as fh:
                 file_ = _stringio.StringIO()
-                file_.write(fh.read())
+                print(fh.read(), file=file_)
                 file_.seek(0)
                 tokens = Tokens.from_readline(file_.readline)
 
         formatted = tokens()
-
         # Test if we didn't break anything
         try:
             compile(formatted, '', 'exec')
@@ -74,5 +75,5 @@ def format_file(self, name):
     def format_string(cls, string):
         formatter = Formatter()
         fh = _stringio.StringIO()
-        fh.write(string)
+        print(string, file=fh)
         return formatter(fh)
diff --git a/formatter2/offsets.py b/formatter2/offsets.py
@@ -252,8 +252,8 @@ def get_token_offsets():
     keywords['except'].post = 1
     keywords['import'].post = 1
     keywords['for'].post = 1
-    keywords['while'].post = 1
-    keywords['del'].post = 1
+    # keywords['while'].post = 1
+    # keywords['del'].post = 1
     keywords['if'].post = 1
     keywords['if'].pre_collapse = False
     # keywords['if'].post_collapse = False
@@ -411,4 +411,6 @@ def get_token_offsets():
 
     return token_offsets
 
+
 TOKEN_OFFSETS = get_token_offsets()
+
diff --git a/formatter2/tokens.py b/formatter2/tokens.py
@@ -104,7 +104,7 @@ def __tab_to_space(match):
             while True:
                 try:
                     yield re.sub('^\s+', __tab_to_space, readline())
-                except StopIteration:
+                except StopIteration:  # pragma: no cover
                     break
 
         readline = iter(_tab_to_space(readline)).next

diff --git a/formatter2/types.py b/formatter2/types.py
@@ -143,4 +143,6 @@ def get_token_types():
     token_types.register(IndentTokenType)
     return token_types
 
+
 TOKEN_TYPES = get_token_types()
+
diff --git a/pytest.ini b/pytest.ini
@@ -16,5 +16,6 @@ flake8-ignore =
     formatter2/tokenize_fork.py ALL
     formatter2/_stringio.py ALL
     tests/samples/*.py F811
+    tests/samples/dictionaries.py F999
     *.py W391
 
diff --git a/tests/samples/generators.py b/tests/samples/generators.py
@@ -1,6 +1,7 @@
 def spam():
     yield 'eggs'
 
+
 spam = ('egg %d' % egg for egg in range(5))