Add a(nother) test for issue #121

Also fix up the import-order checking code in future.tests.base

Author: edschofield

src/future/tests/base.py

@@ -44,7 +44,8 @@ def order_future_lines(code):
                                if line.startswith('from __future__ import ')]
 
     future_line_numbers = [i for i, line in enumerate(lines)
-                             if line.startswith('from future')]
+                             if line.startswith('from future')
+                             or line.startswith('from past')]
 
     builtins_line_numbers = [i for i, line in enumerate(lines)
                              if line.startswith('from builtins')]
@@ -56,7 +57,7 @@ def mymax(numbers):
         return max(numbers) if len(numbers) > 0 else 0
 
     def mymin(numbers):
-        return min(numbers) if len(numbers) > 0 else 0
+        return min(numbers) if len(numbers) > 0 else float('inf')
 
     assert mymax(uufuture_line_numbers) <= mymin(future_line_numbers), \
             'the __future__ and future imports are out of order'

tests/test_future/test_futurize.py

@@ -104,7 +104,22 @@ def test_encoding_comments_kept_at_top(self):
         from __future__ import print_function
         print('Hello')
         """
-        self.convert_check(before, after)
+        self.convert_check(before, after, ignore_imports=False)
+
+        # Issue #121. This fails as of v0.14.1:
+        before = u"""
+        # -*- coding: utf-8 -*-
+        # Author: etc. with some unicode ¿.
+        1 / 2
+        """
+        after = u"""
+        # -*- coding: utf-8 -*-
+        # Author: etc. with some unicode ¿.
+        from __future__ import division
+        from past.utils import old_div
+        old_div(1, 2)
+        """
+        self.convert_check(before, after, ignore_imports=False)
 
     def test_shebang_blank_with_future_division_import(self):
         """
@@ -435,7 +450,7 @@ def test_source_coding_utf8(self):
         """
         code = """
         # -*- coding: utf-8 -*-
-        icons = [u"◐", u"◓", u"◑", u"◒"]
+        icons = [u"◐", u"◓", u"◑", u"◒"]
         """
         self.unchanged(code)