From adf30693a9172479f4ec052845d80b66c2bf55d8 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Fri, 14 Jul 2023 14:23:11 +0530 Subject: [PATCH] ci: update pyupgrade --- .pre-commit-config.yaml | 2 +- frappe/__init__.py | 3 ++- frappe/core/doctype/user/user.py | 3 ++- frappe/database/database.py | 3 ++- frappe/database/operator_map.py | 2 +- frappe/model/document.py | 3 ++- frappe/model/naming.py | 3 ++- frappe/query_builder/utils.py | 3 ++- frappe/rate_limiter.py | 2 +- frappe/recorder.py | 2 +- frappe/tests/test_child_table.py | 2 +- frappe/tests/utils.py | 2 +- frappe/utils/__init__.py | 3 ++- frappe/utils/background_jobs.py | 3 ++- frappe/utils/caching.py | 2 +- frappe/utils/oauth.py | 3 ++- frappe/utils/typing_validations.py | 3 ++- 17 files changed, 27 insertions(+), 17 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0c6bbe8ec9..98bd4fcbaf 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -21,7 +21,7 @@ repos: - id: debug-statements - repo: https://github.com/asottile/pyupgrade - rev: v2.34.0 + rev: v3.9.0 hooks: - id: pyupgrade args: ['--py310-plus'] diff --git a/frappe/__init__.py b/frappe/__init__.py index c3c5a107d7..44e1a24137 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -19,7 +19,8 @@ import os import re import unicodedata import warnings -from typing import TYPE_CHECKING, Any, Callable, Literal, Optional, TypeAlias, overload +from collections.abc import Callable +from typing import TYPE_CHECKING, Any, Literal, Optional, TypeAlias, overload import click from werkzeug.local import Local, release_local diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index 9bcc9ebd3d..062d3f349f 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -1,7 +1,8 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: MIT. See LICENSE +from collections.abc import Sequence from datetime import timedelta -from typing import Optional, Sequence +from typing import Optional import frappe import frappe.defaults diff --git a/frappe/database/database.py b/frappe/database/database.py index 369305a588..a6254a0242 100644 --- a/frappe/database/database.py +++ b/frappe/database/database.py @@ -8,9 +8,10 @@ import random import re import string import traceback +from collections.abc import Iterable, Sequence from contextlib import contextmanager, suppress from time import time -from typing import Any, Iterable, Sequence +from typing import Any from pypika.dialects import MySQLQueryBuilder, PostgreSQLQueryBuilder from pypika.terms import Criterion, NullValue diff --git a/frappe/database/operator_map.py b/frappe/database/operator_map.py index 2c8b53dae3..d98f46d758 100644 --- a/frappe/database/operator_map.py +++ b/frappe/database/operator_map.py @@ -2,7 +2,7 @@ # MIT License. See license.txt import operator -from typing import Callable +from collections.abc import Callable import frappe from frappe.database.utils import NestedSetHierarchy diff --git a/frappe/model/document.py b/frappe/model/document.py index e2a55065bb..0968dea0f0 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -3,7 +3,8 @@ import hashlib import json import time -from typing import Any, Generator, Iterable +from collections.abc import Generator, Iterable +from typing import Any from werkzeug.exceptions import NotFound diff --git a/frappe/model/naming.py b/frappe/model/naming.py index 431a5c9879..2acb8254a2 100644 --- a/frappe/model/naming.py +++ b/frappe/model/naming.py @@ -3,7 +3,8 @@ import datetime import re -from typing import TYPE_CHECKING, Callable, Optional +from collections.abc import Callable +from typing import TYPE_CHECKING, Optional import frappe from frappe import _ diff --git a/frappe/query_builder/utils.py b/frappe/query_builder/utils.py index 97ebd54524..c7000a0409 100644 --- a/frappe/query_builder/utils.py +++ b/frappe/query_builder/utils.py @@ -1,6 +1,7 @@ +from collections.abc import Callable from enum import Enum from importlib import import_module -from typing import Any, Callable, get_type_hints +from typing import Any, get_type_hints from pypika.queries import Column, QueryBuilder from pypika.terms import PseudoColumn diff --git a/frappe/rate_limiter.py b/frappe/rate_limiter.py index 0448d7ea92..887f102d6f 100644 --- a/frappe/rate_limiter.py +++ b/frappe/rate_limiter.py @@ -1,9 +1,9 @@ # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors # License: MIT. See LICENSE +from collections.abc import Callable from datetime import datetime from functools import wraps -from typing import Callable from werkzeug.wrappers import Response diff --git a/frappe/recorder.py b/frappe/recorder.py index a2702c3b13..0bcea0c231 100644 --- a/frappe/recorder.py +++ b/frappe/recorder.py @@ -7,7 +7,7 @@ import json import re import time from collections import Counter -from typing import Callable +from collections.abc import Callable import sqlparse diff --git a/frappe/tests/test_child_table.py b/frappe/tests/test_child_table.py index 5dce5f54c8..920a800bf0 100644 --- a/frappe/tests/test_child_table.py +++ b/frappe/tests/test_child_table.py @@ -1,4 +1,4 @@ -from typing import Callable +from collections.abc import Callable import frappe from frappe.model import child_table_fields diff --git a/frappe/tests/utils.py b/frappe/tests/utils.py index 762cd885b0..2c10a6fc14 100644 --- a/frappe/tests/utils.py +++ b/frappe/tests/utils.py @@ -2,8 +2,8 @@ import copy import datetime import signal import unittest +from collections.abc import Sequence from contextlib import contextmanager -from typing import Sequence import frappe from frappe.model.base_document import BaseDocument diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py index 6ffa011ed9..387a4d0c6a 100644 --- a/frappe/utils/__init__.py +++ b/frappe/utils/__init__.py @@ -11,6 +11,7 @@ import sys import traceback from collections import deque from collections.abc import ( + Callable, Container, Generator, Iterable, @@ -20,7 +21,7 @@ from collections.abc import ( ) from email.header import decode_header, make_header from email.utils import formataddr, parseaddr -from typing import Any, Callable, Literal +from typing import Any, Literal from urllib.parse import quote, urlparse from redis.exceptions import ConnectionError diff --git a/frappe/utils/background_jobs.py b/frappe/utils/background_jobs.py index be5291b771..19e2c57c0e 100755 --- a/frappe/utils/background_jobs.py +++ b/frappe/utils/background_jobs.py @@ -3,8 +3,9 @@ import os import socket import time from collections import defaultdict +from collections.abc import Callable from functools import lru_cache -from typing import Any, Callable, NoReturn +from typing import Any, NoReturn from uuid import uuid4 import redis diff --git a/frappe/utils/caching.py b/frappe/utils/caching.py index fbfbddbd88..a0e40abc8a 100644 --- a/frappe/utils/caching.py +++ b/frappe/utils/caching.py @@ -3,9 +3,9 @@ import json from collections import defaultdict +from collections.abc import Callable from datetime import datetime, timedelta from functools import wraps -from typing import Callable import frappe diff --git a/frappe/utils/oauth.py b/frappe/utils/oauth.py index 611ea2967c..a5e0881562 100644 --- a/frappe/utils/oauth.py +++ b/frappe/utils/oauth.py @@ -3,7 +3,8 @@ import base64 import json -from typing import TYPE_CHECKING, Callable +from collections.abc import Callable +from typing import TYPE_CHECKING import frappe import frappe.utils diff --git a/frappe/utils/typing_validations.py b/frappe/utils/typing_validations.py index 91a318eae4..4f316171b6 100644 --- a/frappe/utils/typing_validations.py +++ b/frappe/utils/typing_validations.py @@ -1,7 +1,8 @@ +from collections.abc import Callable from functools import lru_cache, wraps from inspect import _empty, isclass, signature from types import EllipsisType -from typing import Callable, ForwardRef, TypeVar, Union +from typing import ForwardRef, TypeVar, Union from frappe.exceptions import FrappeTypeError