Merge pull request #143 from Nurdok/all-token-error

Fixed the creation of an AllError when there is an unexpected token

Author: Nurdok

docs/release_notes.rst

@@ -2,6 +2,15 @@ Release Notes
 =============
 
 
+Current Development Version
+---------------------------
+
+Bug Fixes
+
+* Fixed an issue where a `NameError` was raised when parsing complex defintions
+  of `__all__` (#142, #143).
+
+
 0.7.0 - October 9th, 2015
 -------------------------
 

src/pep257.py

@@ -389,8 +389,8 @@ def parse_all(self):
                   self.current.value == ','):
                 all_content += self.current.value
             else:
-                kind = token.tok_name[self.current.kind]
-                raise AllError('Unexpected token kind in  __all__: %s' % kind)
+                raise AllError('Unexpected token kind in  __all__: %r. ' %
+                               self.current.kind)
             self.stream.move()
         self.consume(tk.OP)
         all_content += ")"

src/tests/test_definitions.py

@@ -1,7 +1,8 @@
 import os
+import pytest
 from ..pep257 import (StringIO, TokenStream, Parser, Error, check,
                       Module, Class, Method, Function, NestedFunction,
-                      ErrorRegistry)
+                      ErrorRegistry, AllError)
 
 
 _ = type('', (), dict(__repr__=lambda *a: '_', __eq__=lambda *a: True))()
@@ -44,6 +45,13 @@ def nested_3(self):
 from __future__ import (nested_scopes as ns,
                         unicode_literals)
 '''
+source_complex_all = '''
+import foo
+import bar
+
+__all__ = (foo.__all__ +
+           bar.__all)
+'''
 
 
 def test_parser():
@@ -98,6 +106,8 @@ def test_parser():
                   _, {'unicode_literals': True, 'nested_scopes': True}) \
         == module
     assert module.future_imports['unicode_literals']
+    with pytest.raises(AllError):
+        parse(StringIO(source_complex_all), 'file_complex_all.py')
 
 
 def _test_module():