From 46150eec206f93b9302cd22d8ca8ce77891d4180 Mon Sep 17 00:00:00 2001 From: EC2 Default User Date: Mon, 8 Nov 2021 19:15:20 +0000 Subject: [PATCH 1/7] BugId: a6fc5cc0c3b1b2bb55fe9067302372c7b7f642d91e102352287bf9928a1130ea Fixing value check for empty sequence. --- .../redshift_connector/cursor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amazon-redshift-python-driver-master/redshift_connector/cursor.py b/amazon-redshift-python-driver-master/redshift_connector/cursor.py index a717273..a9fce9f 100644 --- a/amazon-redshift-python-driver-master/redshift_connector/cursor.py +++ b/amazon-redshift-python-driver-master/redshift_connector/cursor.py @@ -146,7 +146,7 @@ def _getDescription(self: "Cursor") -> typing.Optional[typing.List[typing.Option if self.ps is None: return None row_desc: typing.List[typing.Dict[str, typing.Union[bytes, int, typing.Callable]]] = self.ps["row_desc"] - if len(row_desc) == 0: + if not row_desc: return None columns: typing.List[typing.Optional[typing.Tuple]] = [] for col in row_desc: From 7ae93d346d399e6503a9bfdea9565dc2409d49bc Mon Sep 17 00:00:00 2001 From: EC2 Default User Date: Mon, 8 Nov 2021 19:34:53 +0000 Subject: [PATCH 2/7] BugId: e7eb91ff4bffe1adc1bc464bc09bdf1015bda118e68dd30a0cc158c6e446a0ff --- .../awsiot/greengrasscoreipc/model.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/aws-iot-device-sdk-python-v2-main/awsiot/greengrasscoreipc/model.py b/aws-iot-device-sdk-python-v2-main/awsiot/greengrasscoreipc/model.py index b5f5db6..1c69bb2 100644 --- a/aws-iot-device-sdk-python-v2-main/awsiot/greengrasscoreipc/model.py +++ b/aws-iot-device-sdk-python-v2-main/awsiot/greengrasscoreipc/model.py @@ -1235,9 +1235,7 @@ def _model_name(cls): def __repr__(self): attrs = [] - for attr, val in self.__dict__.items(): - if val is not None: - attrs.append('%s=%r' % (attr, val)) + attrs = ['%s=%r' % (attr, val) for attr, val in self.__dict__.items() if val is not None] return '%s(%s)' % (self.__class__.__name__, ', '.join(attrs)) def __eq__(self, other): From fbdb934fc14b6f51b6884b8878cf710b2928559b Mon Sep 17 00:00:00 2001 From: WillM Date: Mon, 8 Nov 2021 19:55:45 +0000 Subject: [PATCH 3/7] BugID: security-ca13aa081cf740f839f7da5a9424cae57793e5775fb933837a7915b --- sagemaker-spark-master/sagemaker-pyspark-sdk/docs/conf.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sagemaker-spark-master/sagemaker-pyspark-sdk/docs/conf.py b/sagemaker-spark-master/sagemaker-pyspark-sdk/docs/conf.py index 0ca3ec5..b19e542 100644 --- a/sagemaker-spark-master/sagemaker-pyspark-sdk/docs/conf.py +++ b/sagemaker-spark-master/sagemaker-pyspark-sdk/docs/conf.py @@ -15,7 +15,10 @@ def read(fname): - return open(os.path.join(os.path.dirname(__file__), fname)).read() + with open(os.path.join(os.path.dirname(__file__), fname)) as fi: + val = fi.read() + + return val def read_version(): From c9b5c042b6efbf534072199bcced517246c2a47d Mon Sep 17 00:00:00 2001 From: Will M Date: Mon, 8 Nov 2021 20:45:22 +0000 Subject: [PATCH 4/7] Updating bug. --- sagemaker-spark-master/sagemaker-pyspark-sdk/docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sagemaker-spark-master/sagemaker-pyspark-sdk/docs/conf.py b/sagemaker-spark-master/sagemaker-pyspark-sdk/docs/conf.py index b19e542..d5814f4 100644 --- a/sagemaker-spark-master/sagemaker-pyspark-sdk/docs/conf.py +++ b/sagemaker-spark-master/sagemaker-pyspark-sdk/docs/conf.py @@ -17,7 +17,7 @@ def read(fname): with open(os.path.join(os.path.dirname(__file__), fname)) as fi: val = fi.read() - + return val From 314b431abd17cb8982cf5c7cb0c687749ce507bf Mon Sep 17 00:00:00 2001 From: WillM Date: Mon, 8 Nov 2021 20:56:32 +0000 Subject: [PATCH 5/7] Updating bug fixes. --- .../codeguru_profiler_agent/utils/execution_state.py | 2 +- .../internal/crypto/jce_bridge/primitives.py | 2 +- .../src/aws_encryption_sdk/internal/crypto/wrapping_keys.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/amazon-codeguru-profiler-python-agent-main/codeguru_profiler_agent/utils/execution_state.py b/amazon-codeguru-profiler-python-agent-main/codeguru_profiler_agent/utils/execution_state.py index 8bd8404..a1e15e7 100644 --- a/amazon-codeguru-profiler-python-agent-main/codeguru_profiler_agent/utils/execution_state.py +++ b/amazon-codeguru-profiler-python-agent-main/codeguru_profiler_agent/utils/execution_state.py @@ -125,7 +125,7 @@ def wait_for_next_tick_or_stop(self): :return: True if the status is RUNNING at the end. False otherwise. """ is_time_to_execute = False - while self._current_state is not ExecutionState.STOPPED and not is_time_to_execute: + while self._current_state != ExecutionState.STOPPED and not is_time_to_execute: self._time_when_waiting_started = self._clock() if self._current_state is ExecutionState.PAUSED: new_state = self._wait_for_resume() diff --git a/aws-dynamodb-encryption-python-master/src/dynamodb_encryption_sdk/internal/crypto/jce_bridge/primitives.py b/aws-dynamodb-encryption-python-master/src/dynamodb_encryption_sdk/internal/crypto/jce_bridge/primitives.py index 564bed8..c2b32f6 100644 --- a/aws-dynamodb-encryption-python-master/src/dynamodb_encryption_sdk/internal/crypto/jce_bridge/primitives.py +++ b/aws-dynamodb-encryption-python-master/src/dynamodb_encryption_sdk/internal/crypto/jce_bridge/primitives.py @@ -445,7 +445,7 @@ def load_rsa_key(key, key_type, key_encoding): raise ValueError("Invalid key type and encoding: {} and {}".format(key_type, key_encoding)) kwargs = dict(data=key, backend=default_backend()) - if key_type is EncryptionKeyType.PRIVATE: + if key_type == EncryptionKeyType.PRIVATE: kwargs["password"] = None loaded_key = loader(**kwargs) diff --git a/aws-encryption-sdk-python-master/src/aws_encryption_sdk/internal/crypto/wrapping_keys.py b/aws-encryption-sdk-python-master/src/aws_encryption_sdk/internal/crypto/wrapping_keys.py index 91f9fd8..08dd68c 100644 --- a/aws-encryption-sdk-python-master/src/aws_encryption_sdk/internal/crypto/wrapping_keys.py +++ b/aws-encryption-sdk-python-master/src/aws_encryption_sdk/internal/crypto/wrapping_keys.py @@ -66,8 +66,8 @@ def encrypt(self, plaintext_data_key, encryption_context): :returns: Deserialized object containing encrypted key :rtype: aws_encryption_sdk.internal.structures.EncryptedData """ - if self.wrapping_algorithm.encryption_type is EncryptionType.ASYMMETRIC: - if self.wrapping_key_type is EncryptionKeyType.PRIVATE: + if self.wrapping_algorithm.encryption_type == EncryptionType.ASYMMETRIC: + if self.wrapping_key_type == EncryptionKeyType.PRIVATE: encrypted_key = self._wrapping_key.public_key().encrypt( plaintext=plaintext_data_key, padding=self.wrapping_algorithm.padding ) From 47fd40f0390247db8dac4789c366954b527d80a3 Mon Sep 17 00:00:00 2001 From: WillM Date: Mon, 8 Nov 2021 21:04:26 +0000 Subject: [PATCH 6/7] Updating bug fixes. --- aws-greengrass-core-sdk-python-master/setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/aws-greengrass-core-sdk-python-master/setup.py b/aws-greengrass-core-sdk-python-master/setup.py index 1340ea9..8cd17e6 100644 --- a/aws-greengrass-core-sdk-python-master/setup.py +++ b/aws-greengrass-core-sdk-python-master/setup.py @@ -19,7 +19,8 @@ def get_version(): - init = open(os.path.join(ROOT,'greengrasssdk','__init__.py')).read() + with open(os.path.join(ROOT,'greengrasssdk','__init__.py')) as fi: + init = fi.read() return VERSION_RE.search(init).group(1) From 2889256cad329295915fdb2135036ebf84e728f9 Mon Sep 17 00:00:00 2001 From: WillM Date: Mon, 8 Nov 2021 21:09:50 +0000 Subject: [PATCH 7/7] Updating bug fixes. --- .../redshift_connector/cursor.py | 1 + aws-greengrass-core-sdk-python-master/setup.py | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/amazon-redshift-python-driver-master/redshift_connector/cursor.py b/amazon-redshift-python-driver-master/redshift_connector/cursor.py index a9fce9f..f89588e 100644 --- a/amazon-redshift-python-driver-master/redshift_connector/cursor.py +++ b/amazon-redshift-python-driver-master/redshift_connector/cursor.py @@ -148,6 +148,7 @@ def _getDescription(self: "Cursor") -> typing.Optional[typing.List[typing.Option row_desc: typing.List[typing.Dict[str, typing.Union[bytes, int, typing.Callable]]] = self.ps["row_desc"] if not row_desc: return None + columns: typing.List[typing.Optional[typing.Tuple]] = [] for col in row_desc: columns.append((col["label"], col["type_oid"], None, None, None, None, None)) diff --git a/aws-greengrass-core-sdk-python-master/setup.py b/aws-greengrass-core-sdk-python-master/setup.py index 8cd17e6..82b1f68 100644 --- a/aws-greengrass-core-sdk-python-master/setup.py +++ b/aws-greengrass-core-sdk-python-master/setup.py @@ -20,7 +20,10 @@ def get_version(): with open(os.path.join(ROOT,'greengrasssdk','__init__.py')) as fi: - init = fi.read() + try: + init = fi.read() + finally: + fi.close() return VERSION_RE.search(init).group(1)