Tests pass. Now we need to make them beatiful...

Author: Nurdok

pep257.py

@@ -21,6 +21,7 @@
 from optparse import OptionParser
 from re import compile as re
 import itertools
+from collections import defaultdict
 
 try:  # Python 3.x
     from ConfigParser import RawConfigParser
@@ -131,7 +132,7 @@ def __str__(self):
 class Module(Definition):
 
     _fields = ('name', '_source', 'start', 'end', 'decorators', 'docstring',
-               'children', 'parent', '_all', 'unicode_literals')
+               'children', 'parent', '_all', 'future_imports')
     is_public = True
     _nest = staticmethod(lambda s: {'def': Function, 'class': Class}[s])
     module = property(lambda self: self)
@@ -197,7 +198,7 @@ class Decorator(Value):
 
 class TokenKind(int):
     def __repr__(self):
-        return "tk.{}".format(tk.tok_name[self])
+        return "tk.{0}".format(tk.tok_name[self])
 
 
 class Token(Value):
@@ -252,7 +253,7 @@ def __call__(self, filelike, filename):
         self.filename = filename
         self.all = None
         # TODO: what about Python 3.x?
-        self.unicode_literals = False
+        self.future_imports = defaultdict(lambda: False)
         self._accumulated_decorators = []
         return self.parse_module()
 
@@ -414,7 +415,7 @@ def parse_module(self):
                      [], docstring, children, None, self.all)
         for child in module.children:
             child.parent = module
-        module.unicode_literals = self.unicode_literals
+        module.future_imports = self.future_imports
         log.debug("finished parsing module.")
         return module
 
@@ -479,9 +480,29 @@ def parse_from_import_statement(self):
         self.stream.move()
         assert self.current.value == 'import', self.current.value
         self.stream.move()
-        # TODO: lookout for parenthesis, comments, line breaks, etc.
-        if self.current.value == 'unicode_literals':
-            self.unicode_literals = True
+        if self.current.value == '(':
+            self.consume(tk.OP)
+            expected_end_kind = tk.OP
+        else:
+            expected_end_kind = tk.NEWLINE
+        while self.current.kind != expected_end_kind:
+            if self.current.kind != tk.NAME:
+                self.stream.move()
+                continue
+            log.debug("parsing import, token is %r (%s)",
+                      self.current.kind, self.current.value)
+            log.debug('found future import: %s', self.current.value)
+            self.future_imports[self.current.value] = True
+            self.consume(tk.NAME)
+            log.debug("parsing import, token is %r (%s)",
+                      self.current.kind, self.current.value)
+            if self.current.kind == tk.NAME:
+                self.consume(tk.NAME)  # as
+                self.consume(tk.NAME)  # new name, irrelevant
+            if self.current.value == ',':
+                self.consume(tk.OP)
+            log.debug("parsing import, token is %r (%s)",
+                      self.current.kind, self.current.value)
 
 
 class Error(object):
@@ -1146,7 +1167,7 @@ def check_unicode_docstring(self, definition, docstring):
         For Unicode docstrings, use u"""Unicode triple-quoted strings""".
 
         '''
-        if definition.module.unicode_literals:
+        if definition.module.future_imports['unicode_literals']:
             return
 
         # Just check that docstring is unicode, check_triple_double_quotes

test_definitions.py

@@ -42,11 +42,10 @@ def nested_3(self):
 
 def test_parser():
     dunder_all = ('a', 'bc')
-    unicode_literals = False
     module = parse(StringIO(source), 'file.py')
     assert len(list(module)) == 8
     assert Module('file.py', _, 1, len(source.split('\n')),
-                  _, '"""Module."""', _, _, dunder_all, unicode_literals) == \
+                  _, '"""Module."""', _, _, dunder_all, {}) == \
         module
 
     function, class_ = module.children
@@ -75,17 +74,18 @@ def test_parser():
 
     module = parse(StringIO(source_alt), 'file_alt.py')
     assert Module('file_alt.py', _, 1, len(source_alt.split('\n')),
-                  _, None, _, _, dunder_all, unicode_literals) == module
+                  _, None, _, _, dunder_all, {}) == module
 
     module = parse(StringIO(source_alt_nl_at_bracket), 'file_alt_nl.py')
     assert Module('file_alt_nl.py', _, 1,
                   len(source_alt_nl_at_bracket.split('\n')), _, None, _, _,
-                  dunder_all, unicode_literals) == module
+                  dunder_all, {}) == module
 
     module = parse(StringIO(source_unicode_literals), 'file_ucl.py')
     assert Module('file_ucl.py', _, 1,
                   _, _, None, _, _,
-                  _, True) == module
+                  _, {'unicode_literals': True}) == module
+    assert module.future_imports['unicode_literals']
 
 
 def _test_module():

test_pep257.py

@@ -57,7 +57,8 @@ def invoke_pep257(self, args=""):
         cmd = shlex.split("python {0} {1} {2}"
                           .format(pep257_location, self.tempdir, args),
                           posix=False)
-        p = subprocess.Popen(cmd, stdout=subprocess.PIPE,
+        p = subprocess.Popen(cmd,
+                             stdout=subprocess.PIPE,
                              stderr=subprocess.PIPE)
         out, err = p.communicate()
         return self.Result(out=out.decode('utf-8'),
@@ -72,6 +73,7 @@ def __enter__(self):
 
     def __exit__(self, *args, **kwargs):
         shutil.rmtree(self.tempdir)
+        pass
 
 
 def test_pep257_conformance():
@@ -315,7 +317,7 @@ def u(x):
         with env.open('example.py', 'wt') as example:
             example.write(textwrap.dedent(u('''\
                 # -*- coding: utf-8 -*-
-                """This is a modue."""
+                """This is a module."""
 
                 def foo():
                     """Check unicode: \u2611."""
@@ -346,7 +348,7 @@ def foo():
                 """This is a module."""
 
                 from __future__ import (nested_scopes as ns,
-                unicode_literals)
+                                        unicode_literals)
 
                 def foo():
                     """Check unicode: \u2611."""