Add tests with unicode data. Fix few issues.

Author: ionelmc

src/hunter.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import unicode_literals
 
 import ast
 import atexit
@@ -231,7 +230,6 @@ def yield_lines(filename, start, collector,
             amount = len(dedent)
         elif not line.startswith(dedent):
             break
-        # print(start, repr(line))
         collector(line)
         yield line[amount:]
 

tests/sample2.py

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-if __name__ == "__main__":
+if __name__ == "__main__":  # ăăăă
     import functools
 
     def deco(opt):
@@ -17,13 +17,13 @@ def foo(*args):
         return args
 
     foo(
-        'a',
+        'aăă',
         'b'
     )
     try:
         None(
             'a',
             'b'
-        )  # doh!
+        )  # dăh!
     except:
         pass

tests/test_hunter.py

@@ -3,7 +3,10 @@
 import os
 import subprocess
 from fnmatch import fnmatchcase
-from io import StringIO
+try:
+    from StringIO import StringIO
+except ImportError:
+    from io import StringIO
 try:
     from itertools import izip_longest
 except ImportError:
@@ -50,8 +53,8 @@ def test_pth_sample2():
         stderr=subprocess.STDOUT,
     )
     for line, expected in izip_longest(output.decode('utf8').splitlines(), [
-        '* tests/sample2.py:* call      if __name__ == "__main__":',
-        '* tests/sample2.py:* line      if __name__ == "__main__":',
+        '* tests/sample2.py:* call      if __name__ == "__main__":  #*',
+        '* tests/sample2.py:* line      if __name__ == "__main__":  #*',
         '* tests/sample2.py:* line          import functools',
         '* tests/sample2.py:* line          def deco(opt):',
         '* tests/sample2.py:* line          @deco(1)',
@@ -88,7 +91,7 @@ def test_pth_sample2():
         '* tests/sample2.py:* return                return wrapper',
         '*                  * ...       return value: <function foo *',
         '* tests/sample2.py:* line          foo(',
-        "* tests/sample2.py:* line              'a',",
+        "* tests/sample2.py:* line              'a*',",
         "* tests/sample2.py:* line              'b'",
         '* tests/sample2.py:* call                  @functools.wraps(func)',
         '*                  *    |                  def wrapper(*args):',
@@ -105,13 +108,13 @@ def test_pth_sample2():
         '*                  *    |          def foo(*args):',
         '* tests/sample2.py:* line              return args',
         '* tests/sample2.py:* return            return args',
-        "*                  * ...       return value: ('a', 'b')",
+        "*                  * ...       return value: ('a*', 'b')",
         "* tests/sample2.py:* return                    return func(*args)",
-        "*                  * ...       return value: ('a', 'b')",
+        "*                  * ...       return value: ('a*', 'b')",
         "* tests/sample2.py:* return                    return func(*args)",
-        "*                  * ...       return value: ('a', 'b')",
+        "*                  * ...       return value: ('a*', 'b')",
         "* tests/sample2.py:* return                    return func(*args)",
-        "*                  * ...       return value: ('a', 'b')",
+        "*                  * ...       return value: ('a*', 'b')",
         "* tests/sample2.py:* line          try:",
         "* tests/sample2.py:* line              None(",
         "* tests/sample2.py:* line                  'a',",