recursive==False uses next(iter) for PY3 compatability; added tests to make sure it doesn't recurse

IPython/lib/display.py

@@ -524,7 +524,7 b' class FileLinks(FileLink):'
         if self.recursive:
             walked_dir = list(walk(self.path))
         else:
-            walked_dir = [walk(self.path).next()]
+            walked_dir = [next(walk(self.path))]
         walked_dir.sort()
         for dirname, subdirs, fnames in walked_dir:
             result_lines += self.notebook_display_formatter(dirname, fnames, self.included_suffixes)
@@ -537,7 +537,7 b' class FileLinks(FileLink):'
         if self.recursive:
             walked_dir = list(walk(self.path))
         else:
-            walked_dir = [walk(self.path).next()]
+            walked_dir = [next(walk(self.path))]
         walked_dir.sort()
         for dirname, subdirs, fnames in walked_dir:
             result_lines += self.terminal_display_formatter(dirname, fnames, self.included_suffixes)

IPython/lib/tests/test_display.py

@@ -156,7 +156,23 b' def test_error_on_file_to_FileLinks():'
     tf1 = NamedTemporaryFile(dir=td)
     nt.assert_raises(ValueError,display.FileLinks,tf1.name)
 
+def test_recursive_FileLinks():
+    """FileLinks: Does not recurse when recursive=False
+    """
+    td = mkdtemp()
+    tf = NamedTemporaryFile(dir=td)
+    subtd = mkdtemp(dir=td)
+    subtf = NamedTemporaryFile(dir=subtd)
+    fl = display.FileLinks(td)
+    actual = str(fl)
+    actual = actual.split('\n')
+    nt.assert_equal(len(actual), 4, actual)
+    fl = display.FileLinks(td, recursive=False)
+    actual = str(fl)
+    actual = actual.split('\n')
+    nt.assert_equal(len(actual), 2, actual)
+
 @skipif_not_numpy
 def test_audio_from_file():
     path = pjoin(dirname(__file__), 'test.wav')
-    display.Audio(filename=path)
  No newline at end of file
+    display.Audio(filename=path)