Import names from defining module

cubedash/_filters.py

@@ -9,13 +9,13 @@
 from urllib.parse import quote_plus
 
 import flask
+import orjson
 import pytz
 from datacube.index.fields import Field
 from datacube.model import Dataset, Product, Range
 from dateutil import tz
 from flask import Blueprint
 from markupsafe import Markup, escape
-from orjson import orjson
 from shapely.geometry import MultiPolygon
 
 from . import _model, _utils

cubedash/_pages.py

@@ -3,12 +3,12 @@
 from datetime import datetime, timedelta, timezone
 
 import datacube
-import dateutil.parser
 import flask
 import structlog
 from datacube.model import Product, Range
 from datacube.scripts.dataset import build_dataset_info
 from dateutil import tz
+from dateutil.parser import ParserError
 from flask import (
     Blueprint,
     abort,
@@ -175,7 +175,7 @@ def search_page(
         query = utils.query_to_search(args, product=product)
     except ValueError as e:  # invalid query val
         abort(400, str(e))
-    except dateutil.parser._parser.ParserError:
+    except ParserError:
         abort(400, "Invalid datetime format")
     except decimal.InvalidOperation:
         abort(400, "Could not convert value to decimal")

cubedash/_utils.py

@@ -31,6 +31,7 @@
 from eodatasets3 import serialise
 from flask_themer import render_template
 from odc.geo import geom
+from odc.geo.crs import CRS
 from orjson import orjson
 from pyproj import CRS as PJCRS
 from ruamel.yaml.comments import CommentedMap
@@ -881,7 +882,7 @@ def dataset_shape(ds: Dataset) -> tuple[Polygon | None, bool]:
     if extent is None:
         log.warning("invalid_dataset.empty_extent")
         return None, False
-    ds_geom = shape(extent.to_crs(geom.CRS(_TARGET_CRS)))
+    ds_geom = shape(extent.to_crs(CRS(_TARGET_CRS)))
 
     if not ds_geom.is_valid:
         log.warning(
@@ -908,4 +909,4 @@ def bbox_as_geom(dataset):
     """Get dataset bounds as to Geometry object projected to target CRS"""
     if dataset.crs is None:
         return None
-    return geom.box(*dataset.bounds, crs=dataset.crs).to_crs(geom.CRS(_TARGET_CRS))
+    return geom.box(*dataset.bounds, crs=dataset.crs).to_crs(CRS(_TARGET_CRS))