Rebase fix(es)

12 years ago · 1c228ca0ab
parent 55cf33605f
commit 1c228ca0ab
1 changed files with 1 additions and 1 deletions
--- a/IPython/testing/iptestcontroller.py
+++ b/IPython/testing/iptestcontroller.py
@ -307,7 +307,7 @@ class JSController(TestController):
                    # get invalid JSON; it should be ready next iteration.
                    pass
                else:
-                return
+                    return
            time.sleep(0.1)
        print("Notebook server-info file never arrived: %s" % self.server_info_file,
            file=sys.stderr