From a1a36fb62bf7be6d10e5d70d952b68bb06562d4a Mon Sep 17 00:00:00 2001
From: freddyaboulton <alfonsoboulton@gmail.com>
Date: Tue, 11 Oct 2022 17:59:31 -0400
Subject: [PATCH] Fix rebase

---
 gradio/__init__.py                 |  1 -
 gradio/blocks.py                   |  2 +-
 gradio/test_data/blocks_configs.py | 10 +++++-----
 test/test_routes.py                |  2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/gradio/__init__.py b/gradio/__init__.py
index a9877c2914203..22bdccd0bad2e 100644
--- a/gradio/__init__.py
+++ b/gradio/__init__.py
@@ -58,7 +58,6 @@
 from gradio.layouts import Accordion, Box, Column, Group, Row, Tab, TabItem, Tabs
 from gradio.mix import Parallel, Series
 from gradio.routes import mount_gradio_app
-from gradio.stop_button import StopButton
 from gradio.templates import (
     Files,
     Highlight,
diff --git a/gradio/blocks.py b/gradio/blocks.py
index 6d29ca4d88682..d12ea1a8b7cbf 100644
--- a/gradio/blocks.py
+++ b/gradio/blocks.py
@@ -34,7 +34,7 @@
     document_component_api,
     set_documentation_group,
 )
-from gradio.exceptions import DuplicateBlockError, GradioStopIteration
+from gradio.exceptions import DuplicateBlockError
 from gradio.utils import component_or_layout_class, delete_none
 
 set_documentation_group("blocks")
diff --git a/gradio/test_data/blocks_configs.py b/gradio/test_data/blocks_configs.py
index e7f67700db088..9c347682e35ac 100644
--- a/gradio/test_data/blocks_configs.py
+++ b/gradio/test_data/blocks_configs.py
@@ -442,7 +442,7 @@
             "api_name": None,
             "scroll_to_output": False,
             "show_progress": True,
-            "cancels": []
+            "cancels": [],
         },
         {
             "targets": [13],
@@ -455,7 +455,7 @@
             "api_name": None,
             "scroll_to_output": False,
             "show_progress": True,
-            "cancels": []
+            "cancels": [],
         },
         {
             "targets": [],
@@ -468,7 +468,7 @@
             "api_name": None,
             "scroll_to_output": False,
             "show_progress": True,
-            "cancels": []
+            "cancels": [],
         },
     ],
 }
@@ -645,7 +645,7 @@
             "api_name": None,
             "scroll_to_output": False,
             "show_progress": True,
-            "cancels": []
+            "cancels": [],
         },
         {
             "targets": [13],
@@ -655,7 +655,7 @@
             "api_name": None,
             "scroll_to_output": False,
             "show_progress": True,
-            "cancels": []
+            "cancels": [],
         },
     ],
 }
diff --git a/test/test_routes.py b/test/test_routes.py
index bf530c8bba692..585465bb4b74b 100644
--- a/test/test_routes.py
+++ b/test/test_routes.py
@@ -237,7 +237,7 @@ async def test_queue_join_routes_sets_url_if_none_set(mock_get_url):
             if msg["msg"] == "send_data":
                 await ws.send(json.dumps({"data": ["foo"], "fn_index": 0}))
             if msg["msg"] == "send_hash":
-                await ws.send(json.dumps({"fn_index": 0, "session_hash": 'shdce'}))
+                await ws.send(json.dumps({"fn_index": 0, "session_hash": "shdce"}))
             completed = msg["msg"] == "process_completed"
     assert io._queue.server_path == "foo_url"