fix merge problems

stac-utils · May 26, 2022 · dc0705a · dc0705a
1 parent 4d5b1dc
commit dc0705a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/pystac_client/item_search.py b/pystac_client/item_search.py
@@ -6,7 +6,7 @@
 from collections.abc import Iterable, Mapping
 from copy import deepcopy
 from datetime import timezone, datetime as datetime_
-from typing import Dict, Iterator, List, Optional, TYPE_CHECKING, Tuple, Union, Protocol
+from typing import Dict, Iterator, List, Optional, TYPE_CHECKING, Tuple, Union
 import warnings
 
 from pystac import Collection, Item, ItemCollection

diff --git a/tests/test_item_search.py b/tests/test_item_search.py
@@ -264,10 +264,6 @@ def test_intersects_non_geo_interface_object(self):
         with pytest.raises(Exception):
             ItemSearch(url=SEARCH_URL, intersects=object())
 
-    def test_intersects_non_geo_interface_object(self):
-        with pytest.raises(Exception):
-            ItemSearch(url=SEARCH_URL, intersects=object())
-
     def test_filter_lang_default_for_dict(self):
         search = ItemSearch(url=SEARCH_URL, filter={})
         assert search.get_parameters()['filter-lang'] == 'cql2-json'