From dc0705a9cc41682860be522f686810a828d0c8c7 Mon Sep 17 00:00:00 2001 From: Phil Varner Date: Thu, 26 May 2022 10:20:42 -0400 Subject: [PATCH] fix merge problems --- pystac_client/item_search.py | 2 +- tests/test_item_search.py | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pystac_client/item_search.py b/pystac_client/item_search.py index e2d179dd..16fbda0d 100644 --- 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 index a347b1ba..49f66aba 100644 --- 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'