earthengine-api 1.5.24__py3-none-any.whl → 1.6.0rc0__py3-none-any.whl

ee/collection.py

@@ -6,7 +6,7 @@ This class is never intended to be instantiated by the user.
 from __future__ import annotations
 
 import datetime
-from typing import Any, Callable, Optional, Type, Union
+from typing import Any, Callable
 
 from ee import _arg_types
 from ee import _utils
@@ -38,7 +38,7 @@ class Collection(element.Element):
       self,
       func: function.Function,
       args: dict[str, Any],
-      varName: Optional[str] = None,  # pylint: disable=invalid-name
+      varName: str | None = None,  # pylint: disable=invalid-name
   ):
     """Constructs a collection by initializing its ComputedObject."""
     super().__init__(func, args, varName)
@@ -320,8 +320,8 @@ class Collection(element.Element):
   def bounds(
       self,
       # pylint: disable-next=invalid-name
-      maxError: Optional[_arg_types.ErrorMargin] = None,
-      proj: Optional[_arg_types.Projection] = None,
+      maxError: _arg_types.ErrorMargin | None = None,
+      proj: _arg_types.Projection | None = None,
   ) -> ee_geometry.Geometry:
     """Returns the bounding rectangle of the geometry.
 
@@ -339,8 +339,8 @@ class Collection(element.Element):
   def distance(
       self,
       # pylint: disable=invalid-name
-      searchRadius: Optional[_arg_types.Number] = None,
-      maxError: Optional[_arg_types.Number] = None,
+      searchRadius: _arg_types.Number | None = None,
+      maxError: _arg_types.Number | None = None,
       # pylint: enable=invalid-name
   ) -> image.Image:
     """Returns a distance image for the collection.
@@ -368,7 +368,7 @@ class Collection(element.Element):
     )
 
   def distinct(
-      self, properties: Union[_arg_types.String, _arg_types.List]
+      self, properties: _arg_types.String | _arg_types.List
   ) -> featurecollection.FeatureCollection:
     """Returns a collection with duplicates removed.
 
@@ -389,8 +389,8 @@ class Collection(element.Element):
       self,
       color: _arg_types.String,
       # pylint: disable=invalid-name
-      pointRadius: Optional[_arg_types.Integer] = None,
-      strokeWidth: Optional[_arg_types.Integer] = None,
+      pointRadius: _arg_types.Integer | None = None,
+      strokeWidth: _arg_types.Integer | None = None,
       # pylint: enable=invalid-name
   ) -> image.Image:
     """Returns a painted image of a vector collection for visualization.
@@ -409,7 +409,7 @@ class Collection(element.Element):
     )
 
   @staticmethod
-  def elementType() -> Type[element.Element]:
+  def elementType() -> type[element.Element]:
     """Returns the type of the collection's elements."""
     return element.Element
 
@@ -417,7 +417,7 @@ class Collection(element.Element):
       self,
       actual: _arg_types.String,
       predicted: _arg_types.String,
-      order: Optional[_arg_types.List] = None,
+      order: _arg_types.List | None = None,
   ) -> confusionmatrix.ConfusionMatrix:
     """Returns a 2D error matrix for a collection.
 
@@ -442,7 +442,7 @@ class Collection(element.Element):
         'Collection.errorMatrix', self, actual, predicted, order
     )
 
-  def filter(self, new_filter: Union[str, ee_filter.Filter]) -> Any:
+  def filter(self, new_filter: str | ee_filter.Filter) -> Any:
     """Apply a filter to this collection.
 
     Args:
@@ -459,7 +459,7 @@ class Collection(element.Element):
 
   @deprecation.CanUseDeprecated
   def filterMetadata(
-      self, name: str, operator: str, value: Union[int, str]
+      self, name: str, operator: str, value: int | str
   ) -> Any:
     """Shortcut to add a metadata filter to a collection.
 
@@ -480,7 +480,7 @@ class Collection(element.Element):
     return self.filter(ee_filter.Filter.metadata_(name, operator, value))
 
   def filterBounds(
-      self, geometry: Union[dict[str, Any], ee_geometry.Geometry]
+      self, geometry: dict[str, Any] | ee_geometry.Geometry
   ) -> Any:
     """Shortcut to add a geometry filter to a collection.
 
@@ -506,10 +506,10 @@ class Collection(element.Element):
   @_utils.accept_opt_prefix('opt_end')
   def filterDate(
       self,
-      start: Union[datetime.datetime, ee_date.Date, int, str, Any],
-      end: Optional[
-          Union[datetime.datetime, ee_date.Date, int, str, Any]
-      ] = None,
+      start: datetime.datetime | ee_date.Date | int | str | Any,
+      end: None | (
+          datetime.datetime | ee_date.Date | int | str | Any
+      ) = None,
   ) -> Any:
     """Shortcut to filter a collection with a date range.
 
@@ -542,7 +542,7 @@ class Collection(element.Element):
   def geometry(
       self,
       # pylint: disable-next=invalid-name
-      maxError: Optional[_arg_types.ErrorMargin] = None,
+      maxError: _arg_types.ErrorMargin | None = None,
   ) -> ee_geometry.Geometry:
     """Returns the geometry of a collection.
 
@@ -563,7 +563,7 @@ class Collection(element.Element):
     )
 
   # pylint: disable-next=useless-parent-delegation
-  def getInfo(self) -> Optional[Any]:
+  def getInfo(self) -> Any | None:
     """Returns all the known information about this collection.
 
     This function makes a REST call to to retrieve all the known information
@@ -579,7 +579,7 @@ class Collection(element.Element):
     return super().getInfo()
 
   def iterate(
-      self, algorithm: Callable[[Any, Any], Any], first: Optional[Any] = None
+      self, algorithm: Callable[[Any, Any], Any], first: Any | None = None
   ) -> Any:
     """Iterates over a collection with an algorithm.
 
@@ -610,8 +610,8 @@ class Collection(element.Element):
   def limit(
       self,
       maximum: int,
-      prop: Optional[str] = None,
-      ascending: Optional[bool] = None,
+      prop: str | None = None,
+      ascending: bool | None = None,
   ) -> Collection:
     """Limit a collection to the specified number of elements.
 
@@ -639,9 +639,9 @@ class Collection(element.Element):
   def loadTable(
       # pylint: disable=invalid-name
       tableId: _arg_types.String,
-      geometryColumn: Optional[_arg_types.String] = None,
+      geometryColumn: _arg_types.String | None = None,
       # pylint: enable=invalid-name
-      version: Optional[_arg_types.Integer] = None,
+      version: _arg_types.Integer | None = None,
   ) -> featurecollection.FeatureCollection:
     """Returns a Collection of features from a specified table.
 
@@ -662,7 +662,7 @@ class Collection(element.Element):
   def map(
       self,
       algorithm: Callable[[Any], Any],
-      dropNulls: Optional[bool] = None,  # pylint: disable=invalid-name
+      dropNulls: bool | None = None,  # pylint: disable=invalid-name
   ) -> Any:
     """Maps an algorithm over a collection.
 
@@ -714,11 +714,11 @@ class Collection(element.Element):
   def randomColumn(
       self,
       # pylint: disable-next=invalid-name
-      columnName: Optional[_arg_types.String] = None,
-      seed: Optional[_arg_types.Integer] = None,
-      distribution: Optional[_arg_types.String] = None,
+      columnName: _arg_types.String | None = None,
+      seed: _arg_types.Integer | None = None,
+      distribution: _arg_types.String | None = None,
       # pylint: disable-next=invalid-name
-      rowKeys: Optional[_arg_types.List] = None,
+      rowKeys: _arg_types.List | None = None,
   ) -> featurecollection.FeatureCollection:
     """Returns a collection with a random column added to each feature.
 
@@ -747,7 +747,7 @@ class Collection(element.Element):
       reducer: _arg_types.Reducer,
       selectors: _arg_types.List,
       # pylint: disable=invalid-name
-      weightSelectors: Optional[_arg_types.List] = None,
+      weightSelectors: _arg_types.List | None = None,
   ) -> dictionary.Dictionary:
     """Returns a dictionary of results, keyed with the output names.
 
@@ -822,7 +822,7 @@ class Collection(element.Element):
 
   # TODO(user): Make ascending default to True
   @_utils.accept_opt_prefix('opt_ascending')
-  def sort(self, prop: str, ascending: Optional[bool] = None) -> Any:
+  def sort(self, prop: str, ascending: bool | None = None) -> Any:
     """Sort a collection by the specified property.
 
     Args:
@@ -841,19 +841,19 @@ class Collection(element.Element):
 
   def style(
       self,
-      color: Optional[_arg_types.String] = None,
+      color: _arg_types.String | None = None,
       # pylint: disable=invalid-name
-      pointSize: Optional[_arg_types.Integer] = None,
-      pointShape: Optional[_arg_types.String] = None,
+      pointSize: _arg_types.Integer | None = None,
+      pointShape: _arg_types.String | None = None,
       # pylint: enable=invalid-name
-      width: Optional[_arg_types.Number] = None,
+      width: _arg_types.Number | None = None,
       # pylint: disable=invalid-name
-      fillColor: Optional[_arg_types.String] = None,
-      styleProperty: Optional[_arg_types.String] = None,
+      fillColor: _arg_types.String | None = None,
+      styleProperty: _arg_types.String | None = None,
       # pylint: enable=invalid-name
-      neighborhood: Optional[_arg_types.Integer] = None,
+      neighborhood: _arg_types.Integer | None = None,
       # pylint: disable-next=invalid-name
-      lineType: Optional[_arg_types.String] = None,
+      lineType: _arg_types.String | None = None,
   ) -> image.Image:
     """Draw a vector collection for visualization using a simple style language.
 
@@ -900,7 +900,7 @@ class Collection(element.Element):
   def toList(
       self,
       count: _arg_types.Integer,
-      offset: Optional[_arg_types.Integer] = None,
+      offset: _arg_types.Integer | None = None,
   ) -> ee_list.List:
     """Returns the elements of a collection as a list.
 
@@ -918,7 +918,7 @@ class Collection(element.Element):
   def union(
       self,
       # pylint: disable-next=invalid-name
-      maxError: Optional[_arg_types.ErrorMargin] = None,
+      maxError: _arg_types.ErrorMargin | None = None,
   ) -> featurecollection.FeatureCollection:
     """Returns a collection containing a single feature with a unioned geometry.
 

ee/computedobject.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Any, Callable, Optional
+from typing import Any, Callable
 
 from ee import _utils
 from ee import data
@@ -47,9 +47,9 @@ class ComputedObject(encodable.Encodable, metaclass=ComputedObjectMetaclass):
      deterministic variable names for mapped functions, ensuring that nested
      mapping calls do not use the same variable name.
   """
-  func: Optional[Any]
-  args: Optional[dict[str, Any]]
-  varName: Optional[str]  # pylint: disable=g-bad-name
+  func: Any | None
+  args: dict[str, Any] | None
+  varName: str | None  # pylint: disable=g-bad-name
 
   # Tell pytype not to worry about dynamic attributes.
   _HAS_DYNAMIC_ATTRIBUTES: bool = True
@@ -60,9 +60,9 @@ class ComputedObject(encodable.Encodable, metaclass=ComputedObjectMetaclass):
   @_utils.accept_opt_prefix('opt_varName')
   def __init__(
       self,
-      func: Optional[Any],
-      args: Optional[dict[str, Any]],
-      varName: Optional[str] = None,  # pylint: disable=g-bad-name
+      func: Any | None,
+      args: dict[str, Any] | None,
+      varName: str | None = None,  # pylint: disable=g-bad-name
   ):
     """Creates a computed object.
 
@@ -98,7 +98,7 @@ class ComputedObject(encodable.Encodable, metaclass=ComputedObjectMetaclass):
     return hash(ComputedObject.freeze(self.__dict__))
 
   # pylint: disable-next=useless-parent-delegation
-  def getInfo(self) -> Optional[Any]:
+  def getInfo(self) -> Any | None:
     """Fetch and return information about this object.
 
     Returns:
@@ -106,7 +106,7 @@ class ComputedObject(encodable.Encodable, metaclass=ComputedObjectMetaclass):
     """
     return data.computeValue(self)
 
-  def encode(self, encoder: Optional[Callable[..., Any]]) -> dict[str, Any]:
+  def encode(self, encoder: Callable[..., Any] | None) -> dict[str, Any]:
     """Encodes the object in a format compatible with Serializer."""
     if self.isVariable():
       return {
@@ -184,7 +184,7 @@ class ComputedObject(encodable.Encodable, metaclass=ComputedObjectMetaclass):
 
   def __str__(self) -> str:
     """Writes out the object in a human-readable form."""
-    return 'ee.%s(%s)' % (self.name(), serializer.toReadableJSON(self))
+    return 'ee.{}({})'.format(self.name(), serializer.toReadableJSON(self))
 
   def isVariable(self) -> bool:
     """Returns whether this computed object is a variable reference."""

ee/confusionmatrix.py

@@ -1,7 +1,7 @@
 """A wrapper for ConfusionMatrices."""
 from __future__ import annotations
 
-from typing import Any, Optional, Union
+from typing import Any
 
 from ee import _arg_types
 from ee import apifunction
@@ -30,12 +30,12 @@ class ConfusionMatrix(computedobject.ComputedObject):
 
   def __init__(
       self,
-      array: Union[
-          ee_array.Array,
-          _arg_types.ConfusionMatrix,
-          computedobject.ComputedObject,
-      ],
-      order: Optional[_arg_types.List] = None,
+      array: (
+          ee_array.Array |
+          _arg_types.ConfusionMatrix |
+          computedobject.ComputedObject
+      ),
+      order: _arg_types.List | None = None,
   ):
     """Creates a ConfusionMatrix wrapper.
 
@@ -102,7 +102,7 @@ class ConfusionMatrix(computedobject.ComputedObject):
         self.name() + '.consumersAccuracy', self
     )
 
-  def fscore(self, beta: Optional[_arg_types.Number] = None) -> ee_array.Array:
+  def fscore(self, beta: _arg_types.Number | None = None) -> ee_array.Array:
     """Returns the F-beta score for the confusion matrix.
 
     Args:

ee/customfunction.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Any, Callable, Optional
+from typing import Any, Callable
 
 from ee import computedobject
 from ee import ee_exception
@@ -75,7 +75,7 @@ class CustomFunction(function.Function, encodable.Encodable):
     return self._signature
 
   @staticmethod
-  def variable(type_name: Optional[str], name: str) -> Any:
+  def variable(type_name: str | None, name: str) -> Any:
     """Returns a placeholder variable with a given name and EE type.
 
     Args:

ee/data.py

@@ -3,13 +3,14 @@
 # Using lowercase function naming to match the JavaScript names.
 # pylint: disable=g-bad-name
 
+from collections.abc import Iterator, Sequence
 import contextlib
 import json
 import platform
 import re
 import sys
 import threading
-from typing import Any, Callable, Iterator, Optional, Sequence, Union
+from typing import Any, Callable, Optional, Union
 import uuid
 import warnings
 
@@ -254,7 +255,7 @@ def get_persistent_credentials() -> credentials_lib.Credentials:
   args = {}
   try:
     args = oauth.get_credentials_arguments()
-  except IOError:
+  except OSError:
     pass
 
   if args.get('refresh_token'):
@@ -826,8 +827,7 @@ def _generate(func, list_key: str, **kwargs) -> Iterator[Any]:
   args = kwargs.copy()
   while True:
     response = func(**args)
-    for obj in response.get(list_key, []):
-      yield obj
+    yield from response.get(list_key, [])
     if _NEXT_PAGE_TOKEN_KEY not in response:
       break
     args['params'].update({'pageToken': response[_NEXT_PAGE_TOKEN_KEY]})
@@ -1262,8 +1262,9 @@ def makeThumbUrl(thumbId: dict[str, str]) -> str:
   Returns:
     A URL from which the thumbnail can be obtained.
   """
-  url = '%s/%s/%s:getPixels' % (_tile_base_url, _cloud_api_utils.VERSION,
-                                thumbId['thumbid'])
+  url = '{}/{}/{}:getPixels'.format(
+      _tile_base_url, _cloud_api_utils.VERSION, thumbId['thumbid']
+  )
   if _cloud_api_key:
     url += '?key=%s' % _cloud_api_key
   return url
@@ -1394,8 +1395,9 @@ def makeDownloadUrl(downloadId: dict[str, str]) -> str:
   Returns:
     A URL from which the download can be obtained.
   """
-  return '%s/%s/%s:getPixels' % (_tile_base_url, _cloud_api_utils.VERSION,
-                                 downloadId['docid'])
+  return '{}/{}/{}:getPixels'.format(
+      _tile_base_url, _cloud_api_utils.VERSION, downloadId['docid']
+  )
 
 
 def getTableDownloadId(params: dict[str, Any]) -> dict[str, str]:
@@ -1456,8 +1458,9 @@ def makeTableDownloadUrl(downloadId: dict[str, str]) -> str:
   Returns:
     A Url from which the download can be obtained.
   """
-  return '%s/%s/%s:getFeatures' % (
-      _tile_base_url, _cloud_api_utils.VERSION, downloadId['docid'])
+  return '{}/{}/{}:getFeatures'.format(
+      _tile_base_url, _cloud_api_utils.VERSION, downloadId['docid']
+  )
 
 
 def getAlgorithms() -> Any:
@@ -1941,9 +1944,7 @@ def _startIngestion(
         project=_get_projects_path(), body=request
     )
   else:
-    raise ee_exception.EEException(
-        '{} is not a valid import mode'.format(import_mode)
-    )
+    raise ee_exception.EEException(f'{import_mode} is not a valid import mode')
 
   result = _execute_cloud_call(
       import_request,
@@ -2123,7 +2124,7 @@ def getAssetRootQuota(rootId: str) -> dict[str, Any]:
   """
   asset = getAsset(rootId)
   if 'quota' not in asset:
-    raise ee_exception.EEException('{} is not a root folder.'.format(rootId))
+    raise ee_exception.EEException(f'{rootId} is not a root folder.')
   quota = asset['quota']
   # The quota fields are int64s, and int64s are represented as strings in
   # JSON. Turn them back.

ee/daterange.py

@@ -1,7 +1,7 @@
 """A wrapper for DateRanges."""
 from __future__ import annotations
 
-from typing import Any, Optional, Union
+from typing import Any
 
 from ee import _arg_types
 from ee import apifunction
@@ -29,10 +29,10 @@ class DateRange(computedobject.ComputedObject):
 
   def __init__(
       self,
-      start: Union[_arg_types.Date, _arg_types.DateRange],
-      end: Optional[_arg_types.Date] = None,
+      start: _arg_types.Date | _arg_types.DateRange,
+      end: _arg_types.Date | None = None,
       # pylint: disable-next=invalid-name
-      timeZone: Optional[_arg_types.String] = None,
+      timeZone: _arg_types.String | None = None,
   ):
     """Creates a DateRange wrapper.
 
@@ -85,7 +85,7 @@ class DateRange(computedobject.ComputedObject):
     return 'DateRange'
 
   def contains(
-      self, other: Union[_arg_types.Date, _arg_types.DateRange]
+      self, other: _arg_types.Date | _arg_types.DateRange
   ) -> computedobject.ComputedObject:
     """Returns true if the given Date or DateRange is within this DateRange.
 
@@ -104,8 +104,8 @@ class DateRange(computedobject.ComputedObject):
     return apifunction.ApiFunction.call_(self.name() + '.end', self)
 
   def intersection(
-      self, other: Union[_arg_types.Date, _arg_types.DateRange]
-  ) -> 'DateRange':
+      self, other: _arg_types.Date | _arg_types.DateRange
+  ) -> DateRange:
     """Returns a DateRange that contains all the timespan of this and other.
 
     Args:
@@ -123,7 +123,7 @@ class DateRange(computedobject.ComputedObject):
     )
 
   def intersects(
-      self, other: Union[_arg_types.Date, _arg_types.DateRange]
+      self, other: _arg_types.Date | _arg_types.DateRange
   ) -> computedobject.ComputedObject:
     """Returns true if the other DateRange has at least one time in common.
 
@@ -160,7 +160,7 @@ class DateRange(computedobject.ComputedObject):
     return apifunction.ApiFunction.call_('DateRange.unbounded')
 
   def union(
-      self, other: Union[_arg_types.Date, _arg_types.DateRange]
+      self, other: _arg_types.Date | _arg_types.DateRange
   ) -> DateRange:
     """Returns a DateRange that contains all points in this and other.
 

ee/deprecation.py

@@ -7,7 +7,7 @@ import datetime
 import functools
 import inspect
 import json
-from typing import Any, Callable, Optional
+from typing import Any, Callable
 import urllib
 import warnings
 
@@ -15,7 +15,7 @@ _DEPRECATED_OBJECT = 'earthengine-stac/catalog/catalog_deprecated.json'
 _DEPRECATED_ASSETS_URL = f'https://storage.googleapis.com/{_DEPRECATED_OBJECT}'
 
 # Deprecation warnings are per-asset, per-initialization.
-deprecated_assets: dict[str, DeprecatedAsset] = None
+deprecated_assets: dict[str, DeprecatedAsset] = dict()
 
 
 def Deprecated(message: str):
@@ -36,7 +36,7 @@ def Deprecated(message: str):
     @functools.wraps(func)
     def Wrapper(*args, **kwargs):
       warnings.warn_explicit(
-          '%s() is deprecated: %s' % (func.__name__, message),
+          '{}() is deprecated: {}'.format(func.__name__, message),
           category=DeprecationWarning,
           filename=func.__code__.co_filename,
           lineno=func.__code__.co_firstlineno + 1,
@@ -67,14 +67,14 @@ class DeprecatedAsset:
   """Class for keeping track of a single deprecated asset."""
 
   id: str
-  replacement_id: Optional[str]
-  removal_date: Optional[datetime.datetime]
-  learn_more_url: Optional[str]
+  replacement_id: str | None
+  removal_date: datetime.datetime | None
+  learn_more_url: str | None
 
   has_warning_been_issued: bool = False
 
   @classmethod
-  def _ParseDateString(cls, date_str: str) -> Optional[datetime.datetime]:
+  def _ParseDateString(cls, date_str: str) -> datetime.datetime | None:
     try:
       # We can't use `datetime.datetime.fromisoformat` because it's behavior
       # changes by Python version.
@@ -87,8 +87,10 @@ class DeprecatedAsset:
     removal_date = stac_link.get('gee:removal_date')
     if removal_date is not None:
       removal_date = cls._ParseDateString(removal_date)
+    title = stac_link.get('title')
+    assert isinstance(title, str)
     return DeprecatedAsset(
-        id=stac_link.get('title'),
+        id=title,
         replacement_id=stac_link.get('gee:replacement_id'),
         removal_date=removal_date,
         learn_more_url=stac_link.get('gee:learn_more_url'),
@@ -139,7 +141,7 @@ def InitializeDeprecatedAssets() -> None:
 
 def _InitializeDeprecatedAssetsInternal() -> None:
   global deprecated_assets
-  if deprecated_assets is not None:
+  if deprecated_assets:
     return
   _UnfilterDeprecationWarnings()
 
@@ -153,7 +155,7 @@ def _InitializeDeprecatedAssetsInternal() -> None:
 
 def Reset() -> None:
   global deprecated_assets
-  deprecated_assets = None
+  deprecated_assets = dict()
 
 
 def _FetchDataCatalogStac() -> dict[str, Any]:
@@ -164,7 +166,7 @@ def _FetchDataCatalogStac() -> dict[str, Any]:
   return json.loads(response)
 
 
-def _GetStringFromObject(obj: Any) -> Optional[str]:
+def _GetStringFromObject(obj: Any) -> str | None:
   if isinstance(obj, str):
     return obj
   return None

ee/deserializer.py

@@ -107,14 +107,14 @@ def _decodeValue(json_obj: Any, named_values: dict[str, Any]) -> Any:
     else:
       func = _decodeValue(json_obj['function'], named_values)
     if 'arguments' in json_obj:
-      args = dict((key, _decodeValue(value, named_values))
-                  for (key, value) in json_obj['arguments'].items())
+      args = {key: _decodeValue(value, named_values)
+                  for (key, value) in json_obj['arguments'].items()}
     else:
       args = {}
     return _invocation(func, args)
   elif type_name == 'Dictionary':
-    return dict((key, _decodeValue(value, named_values))
-                for (key, value) in json_obj['value'].items())
+    return {key: _decodeValue(value, named_values)
+                for (key, value) in json_obj['value'].items()}
   elif type_name == 'Function':
     body = _decodeValue(json_obj['body'], named_values)
     signature = {
@@ -180,7 +180,7 @@ def decodeCloudApi(json_obj: dict[str, Any]) -> Any:
   def lookup(reference, kind):
     if reference not in decoded:
       if reference not in json_obj['values']:
-        raise ee_exception.EEException('Cannot find %s %s' % (reference, kind))
+        raise ee_exception.EEException('Cannot find {} {}'.format(reference, kind))
       decoded[reference] = decode_node(json_obj['values'][reference])
     return decoded[reference]