From 38e02edea4f19aedc29a2c1a2ae21b78f274e094 Mon Sep 17 00:00:00 2001 From: focus zheng Date: Wed, 19 Mar 2025 18:17:14 +0800 Subject: [PATCH 1/4] 6 digits --- atlassian/bitbucket/base.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/atlassian/bitbucket/base.py b/atlassian/bitbucket/base.py index f7b548aa6..0fd248d61 100644 --- a/atlassian/bitbucket/base.py +++ b/atlassian/bitbucket/base.py @@ -30,7 +30,9 @@ def __init__(self, url, *args, **kwargs): url = self.get_link("self") if isinstance(url, list): # Server has a list of links url = url[0] - self.timeformat_lambda = kwargs.pop("timeformat_lambda", lambda x: self._default_timeformat_lambda(x)) + self.timeformat_lambda = kwargs.pop( + "timeformat_lambda", lambda x: self._default_timeformat_lambda(x) + ) self._check_timeformat_lambda() super(BitbucketBase, self).__init__(url, *args, **kwargs) @@ -111,7 +113,8 @@ def _check_timeformat_lambda(self): """ LAMBDA = lambda: 0 # noqa: E731 if self.timeformat_lambda is None or ( - isinstance(self.timeformat_lambda, type(LAMBDA)) and self.timeformat_lambda.__name__ == LAMBDA.__name__ + isinstance(self.timeformat_lambda, type(LAMBDA)) + and self.timeformat_lambda.__name__ == LAMBDA.__name__ ): return True else: @@ -165,9 +168,13 @@ def get_time(self, id): if sys.version_info <= (3, 7): value_str = RE_TIMEZONE.sub(r"\1\2", value_str) try: + value_str = value_str[:26] + "Z" value = datetime.strptime(value_str, self.CONF_TIMEFORMAT) except ValueError: - value = datetime.strptime(value_str, "%Y-%m-%dT%H:%M:%S.%fZ", tzinfo="UTC") + value = datetime.strptime( + value_str, + "%Y-%m-%dT%H:%M:%S.%fZ", + ) else: value = value_str From 9b3d6b4c8d45db84749660520dc82877e264882b Mon Sep 17 00:00:00 2001 From: focus zheng Date: Thu, 20 Mar 2025 11:09:57 +0800 Subject: [PATCH 2/4] remove lambda --- atlassian/bitbucket/base.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/atlassian/bitbucket/base.py b/atlassian/bitbucket/base.py index 0fd248d61..6929654db 100644 --- a/atlassian/bitbucket/base.py +++ b/atlassian/bitbucket/base.py @@ -30,9 +30,7 @@ def __init__(self, url, *args, **kwargs): url = self.get_link("self") if isinstance(url, list): # Server has a list of links url = url[0] - self.timeformat_lambda = kwargs.pop( - "timeformat_lambda", lambda x: self._default_timeformat_lambda(x) - ) + self.timeformat_lambda = kwargs.pop("timeformat_lambda", self._default_timeformat_lambda) self._check_timeformat_lambda() super(BitbucketBase, self).__init__(url, *args, **kwargs) From c294c48021095478492132a63c084bdb1642701c Mon Sep 17 00:00:00 2001 From: focus zheng Date: Thu, 20 Mar 2025 11:15:38 +0800 Subject: [PATCH 3/4] format --- atlassian/bitbucket/base.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/atlassian/bitbucket/base.py b/atlassian/bitbucket/base.py index 6929654db..75b6c5104 100644 --- a/atlassian/bitbucket/base.py +++ b/atlassian/bitbucket/base.py @@ -32,7 +32,7 @@ def __init__(self, url, *args, **kwargs): url = url[0] self.timeformat_lambda = kwargs.pop("timeformat_lambda", self._default_timeformat_lambda) self._check_timeformat_lambda() - super(BitbucketBase, self).__init__(url, *args, **kwargs) + super().__init__(url, *args, **kwargs) def __str__(self): return PrettyPrinter(indent=4).pformat(self.__data if self.__data else self) @@ -74,8 +74,7 @@ def _get_paged( if "values" not in response: return - for value in response.get("values", []): - yield value + yield from response.get("values", []) if self.cloud: url = response.get("next") @@ -197,10 +196,10 @@ def _new_session_args(self): :return: A dict with the kwargs for new objects """ - return dict( - session=self._session, - cloud=self.cloud, - api_root=self.api_root, - api_version=self.api_version, - timeformat_lambda=self.timeformat_lambda, - ) + return { + "session": self._session, + "cloud": self.cloud, + "api_root": self.api_root, + "api_version": self.api_version, + "timeformat_lambda": self.timeformat_lambda, + } From 8b6d3ea6bc751461d7503ff3b560099011e28c99 Mon Sep 17 00:00:00 2001 From: focus zheng Date: Mon, 24 Mar 2025 16:15:28 +0800 Subject: [PATCH 4/4] format --- atlassian/bitbucket/base.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/atlassian/bitbucket/base.py b/atlassian/bitbucket/base.py index 75b6c5104..4da72541d 100644 --- a/atlassian/bitbucket/base.py +++ b/atlassian/bitbucket/base.py @@ -110,8 +110,7 @@ def _check_timeformat_lambda(self): """ LAMBDA = lambda: 0 # noqa: E731 if self.timeformat_lambda is None or ( - isinstance(self.timeformat_lambda, type(LAMBDA)) - and self.timeformat_lambda.__name__ == LAMBDA.__name__ + isinstance(self.timeformat_lambda, type(LAMBDA)) and self.timeformat_lambda.__name__ == LAMBDA.__name__ ): return True else: