Moved unicode_literals test to test case / parser tests.

Author: Nurdok

src/tests/test_cases/unicode_literals.py

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+"""This is a module."""
+
+from __future__ import unicode_literals
+
+
+def with_unicode_docstring_without_u():
+    """Check unicode: \u2611."""

src/tests/test_definitions.py

@@ -39,6 +39,10 @@ def nested_3(self):
 source_unicode_literals = '''
 from __future__ import unicode_literals
 '''
+source_multiple_future_imports = '''
+from __future__ import (nested_scopes as ns,
+                        unicode_literals)
+'''
 
 
 def test_parser():
@@ -86,6 +90,12 @@ def test_parser():
     assert Module('file_ucl.py', _, 1,
                   _, _, None, _, _,
                   _, {'unicode_literals': True}) == module
+
+    module = parse(StringIO(source_multiple_future_imports), 'file_mfi.py')
+    assert Module('file_mfi.py', _, 1,
+                  _, _, None, _, _,
+                  _, {'unicode_literals': True, 'nested_scopes': True}) \
+        == module
     assert module.future_imports['unicode_literals']
 
 

src/tests/test_pep257.py

@@ -315,35 +315,6 @@ def test_unicode_literals():
     def u(x):
         return unicode_escape_decode(x)[0]
 
-    # Check that D302 is reported with unicode docstring
-    with Pep257Env() as env:
-        with env.open('example.py', 'wt') as example:
-            example.write(textwrap.dedent(u('''\
-                # -*- coding: utf-8 -*-
-                """This is a module."""
-
-                def foo():
-                    """Check unicode: \u2611."""
-            ''').encode('utf-8')))
-        _, err, code = env.invoke_pep257()
-        assert code == 1
-        assert 'D302' in err
-
-    # Check that D302 is not reported when import unicode_literals
-    with Pep257Env() as env:
-        with env.open('example.py', 'wt') as example:
-            example.write(textwrap.dedent(u('''\
-                # -*- coding: utf-8 -*-
-                """This is a module."""
-
-                from __future__ import unicode_literals
-
-                def foo():
-                    """Check unicode: \u2611."""
-            ''').encode('utf-8')))
-        _, err, code = env.invoke_pep257()
-        assert code == 0, err
-
     with Pep257Env() as env:
         with env.open('example.py', 'wt') as example:
             example.write(textwrap.dedent(u('''\