diff --git a/fzfaws/ec2/ec2.py b/fzfaws/ec2/ec2.py index 726bbbc..3fe5a6f 100644 --- a/fzfaws/ec2/ec2.py +++ b/fzfaws/ec2/ec2.py @@ -268,13 +268,13 @@ def _name_tag_generator( def _instance_id_generator( self, instances: List[Dict[str, Any]] - ) -> Generator[Dict[str, str], None, None]: + ) -> Generator[Dict[str, Any], None, None]: """Create a generator for listing instance ids. :param instances: list of instance from boto3 response :type instances: List[Dict[str, Any]] :return: formatted dict of instance id information in generator form - :rtype: Generator[Dict[str,str], None, None] + :rtype: Generator[Dict[str,Any], None, None] """ for instance in instances: yield { diff --git a/fzfaws/s3/s3.py b/fzfaws/s3/s3.py index 3d8c652..379bd2c 100644 --- a/fzfaws/s3/s3.py +++ b/fzfaws/s3/s3.py @@ -1,7 +1,7 @@ """Contains the s3 wrapper class.""" +import itertools import os import re -import itertools from typing import Any, Dict, Generator, List, Optional, Sequence, Tuple, Union from botocore.exceptions import ClientError @@ -442,7 +442,7 @@ def _get_path_option(self, download: bool = False) -> str: def _version_generator( self, versions: List[dict], markers: List[dict], non_current: bool, delete: bool - ) -> Generator[Dict[str, str], None, None]: + ) -> Generator[Dict[str, Any], None, None]: """Create version generator to reduce memory usage. :param versions: list of versions from list_object_versions paginator @@ -454,7 +454,7 @@ def _version_generator( :param delete: include delete marker :type delete: bool :return: formatted dict of version information in generator form - :rtype: Generator[Dict[str,str], None, None] + :rtype: Generator[Dict[str,Any], None, None] """ for version in versions: if (non_current and not version.get("IsLatest")) or not non_current: diff --git a/fzfaws/utils/pyfzf.py b/fzfaws/utils/pyfzf.py index 40924eb..a359aa7 100644 --- a/fzfaws/utils/pyfzf.py +++ b/fzfaws/utils/pyfzf.py @@ -271,7 +271,7 @@ def _construct_fzf_cmd(self) -> List[str]: if os.getenv("FZFAWS_FZF_OPTS"): cmd_list.extend(os.getenv("FZFAWS_FZF_OPTS").split(" ")) if os.getenv("FZFAWS_FZF_KEYS"): - cmd_list.append(os.getenv("FZFAWS_FZF_KEYS")) + cmd_list.append(os.getenv("FZFAWS_FZF_KEYS", "")) return cmd_list def _check_ctrl_c(self, fzf_result: str) -> None: