From 93e850e7b9694bd983ddf894b953e4d196f32c93 Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Fri, 5 Jan 2024 13:12:47 +0100 Subject: [PATCH 1/5] Update typing_extensions imports in third-party stubs --- stubs/Deprecated/deprecated/classic.pyi | 4 ++-- stubs/Deprecated/deprecated/sphinx.pyi | 3 +-- stubs/ExifRead/exifread/_types.pyi | 4 ++-- stubs/ExifRead/exifread/classes.pyi | 3 +-- stubs/Flask-Cors/flask_cors/core.pyi | 4 ++-- .../flask_socketio/test_client.pyi | 3 +-- stubs/JACK-Client/jack/__init__.pyi | 4 ++-- stubs/Markdown/markdown/core.pyi | 4 ++-- stubs/Markdown/markdown/extensions/toc.pyi | 3 +-- stubs/Markdown/markdown/util.pyi | 3 +-- stubs/Pillow/PIL/BlpImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/BmpImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/BufrStubImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/CurImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/DcxImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/DdsImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/EpsImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/FliImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/FpxImagePlugin.pyi | 4 ++-- stubs/Pillow/PIL/FtexImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/GbrImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/GdImageFile.pyi | 3 +-- stubs/Pillow/PIL/GifImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/GribStubImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/Hdf5StubImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/IcnsImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/IcoImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/ImImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/Image.pyi | 4 ++-- stubs/Pillow/PIL/ImageDraw.pyi | 4 ++-- stubs/Pillow/PIL/ImageFilter.pyi | 3 ++- stubs/Pillow/PIL/ImageFont.pyi | 3 +-- stubs/Pillow/PIL/ImageQt.pyi | 4 ++-- stubs/Pillow/PIL/ImageShow.pyi | 3 +-- stubs/Pillow/PIL/ImtImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/IptcImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/Jpeg2KImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/JpegImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/McIdasImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/MicImagePlugin.pyi | 4 ++-- stubs/Pillow/PIL/MpegImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/MpoImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/MspImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/PcdImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/PcxImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/PdfParser.pyi | 3 +-- stubs/Pillow/PIL/PixarImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/PngImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/PpmImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/PsdImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/SgiImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/SpiderImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/SunImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/TgaImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/TiffImagePlugin.pyi | 4 ++-- stubs/Pillow/PIL/TiffTags.pyi | 4 ++-- stubs/Pillow/PIL/WalImageFile.pyi | 3 +-- stubs/Pillow/PIL/WebPImagePlugin.pyi | 4 ++-- stubs/Pillow/PIL/WmfImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/XVThumbImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/XbmImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/XpmImagePlugin.pyi | 3 +-- stubs/Pillow/PIL/_imaging.pyi | 3 +-- stubs/PyAutoGUI/pyautogui/__init__.pyi | 4 ++-- stubs/PyScreeze/pyscreeze/__init__.pyi | 4 ++-- stubs/Pygments/pygments/lexers/javascript.pyi | 2 +- stubs/Pygments/pygments/lexers/kusto.pyi | 2 +- stubs/Pygments/pygments/style.pyi | 2 +- stubs/WTForms/wtforms/fields/numeric.pyi | 4 ++-- stubs/WTForms/wtforms/meta.pyi | 4 ++-- stubs/WTForms/wtforms/utils.pyi | 3 +-- stubs/WTForms/wtforms/widgets/core.pyi | 3 +-- stubs/WebOb/webob/acceptparse.pyi | 4 ++-- stubs/WebOb/webob/cachecontrol.pyi | 4 ++-- stubs/WebOb/webob/cookies.pyi | 4 ++-- stubs/WebOb/webob/exc.pyi | 4 ++-- stubs/WebOb/webob/multidict.pyi | 4 ++-- stubs/WebOb/webob/request.pyi | 4 ++-- stubs/WebOb/webob/response.pyi | 4 ++-- stubs/aiofiles/aiofiles/tempfile/__init__.pyi | 3 +-- .../aiofiles/aiofiles/threadpool/__init__.pyi | 4 ++-- stubs/beautifulsoup4/bs4/dammit.pyi | 3 +-- stubs/boltons/boltons/listutils.pyi | 4 ++-- stubs/caldav/caldav/objects.pyi | 4 ++-- stubs/cffi/_cffi_backend.pyi | 4 ++-- stubs/cffi/cffi/api.pyi | 4 ++-- stubs/chevron/chevron/renderer.pyi | 3 +-- .../click-spinner/click_spinner/__init__.pyi | 4 ++-- stubs/colorama/colorama/win32.pyi | 2 +- stubs/colorama/colorama/winterm.pyi | 2 +- stubs/commonmark/commonmark/main.pyi | 2 +- stubs/croniter/croniter/croniter.pyi | 4 ++-- stubs/dateparser/dateparser/__init__.pyi | 3 ++- stubs/dateparser/dateparser/date.pyi | 4 ++-- .../dateparser/dateparser/search/__init__.pyi | 3 +-- stubs/decorator/decorator.pyi | 4 ++-- .../dockerfile_parse/parser.pyi | 3 +-- .../dockerfile_parse/util.pyi | 4 ++-- stubs/docutils/docutils/io.pyi | 3 +-- stubs/docutils/docutils/nodes.pyi | 4 ++-- .../docutils/parsers/rst/__init__.pyi | 3 +-- stubs/docutils/docutils/utils/__init__.pyi | 3 ++- stubs/fanstatic/fanstatic/compiler.pyi | 3 +-- stubs/fanstatic/fanstatic/core.pyi | 4 ++-- stubs/fanstatic/fanstatic/injector.pyi | 4 ++-- stubs/fanstatic/fanstatic/publisher.pyi | 3 +-- stubs/fanstatic/fanstatic/registry.pyi | 4 ++-- stubs/fpdf2/fpdf/drawing.pyi | 4 ++-- stubs/fpdf2/fpdf/enums.pyi | 3 ++- stubs/fpdf2/fpdf/fpdf.pyi | 4 ++-- stubs/fpdf2/fpdf/html.pyi | 3 +-- stubs/fpdf2/fpdf/image_datastructures.pyi | 4 ++-- stubs/fpdf2/fpdf/image_parsing.pyi | 4 ++-- stubs/fpdf2/fpdf/line_break.pyi | 3 +-- stubs/fpdf2/fpdf/linearization.pyi | 2 +- stubs/fpdf2/fpdf/output.pyi | 2 +- stubs/fpdf2/fpdf/svg.pyi | 3 +-- stubs/fpdf2/fpdf/syntax.pyi | 4 ++-- stubs/fpdf2/fpdf/table.pyi | 4 ++-- stubs/fpdf2/fpdf/transitions.pyi | 2 +- stubs/fpdf2/fpdf/util.pyi | 4 ++-- stubs/gevent/gevent/_ffi/watcher.pyi | 4 ++-- stubs/gevent/gevent/_fileobjectcommon.pyi | 4 ++-- stubs/gevent/gevent/_ident.pyi | 3 +-- stubs/gevent/gevent/_types.pyi | 4 ++-- stubs/gevent/gevent/_waiter.pyi | 4 ++-- stubs/gevent/gevent/baseserver.pyi | 4 ++-- stubs/gevent/gevent/event.pyi | 4 ++-- stubs/gevent/gevent/fileobject.pyi | 3 +-- stubs/gevent/gevent/lock.pyi | 3 +-- stubs/gevent/gevent/os.pyi | 5 ++-- stubs/gevent/gevent/pywsgi.pyi | 4 ++-- stubs/gevent/gevent/queue.pyi | 4 ++-- stubs/gevent/gevent/resolver/ares.pyi | 2 +- stubs/gevent/gevent/server.pyi | 4 ++-- stubs/gevent/gevent/timeout.pyi | 4 ++-- .../google/cloud/ndb/_datastore_api.pyi | 2 +- .../google/cloud/ndb/model.pyi | 4 ++-- stubs/greenlet/greenlet/_greenlet.pyi | 4 ++-- stubs/hdbcli/hdbcli/dbapi.pyi | 4 ++-- stubs/html5lib/html5lib/html5parser.pyi | 3 +-- stubs/ibm-db/ibm_db.pyi | 4 ++-- .../influxdb_client/client/write/point.pyi | 4 ++-- .../domain/script_language.pyi | 3 +-- .../domain/write_precision.pyi | 4 ++-- stubs/inifile/inifile.pyi | 4 ++-- stubs/jmespath/jmespath/functions.pyi | 4 ++-- stubs/jmespath/jmespath/lexer.pyi | 3 +-- stubs/jmespath/jmespath/visitor.pyi | 3 +-- stubs/keyboard/keyboard/_generic.pyi | 4 ++-- stubs/keyboard/keyboard/_keyboard_event.pyi | 5 ++-- stubs/keyboard/keyboard/_mouse_event.pyi | 4 ++-- stubs/keyboard/keyboard/mouse.pyi | 4 ++-- stubs/ldap3/ldap3/__init__.pyi | 3 +-- stubs/ldap3/ldap3/core/connection.pyi | 3 ++- stubs/ldap3/ldap3/core/server.pyi | 3 +-- stubs/ldap3/ldap3/protocol/rfc2696.pyi | 2 +- stubs/ldap3/ldap3/protocol/rfc4511.pyi | 2 +- stubs/ldap3/ldap3/utils/asn1.pyi | 4 ++-- stubs/libsass/sass.pyi | 4 ++-- stubs/mock/mock/mock.pyi | 4 ++-- stubs/netaddr/netaddr/core.pyi | 2 +- stubs/netaddr/netaddr/eui/__init__.pyi | 4 ++-- stubs/netaddr/netaddr/fbsocket.pyi | 2 +- stubs/netaddr/netaddr/ip/__init__.pyi | 4 ++-- stubs/netaddr/netaddr/strategy/eui48.pyi | 3 +-- stubs/netaddr/netaddr/strategy/eui64.pyi | 3 +-- stubs/netaddr/netaddr/strategy/ipv4.pyi | 7 +++--- stubs/netaddr/netaddr/strategy/ipv6.pyi | 3 +-- .../networkx/networkx/algorithms/boundary.pyi | 3 +-- .../networkx/networkx/algorithms/bridges.pyi | 3 +-- stubs/networkx/networkx/classes/function.pyi | 3 +-- .../networkx/networkx/classes/reportviews.pyi | 4 ++-- stubs/networkx/networkx/convert_matrix.pyi | 4 ++-- stubs/networkx/networkx/readwrite/graphml.pyi | 2 +- stubs/networkx/networkx/relabel.pyi | 3 +-- .../test_cases/check_base_descriptors.py | 3 +-- .../test_cases/check_nested_descriptors.py | 3 +-- stubs/openpyxl/openpyxl/__init__.pyi | 4 ++-- stubs/openpyxl/openpyxl/cell/cell.pyi | 3 +-- stubs/openpyxl/openpyxl/cell/read_only.pyi | 2 +- stubs/openpyxl/openpyxl/cell/rich_text.pyi | 4 ++-- stubs/openpyxl/openpyxl/cell/text.pyi | 4 ++-- stubs/openpyxl/openpyxl/chart/_3d.pyi | 3 +-- stubs/openpyxl/openpyxl/chart/_chart.pyi | 4 ++-- stubs/openpyxl/openpyxl/chart/area_chart.pyi | 4 ++-- stubs/openpyxl/openpyxl/chart/axis.pyi | 4 ++-- stubs/openpyxl/openpyxl/chart/bar_chart.pyi | 4 ++-- .../openpyxl/openpyxl/chart/bubble_chart.pyi | 4 ++-- stubs/openpyxl/openpyxl/chart/chartspace.pyi | 4 ++-- stubs/openpyxl/openpyxl/chart/data_source.pyi | 3 +-- stubs/openpyxl/openpyxl/chart/descriptors.pyi | 2 +- stubs/openpyxl/openpyxl/chart/error_bar.pyi | 4 ++-- stubs/openpyxl/openpyxl/chart/label.pyi | 4 ++-- stubs/openpyxl/openpyxl/chart/layout.pyi | 4 ++-- stubs/openpyxl/openpyxl/chart/legend.pyi | 4 ++-- stubs/openpyxl/openpyxl/chart/line_chart.pyi | 4 ++-- stubs/openpyxl/openpyxl/chart/marker.pyi | 4 ++-- stubs/openpyxl/openpyxl/chart/picture.pyi | 4 ++-- stubs/openpyxl/openpyxl/chart/pie_chart.pyi | 4 ++-- stubs/openpyxl/openpyxl/chart/pivot.pyi | 3 +-- stubs/openpyxl/openpyxl/chart/plotarea.pyi | 4 ++-- .../openpyxl/chart/print_settings.pyi | 3 +-- stubs/openpyxl/openpyxl/chart/radar_chart.pyi | 4 ++-- stubs/openpyxl/openpyxl/chart/reference.pyi | 3 +-- .../openpyxl/openpyxl/chart/scatter_chart.pyi | 4 ++-- stubs/openpyxl/openpyxl/chart/series.pyi | 4 ++-- stubs/openpyxl/openpyxl/chart/shapes.pyi | 4 ++-- stubs/openpyxl/openpyxl/chart/stock_chart.pyi | 3 +-- .../openpyxl/openpyxl/chart/surface_chart.pyi | 3 +-- stubs/openpyxl/openpyxl/chart/text.pyi | 3 +-- stubs/openpyxl/openpyxl/chart/title.pyi | 3 +-- stubs/openpyxl/openpyxl/chart/trendline.pyi | 4 ++-- stubs/openpyxl/openpyxl/chart/updown_bars.pyi | 3 +-- .../openpyxl/chartsheet/chartsheet.pyi | 3 +-- stubs/openpyxl/openpyxl/chartsheet/custom.pyi | 3 +-- .../openpyxl/chartsheet/properties.pyi | 3 +-- .../openpyxl/chartsheet/protection.pyi | 3 +-- .../openpyxl/openpyxl/chartsheet/publish.pyi | 4 ++-- .../openpyxl/openpyxl/chartsheet/relation.pyi | 3 +-- stubs/openpyxl/openpyxl/chartsheet/views.pyi | 3 +-- .../openpyxl/comments/comment_sheet.pyi | 4 ++-- stubs/openpyxl/openpyxl/compat/numbers.pyi | 3 ++- stubs/openpyxl/openpyxl/compat/strings.pyi | 2 +- stubs/openpyxl/openpyxl/descriptors/base.pyi | 4 ++-- stubs/openpyxl/openpyxl/descriptors/excel.pyi | 3 +-- .../openpyxl/openpyxl/descriptors/nested.pyi | 4 ++-- .../openpyxl/descriptors/serialisable.pyi | 4 ++-- stubs/openpyxl/openpyxl/drawing/colors.pyi | 4 ++-- stubs/openpyxl/openpyxl/drawing/connector.pyi | 3 +-- stubs/openpyxl/openpyxl/drawing/effect.pyi | 4 ++-- stubs/openpyxl/openpyxl/drawing/fill.pyi | 4 ++-- stubs/openpyxl/openpyxl/drawing/geometry.pyi | 4 ++-- stubs/openpyxl/openpyxl/drawing/graphic.pyi | 3 +-- stubs/openpyxl/openpyxl/drawing/image.pyi | 4 ++-- stubs/openpyxl/openpyxl/drawing/line.pyi | 4 ++-- stubs/openpyxl/openpyxl/drawing/picture.pyi | 3 +-- .../openpyxl/openpyxl/drawing/properties.pyi | 4 ++-- .../openpyxl/drawing/spreadsheet_drawing.pyi | 4 ++-- stubs/openpyxl/openpyxl/drawing/text.pyi | 4 ++-- .../openpyxl/formatting/formatting.pyi | 3 +-- stubs/openpyxl/openpyxl/formatting/rule.pyi | 4 ++-- stubs/openpyxl/openpyxl/formula/tokenizer.pyi | 3 ++- stubs/openpyxl/openpyxl/formula/translate.pyi | 2 +- stubs/openpyxl/openpyxl/packaging/core.pyi | 3 +-- stubs/openpyxl/openpyxl/packaging/custom.pyi | 4 ++-- .../openpyxl/openpyxl/packaging/extended.pyi | 3 +-- .../openpyxl/openpyxl/packaging/manifest.pyi | 3 +-- .../openpyxl/packaging/relationship.pyi | 3 +-- .../openpyxl/openpyxl/packaging/workbook.pyi | 4 ++-- stubs/openpyxl/openpyxl/pivot/cache.pyi | 4 ++-- stubs/openpyxl/openpyxl/pivot/fields.pyi | 3 +-- stubs/openpyxl/openpyxl/pivot/record.pyi | 3 +-- stubs/openpyxl/openpyxl/pivot/table.pyi | 4 ++-- stubs/openpyxl/openpyxl/reader/excel.pyi | 3 ++- stubs/openpyxl/openpyxl/styles/alignment.pyi | 4 ++-- stubs/openpyxl/openpyxl/styles/borders.pyi | 4 ++-- stubs/openpyxl/openpyxl/styles/cell_style.pyi | 4 ++-- stubs/openpyxl/openpyxl/styles/colors.pyi | 4 ++-- .../openpyxl/openpyxl/styles/differential.pyi | 3 +-- stubs/openpyxl/openpyxl/styles/fills.pyi | 4 ++-- stubs/openpyxl/openpyxl/styles/fonts.pyi | 4 ++-- .../openpyxl/openpyxl/styles/named_styles.pyi | 3 +-- stubs/openpyxl/openpyxl/styles/numbers.pyi | 4 ++-- stubs/openpyxl/openpyxl/styles/protection.pyi | 3 +-- stubs/openpyxl/openpyxl/styles/stylesheet.pyi | 4 ++-- stubs/openpyxl/openpyxl/styles/table.pyi | 4 ++-- stubs/openpyxl/openpyxl/utils/cell.pyi | 3 ++- stubs/openpyxl/openpyxl/utils/datetime.pyi | 2 +- stubs/openpyxl/openpyxl/utils/formulas.pyi | 2 +- stubs/openpyxl/openpyxl/utils/inference.pyi | 2 +- stubs/openpyxl/openpyxl/utils/units.pyi | 2 +- stubs/openpyxl/openpyxl/workbook/child.pyi | 2 +- .../openpyxl/workbook/defined_name.pyi | 3 +-- .../workbook/external_link/external.pyi | 4 ++-- .../openpyxl/workbook/function_group.pyi | 3 +-- .../openpyxl/openpyxl/workbook/properties.pyi | 4 ++-- .../openpyxl/openpyxl/workbook/protection.pyi | 4 ++-- .../openpyxl/openpyxl/workbook/smart_tags.pyi | 4 ++-- stubs/openpyxl/openpyxl/workbook/views.pyi | 4 ++-- stubs/openpyxl/openpyxl/workbook/web.pyi | 4 ++-- stubs/openpyxl/openpyxl/workbook/workbook.pyi | 3 +-- stubs/openpyxl/openpyxl/worksheet/_reader.pyi | 2 +- .../openpyxl/worksheet/cell_range.pyi | 3 +-- .../openpyxl/worksheet/cell_watch.pyi | 3 +-- .../openpyxl/openpyxl/worksheet/controls.pyi | 3 +-- stubs/openpyxl/openpyxl/worksheet/custom.pyi | 3 +-- .../openpyxl/worksheet/datavalidation.pyi | 4 ++-- .../openpyxl/worksheet/dimensions.pyi | 4 ++-- stubs/openpyxl/openpyxl/worksheet/errors.pyi | 3 +-- stubs/openpyxl/openpyxl/worksheet/filters.pyi | 4 ++-- .../openpyxl/worksheet/header_footer.pyi | 4 ++-- .../openpyxl/openpyxl/worksheet/hyperlink.pyi | 3 +-- stubs/openpyxl/openpyxl/worksheet/ole.pyi | 4 ++-- stubs/openpyxl/openpyxl/worksheet/page.pyi | 4 ++-- .../openpyxl/openpyxl/worksheet/pagebreak.pyi | 3 +-- .../openpyxl/worksheet/print_settings.pyi | 4 ++-- .../openpyxl/worksheet/properties.pyi | 3 +-- .../openpyxl/worksheet/protection.pyi | 3 +-- .../openpyxl/openpyxl/worksheet/scenario.pyi | 3 +-- .../openpyxl/openpyxl/worksheet/smart_tag.pyi | 3 +-- stubs/openpyxl/openpyxl/worksheet/table.pyi | 4 ++-- stubs/openpyxl/openpyxl/worksheet/views.pyi | 4 ++-- .../openpyxl/openpyxl/worksheet/worksheet.pyi | 3 +-- stubs/openpyxl/openpyxl/writer/excel.pyi | 2 +- stubs/openpyxl/openpyxl/xml/__init__.pyi | 2 +- stubs/openpyxl/openpyxl/xml/constants.pyi | 2 +- stubs/openpyxl/openpyxl/xml/functions.pyi | 2 +- stubs/paho-mqtt/paho/mqtt/publish.pyi | 3 ++- .../paho-mqtt/paho/mqtt/subscribeoptions.pyi | 3 +-- stubs/paramiko/paramiko/channel.pyi | 3 +-- stubs/paramiko/paramiko/win_pageant.pyi | 3 ++- stubs/passlib/passlib/ifc.pyi | 4 ++-- .../passlib/passlib/utils/compat/__init__.pyi | 2 +- stubs/pika/pika/channel.pyi | 4 ++-- stubs/pika/pika/compat.pyi | 4 ++-- stubs/pika/pika/connection.pyi | 3 ++- stubs/pika/pika/spec.pyi | 4 ++-- stubs/pluggy/pluggy/_hooks.pyi | 4 ++-- stubs/polib/polib.pyi | 3 +-- .../google/protobuf/internal/containers.pyi | 3 +-- stubs/psutil/psutil/__init__.pyi | 4 ++-- stubs/psutil/psutil/_common.pyi | 3 +-- stubs/psutil/psutil/_compat.pyi | 23 +++++++++---------- stubs/psycopg2/psycopg2/_psycopg.pyi | 4 ++-- stubs/pyOpenSSL/OpenSSL/rand.pyi | 2 +- stubs/pyasn1/pyasn1/__init__.pyi | 2 +- stubs/pyasn1/pyasn1/compat/integer.pyi | 2 +- stubs/pyasn1/pyasn1/compat/octets.pyi | 3 +-- stubs/pyasn1/pyasn1/type/base.pyi | 3 +-- stubs/pyaudio/pyaudio.pyi | 4 ++-- stubs/pycocotools/pycocotools/__init__.pyi | 2 +- stubs/pycocotools/pycocotools/coco.pyi | 4 ++-- stubs/pycocotools/pycocotools/cocoeval.pyi | 3 ++- stubs/pycurl/pycurl.pyi | 3 ++- stubs/pyflakes/pyflakes/checker.pyi | 4 ++-- stubs/pyinstaller/PyInstaller/__init__.pyi | 3 ++- .../pyinstaller/PyInstaller/building/api.pyi | 4 ++-- .../PyInstaller/building/datastruct.pyi | 4 ++-- stubs/pyinstaller/PyInstaller/compat.pyi | 3 +-- .../PyInstaller/depend/imphookapi.pyi | 4 ++-- .../PyInstaller/utils/hooks/__init__.pyi | 3 +-- .../PyInstaller/utils/hooks/conda.pyi | 2 +- .../PyInstaller/utils/win32/versioninfo.pyi | 4 ++-- stubs/pyinstaller/pyi_splash/__init__.pyi | 3 ++- stubs/pyjks/jks/bks.pyi | 3 ++- stubs/pyjks/jks/jks.pyi | 4 ++-- stubs/pyjks/jks/rfc7292.pyi | 3 ++- stubs/pyjks/jks/sun_crypto.pyi | 2 +- stubs/pyjks/jks/util.pyi | 3 ++- stubs/pynput/pynput/_util.pyi | 4 ++-- stubs/pyserial/serial/serialutil.pyi | 3 +-- stubs/pysftp/pysftp/__init__.pyi | 4 ++-- stubs/python-crontab/crontab.pyi | 4 ++-- stubs/python-dateutil/dateutil/easter.pyi | 2 +- stubs/python-dateutil/dateutil/tz/tz.pyi | 3 +-- stubs/python-jose/jose/jwk.pyi | 3 +-- stubs/python-nmap/nmap/nmap.pyi | 4 ++-- stubs/python-xlib/Xlib/X.pyi | 2 +- stubs/python-xlib/Xlib/Xatom.pyi | 2 +- stubs/python-xlib/Xlib/Xcursorfont.pyi | 2 +- stubs/python-xlib/Xlib/Xutil.pyi | 2 +- stubs/python-xlib/Xlib/display.pyi | 4 ++-- stubs/python-xlib/Xlib/error.pyi | 2 +- stubs/python-xlib/Xlib/ext/composite.pyi | 4 ++-- stubs/python-xlib/Xlib/ext/damage.pyi | 2 +- stubs/python-xlib/Xlib/ext/dpms.pyi | 2 +- stubs/python-xlib/Xlib/ext/ge.pyi | 2 +- stubs/python-xlib/Xlib/ext/nvcontrol.pyi | 2 +- stubs/python-xlib/Xlib/ext/randr.pyi | 3 ++- stubs/python-xlib/Xlib/ext/record.pyi | 3 +-- stubs/python-xlib/Xlib/ext/res.pyi | 2 +- stubs/python-xlib/Xlib/ext/screensaver.pyi | 2 +- stubs/python-xlib/Xlib/ext/security.pyi | 2 +- stubs/python-xlib/Xlib/ext/shape.pyi | 2 +- stubs/python-xlib/Xlib/ext/xfixes.pyi | 2 +- stubs/python-xlib/Xlib/ext/xinerama.pyi | 2 +- stubs/python-xlib/Xlib/ext/xinput.pyi | 3 +-- stubs/python-xlib/Xlib/ext/xtest.pyi | 2 +- stubs/python-xlib/Xlib/keysymdef/apl.pyi | 2 +- stubs/python-xlib/Xlib/keysymdef/arabic.pyi | 2 +- stubs/python-xlib/Xlib/keysymdef/cyrillic.pyi | 2 +- stubs/python-xlib/Xlib/keysymdef/greek.pyi | 2 +- stubs/python-xlib/Xlib/keysymdef/hebrew.pyi | 2 +- stubs/python-xlib/Xlib/keysymdef/katakana.pyi | 2 +- stubs/python-xlib/Xlib/keysymdef/korean.pyi | 2 +- stubs/python-xlib/Xlib/keysymdef/latin1.pyi | 2 +- stubs/python-xlib/Xlib/keysymdef/latin2.pyi | 2 +- stubs/python-xlib/Xlib/keysymdef/latin3.pyi | 2 +- stubs/python-xlib/Xlib/keysymdef/latin4.pyi | 2 +- .../python-xlib/Xlib/keysymdef/miscellany.pyi | 2 +- .../python-xlib/Xlib/keysymdef/publishing.pyi | 2 +- stubs/python-xlib/Xlib/keysymdef/special.pyi | 2 +- .../python-xlib/Xlib/keysymdef/technical.pyi | 2 +- stubs/python-xlib/Xlib/keysymdef/thai.pyi | 2 +- stubs/python-xlib/Xlib/keysymdef/xf86.pyi | 2 +- stubs/python-xlib/Xlib/keysymdef/xk3270.pyi | 2 +- stubs/python-xlib/Xlib/keysymdef/xkb.pyi | 2 +- stubs/python-xlib/Xlib/protocol/display.pyi | 3 +-- stubs/python-xlib/Xlib/protocol/event.pyi | 3 ++- stubs/python-xlib/Xlib/protocol/request.pyi | 3 +-- stubs/python-xlib/Xlib/protocol/rq.pyi | 4 ++-- stubs/python-xlib/Xlib/rdb.pyi | 4 ++-- stubs/python-xlib/Xlib/support/connect.pyi | 6 +++-- .../python-xlib/Xlib/support/unix_connect.pyi | 3 ++- .../python-xlib/Xlib/support/vms_connect.pyi | 4 ++-- stubs/python-xlib/Xlib/xauth.pyi | 2 +- stubs/python-xlib/Xlib/xobject/colormap.pyi | 2 +- stubs/pywin32/_win32typing.pyi | 4 ++-- stubs/pywin32/win32/lib/pywintypes.pyi | 3 +-- stubs/pywin32/win32/odbc.pyi | 3 ++- stubs/pywin32/win32/win32api.pyi | 2 +- stubs/pywin32/win32/win32gui.pyi | 3 +-- stubs/pywin32/win32/win32print.pyi | 4 ++-- stubs/pywin32/win32com/client/__init__.pyi | 3 ++- stubs/pyxdg/xdg/DesktopEntry.pyi | 4 ++-- stubs/pyxdg/xdg/IniFile.pyi | 3 +-- stubs/pyxdg/xdg/Menu.pyi | 5 ++-- stubs/pyxdg/xdg/MenuEditor.pyi | 4 ++-- stubs/pyxdg/xdg/Mime.pyi | 3 ++- stubs/pyxdg/xdg/util.pyi | 2 +- stubs/qrcode/qrcode/image/svg.pyi | 3 +-- stubs/redis/redis/asyncio/client.pyi | 4 ++-- stubs/redis/redis/asyncio/connection.pyi | 4 ++-- stubs/redis/redis/client.pyi | 4 ++-- stubs/redis/redis/cluster.pyi | 4 ++-- stubs/redis/redis/commands/core.pyi | 3 +-- .../redis/commands/graph/query_result.pyi | 3 +-- .../redis/commands/search/aggregation.pyi | 3 +-- .../redis/redis/commands/search/commands.pyi | 4 ++-- .../redis/commands/timeseries/commands.pyi | 3 ++- stubs/redis/redis/ocsp.pyi | 4 ++-- stubs/redis/redis/sentinel.pyi | 4 ++-- stubs/redis/redis/utils.pyi | 3 +-- stubs/regex/regex/_regex.pyi | 4 ++-- stubs/regex/regex/regex.pyi | 4 ++-- .../requests_oauthlib/oauth1_session.pyi | 3 ++- .../requests_oauthlib/oauth2_session.pyi | 4 ++-- stubs/requests/requests/compat.pyi | 3 ++- stubs/requests/requests/help.pyi | 2 +- stubs/requests/requests/sessions.pyi | 4 ++-- stubs/seaborn/seaborn/_core/plot.pyi | 4 ++-- stubs/seaborn/seaborn/_core/rules.pyi | 3 +-- stubs/seaborn/seaborn/axisgrid.pyi | 4 ++-- stubs/seaborn/seaborn/categorical.pyi | 3 +-- stubs/seaborn/seaborn/distributions.pyi | 4 ++-- stubs/seaborn/seaborn/external/appdirs.pyi | 2 +- stubs/seaborn/seaborn/external/docscrape.pyi | 3 +-- stubs/seaborn/seaborn/external/kde.pyi | 4 ++-- stubs/seaborn/seaborn/matrix.pyi | 3 ++- stubs/seaborn/seaborn/palettes.pyi | 4 ++-- stubs/seaborn/seaborn/rcmod.pyi | 4 ++-- stubs/seaborn/seaborn/regression.pyi | 4 ++-- stubs/seaborn/seaborn/relational.pyi | 4 ++-- stubs/seaborn/seaborn/utils.pyi | 4 ++-- stubs/seaborn/seaborn/widgets.pyi | 3 +-- stubs/setuptools/pkg_resources/__init__.pyi | 4 ++-- .../_vendored_packaging/version.pyi | 2 +- .../setuptools/_distutils/_modified.pyi | 2 +- .../setuptools/_distutils/filelist.pyi | 3 +-- .../setuptools/setuptools/_distutils/util.pyi | 3 +-- .../setuptools/command/easy_install.pyi | 4 ++-- .../setuptools/command/egg_info.pyi | 3 ++- stubs/setuptools/setuptools/depends.pyi | 3 +-- stubs/setuptools/setuptools/sandbox.pyi | 4 ++-- stubs/six/six/__init__.pyi | 3 +-- .../api_resources/search_result_object.pyi | 4 ++-- .../api_resources/test_helpers/test_clock.pyi | 4 ++-- stubs/stripe/stripe/webhook.pyi | 5 ++-- stubs/tabulate/tabulate/__init__.pyi | 4 ++-- stubs/tabulate/tabulate/version.pyi | 2 +- .../tensorflow/data/experimental.pyi | 3 +-- stubs/tensorflow/tensorflow/io/__init__.pyi | 4 ++-- stubs/tensorflow/tensorflow/keras/losses.pyi | 4 ++-- .../feature_column/feature_column_v2.pyi | 4 +++- stubs/tqdm/tqdm/std.pyi | 4 ++-- stubs/tree-sitter/tree_sitter/binding.pyi | 3 +-- stubs/uWSGI/uwsgi.pyi | 4 ++-- stubs/uWSGI/uwsgidecorators.pyi | 4 ++-- stubs/vobject/vobject/base.pyi | 3 +-- stubs/waitress/waitress/buffers.pyi | 3 +-- stubs/waitress/waitress/compat.pyi | 3 +-- stubs/waitress/waitress/trigger.pyi | 2 +- stubs/zxcvbn/zxcvbn/__init__.pyi | 2 +- stubs/zxcvbn/zxcvbn/feedback.pyi | 2 +- stubs/zxcvbn/zxcvbn/matching.pyi | 4 ++-- stubs/zxcvbn/zxcvbn/scoring.pyi | 2 +- stubs/zxcvbn/zxcvbn/time_estimates.pyi | 2 +- 488 files changed, 743 insertions(+), 869 deletions(-) diff --git a/stubs/Deprecated/deprecated/classic.pyi b/stubs/Deprecated/deprecated/classic.pyi index 86d0f7f27dd8..f2e60e4f4251 100644 --- a/stubs/Deprecated/deprecated/classic.pyi +++ b/stubs/Deprecated/deprecated/classic.pyi @@ -1,6 +1,6 @@ from collections.abc import Callable -from typing import Any, TypeVar, overload -from typing_extensions import Literal, TypeAlias +from typing import Any, Literal, TypeVar, overload +from typing_extensions import TypeAlias _F = TypeVar("_F", bound=Callable[..., Any]) _Actions: TypeAlias = Literal["default", "error", "ignore", "always", "module", "once"] diff --git a/stubs/Deprecated/deprecated/sphinx.pyi b/stubs/Deprecated/deprecated/sphinx.pyi index bcde1f5c422c..c83bfe9f579d 100644 --- a/stubs/Deprecated/deprecated/sphinx.pyi +++ b/stubs/Deprecated/deprecated/sphinx.pyi @@ -1,6 +1,5 @@ from collections.abc import Callable -from typing import Any, TypeVar -from typing_extensions import Literal +from typing import Any, Literal, TypeVar from .classic import ClassicAdapter, _Actions diff --git a/stubs/ExifRead/exifread/_types.pyi b/stubs/ExifRead/exifread/_types.pyi index 819d7c1065a9..78c39be17cb5 100644 --- a/stubs/ExifRead/exifread/_types.pyi +++ b/stubs/ExifRead/exifread/_types.pyi @@ -1,7 +1,7 @@ # Stubs-only module with type aliases for ExifRead. -from typing import Any, Protocol -from typing_extensions import Literal, TypeAlias +from typing import Any, Literal, Protocol +from typing_extensions import TypeAlias # The second item of the value tuple - if it exists - can be a variety of types, # including a callable or another dict. diff --git a/stubs/ExifRead/exifread/classes.pyi b/stubs/ExifRead/exifread/classes.pyi index 4e62179eddc8..2d7611b63d57 100644 --- a/stubs/ExifRead/exifread/classes.pyi +++ b/stubs/ExifRead/exifread/classes.pyi @@ -1,6 +1,5 @@ from logging import Logger -from typing import Any -from typing_extensions import Literal +from typing import Any, Literal from ._types import Reader, TagDict diff --git a/stubs/Flask-Cors/flask_cors/core.pyi b/stubs/Flask-Cors/flask_cors/core.pyi index 842733aac746..957ca99a5544 100644 --- a/stubs/Flask-Cors/flask_cors/core.pyi +++ b/stubs/Flask-Cors/flask_cors/core.pyi @@ -2,8 +2,8 @@ from collections.abc import Iterable from datetime import timedelta from logging import Logger from re import Pattern -from typing import Any, TypeVar, overload -from typing_extensions import TypeAlias, TypedDict +from typing import Any, TypedDict, TypeVar, overload +from typing_extensions import TypeAlias import flask diff --git a/stubs/Flask-SocketIO/flask_socketio/test_client.pyi b/stubs/Flask-SocketIO/flask_socketio/test_client.pyi index 977aa361ce8e..cf7eb153405e 100644 --- a/stubs/Flask-SocketIO/flask_socketio/test_client.pyi +++ b/stubs/Flask-SocketIO/flask_socketio/test_client.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -from typing import Any -from typing_extensions import TypedDict +from typing import Any, TypedDict from flask import Flask from flask.testing import FlaskClient diff --git a/stubs/JACK-Client/jack/__init__.pyi b/stubs/JACK-Client/jack/__init__.pyi index 96fbda9ab305..6a4740ca5a2f 100644 --- a/stubs/JACK-Client/jack/__init__.pyi +++ b/stubs/JACK-Client/jack/__init__.pyi @@ -1,8 +1,8 @@ import sys from _typeshed import Unused from collections.abc import Callable, Generator, Iterable, Iterator, Sequence -from typing import Any, NoReturn, overload -from typing_extensions import Literal, Self +from typing import Any, Literal, NoReturn, overload +from typing_extensions import Self import numpy from _cffi_backend import _CDataBase diff --git a/stubs/Markdown/markdown/core.pyi b/stubs/Markdown/markdown/core.pyi index c456259909f9..7c5e77f586e8 100644 --- a/stubs/Markdown/markdown/core.pyi +++ b/stubs/Markdown/markdown/core.pyi @@ -1,6 +1,6 @@ from collections.abc import Callable, Mapping, Sequence -from typing import Any, ClassVar, Protocol -from typing_extensions import Literal, Self +from typing import Any, ClassVar, Literal, Protocol +from typing_extensions import Self from xml.etree.ElementTree import Element from . import blockparser, inlinepatterns, postprocessors, preprocessors, treeprocessors diff --git a/stubs/Markdown/markdown/extensions/toc.pyi b/stubs/Markdown/markdown/extensions/toc.pyi index 4945e2d13b4b..44084e2375f0 100644 --- a/stubs/Markdown/markdown/extensions/toc.pyi +++ b/stubs/Markdown/markdown/extensions/toc.pyi @@ -1,7 +1,6 @@ from collections.abc import Iterator, MutableSet from re import Pattern -from typing import Any -from typing_extensions import TypedDict +from typing import Any, TypedDict from xml.etree.ElementTree import Element from markdown.core import Markdown diff --git a/stubs/Markdown/markdown/util.pyi b/stubs/Markdown/markdown/util.pyi index e11b66445ee2..2a0d9fdd0485 100644 --- a/stubs/Markdown/markdown/util.pyi +++ b/stubs/Markdown/markdown/util.pyi @@ -1,7 +1,6 @@ from collections.abc import Iterator from re import Pattern -from typing import Any, Generic, TypeVar, overload -from typing_extensions import TypedDict +from typing import Any, Generic, TypedDict, TypeVar, overload from markdown.core import Markdown diff --git a/stubs/Pillow/PIL/BlpImagePlugin.pyi b/stubs/Pillow/PIL/BlpImagePlugin.pyi index eb3dce0cf794..eda4e0c6c86d 100644 --- a/stubs/Pillow/PIL/BlpImagePlugin.pyi +++ b/stubs/Pillow/PIL/BlpImagePlugin.pyi @@ -1,7 +1,6 @@ from _typeshed import Incomplete from enum import IntEnum -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from .ImageFile import ImageFile, PyDecoder, PyEncoder diff --git a/stubs/Pillow/PIL/BmpImagePlugin.pyi b/stubs/Pillow/PIL/BmpImagePlugin.pyi index 6004ffbc22a9..49423e969a5d 100644 --- a/stubs/Pillow/PIL/BmpImagePlugin.pyi +++ b/stubs/Pillow/PIL/BmpImagePlugin.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Final, Literal +from typing import ClassVar, Final, Literal from .ImageFile import ImageFile, PyDecoder diff --git a/stubs/Pillow/PIL/BufrStubImagePlugin.pyi b/stubs/Pillow/PIL/BufrStubImagePlugin.pyi index 812b4e6ffa61..414a9ca5e4e9 100644 --- a/stubs/Pillow/PIL/BufrStubImagePlugin.pyi +++ b/stubs/Pillow/PIL/BufrStubImagePlugin.pyi @@ -1,5 +1,4 @@ -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from .ImageFile import StubImageFile diff --git a/stubs/Pillow/PIL/CurImagePlugin.pyi b/stubs/Pillow/PIL/CurImagePlugin.pyi index 09d50204f435..a73585f65415 100644 --- a/stubs/Pillow/PIL/CurImagePlugin.pyi +++ b/stubs/Pillow/PIL/CurImagePlugin.pyi @@ -1,5 +1,4 @@ -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from .BmpImagePlugin import BmpImageFile diff --git a/stubs/Pillow/PIL/DcxImagePlugin.pyi b/stubs/Pillow/PIL/DcxImagePlugin.pyi index 94d40e4d97cd..96583e6752ad 100644 --- a/stubs/Pillow/PIL/DcxImagePlugin.pyi +++ b/stubs/Pillow/PIL/DcxImagePlugin.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from .PcxImagePlugin import PcxImageFile diff --git a/stubs/Pillow/PIL/DdsImagePlugin.pyi b/stubs/Pillow/PIL/DdsImagePlugin.pyi index ef46457d7bbd..c17c3ccfd3e5 100644 --- a/stubs/Pillow/PIL/DdsImagePlugin.pyi +++ b/stubs/Pillow/PIL/DdsImagePlugin.pyi @@ -1,5 +1,4 @@ -from typing import ClassVar -from typing_extensions import Final, Literal +from typing import ClassVar, Final, Literal from .ImageFile import ImageFile diff --git a/stubs/Pillow/PIL/EpsImagePlugin.pyi b/stubs/Pillow/PIL/EpsImagePlugin.pyi index 49e2f868de15..3386edc9bf40 100644 --- a/stubs/Pillow/PIL/EpsImagePlugin.pyi +++ b/stubs/Pillow/PIL/EpsImagePlugin.pyi @@ -1,7 +1,6 @@ import sys from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from ._imaging import _PixelAccessor from .ImageFile import ImageFile diff --git a/stubs/Pillow/PIL/FliImagePlugin.pyi b/stubs/Pillow/PIL/FliImagePlugin.pyi index 9859378fba31..264ab807a0b9 100644 --- a/stubs/Pillow/PIL/FliImagePlugin.pyi +++ b/stubs/Pillow/PIL/FliImagePlugin.pyi @@ -1,5 +1,4 @@ -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from .ImageFile import ImageFile diff --git a/stubs/Pillow/PIL/FpxImagePlugin.pyi b/stubs/Pillow/PIL/FpxImagePlugin.pyi index a8871589d18d..385add16be96 100644 --- a/stubs/Pillow/PIL/FpxImagePlugin.pyi +++ b/stubs/Pillow/PIL/FpxImagePlugin.pyi @@ -1,6 +1,6 @@ from _typeshed import Incomplete -from typing import Any, ClassVar -from typing_extensions import Literal, TypeAlias +from typing import Any, ClassVar, Literal +from typing_extensions import TypeAlias from ._imaging import _PixelAccessor from .ImageFile import ImageFile diff --git a/stubs/Pillow/PIL/FtexImagePlugin.pyi b/stubs/Pillow/PIL/FtexImagePlugin.pyi index 6dfd550523b8..43601e143643 100644 --- a/stubs/Pillow/PIL/FtexImagePlugin.pyi +++ b/stubs/Pillow/PIL/FtexImagePlugin.pyi @@ -1,6 +1,5 @@ from enum import IntEnum -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from .ImageFile import ImageFile diff --git a/stubs/Pillow/PIL/GbrImagePlugin.pyi b/stubs/Pillow/PIL/GbrImagePlugin.pyi index 0e7c34b6ba3e..e2fa2a206a20 100644 --- a/stubs/Pillow/PIL/GbrImagePlugin.pyi +++ b/stubs/Pillow/PIL/GbrImagePlugin.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from ._imaging import _PixelAccessor from .ImageFile import ImageFile diff --git a/stubs/Pillow/PIL/GdImageFile.pyi b/stubs/Pillow/PIL/GdImageFile.pyi index 2eb004e84a64..9333eca63de3 100644 --- a/stubs/Pillow/PIL/GdImageFile.pyi +++ b/stubs/Pillow/PIL/GdImageFile.pyi @@ -1,5 +1,4 @@ -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from .ImageFile import ImageFile diff --git a/stubs/Pillow/PIL/GifImagePlugin.pyi b/stubs/Pillow/PIL/GifImagePlugin.pyi index 081203a6df35..5b4a34056f86 100644 --- a/stubs/Pillow/PIL/GifImagePlugin.pyi +++ b/stubs/Pillow/PIL/GifImagePlugin.pyi @@ -1,7 +1,6 @@ from _typeshed import Incomplete from enum import IntEnum -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from .ImageFile import ImageFile diff --git a/stubs/Pillow/PIL/GribStubImagePlugin.pyi b/stubs/Pillow/PIL/GribStubImagePlugin.pyi index 70ebaadc095c..55d61bfcde1a 100644 --- a/stubs/Pillow/PIL/GribStubImagePlugin.pyi +++ b/stubs/Pillow/PIL/GribStubImagePlugin.pyi @@ -1,5 +1,4 @@ -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from .ImageFile import StubImageFile diff --git a/stubs/Pillow/PIL/Hdf5StubImagePlugin.pyi b/stubs/Pillow/PIL/Hdf5StubImagePlugin.pyi index 62760e41c107..102c7f54f5d8 100644 --- a/stubs/Pillow/PIL/Hdf5StubImagePlugin.pyi +++ b/stubs/Pillow/PIL/Hdf5StubImagePlugin.pyi @@ -1,5 +1,4 @@ -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from .ImageFile import StubImageFile diff --git a/stubs/Pillow/PIL/IcnsImagePlugin.pyi b/stubs/Pillow/PIL/IcnsImagePlugin.pyi index f7218692e785..83e87a602cf1 100644 --- a/stubs/Pillow/PIL/IcnsImagePlugin.pyi +++ b/stubs/Pillow/PIL/IcnsImagePlugin.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Final, Literal +from typing import ClassVar, Final, Literal from ._imaging import _PixelAccessor from .ImageFile import ImageFile diff --git a/stubs/Pillow/PIL/IcoImagePlugin.pyi b/stubs/Pillow/PIL/IcoImagePlugin.pyi index a8a61e4bbe0a..602ca764cd9f 100644 --- a/stubs/Pillow/PIL/IcoImagePlugin.pyi +++ b/stubs/Pillow/PIL/IcoImagePlugin.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from ._imaging import _PixelAccessor from .ImageFile import ImageFile diff --git a/stubs/Pillow/PIL/ImImagePlugin.pyi b/stubs/Pillow/PIL/ImImagePlugin.pyi index 7559eea946ec..f58284278ba4 100644 --- a/stubs/Pillow/PIL/ImImagePlugin.pyi +++ b/stubs/Pillow/PIL/ImImagePlugin.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from .ImageFile import ImageFile diff --git a/stubs/Pillow/PIL/Image.pyi b/stubs/Pillow/PIL/Image.pyi index 8e03aeef2301..f42ca955478b 100644 --- a/stubs/Pillow/PIL/Image.pyi +++ b/stubs/Pillow/PIL/Image.pyi @@ -2,8 +2,8 @@ from _typeshed import Incomplete, SupportsRead, SupportsWrite, Unused from collections.abc import Callable, Iterable, Iterator, MutableMapping, Sequence from enum import IntEnum from pathlib import Path -from typing import Any, ClassVar, Protocol, SupportsBytes -from typing_extensions import Literal, Self, TypeAlias, TypeGuard +from typing import Any, ClassVar, Literal, Protocol, SupportsBytes +from typing_extensions import Self, TypeAlias, TypeGuard from PIL.PyAccess import PyAccess diff --git a/stubs/Pillow/PIL/ImageDraw.pyi b/stubs/Pillow/PIL/ImageDraw.pyi index d2877190098f..f69dd5c943f4 100644 --- a/stubs/Pillow/PIL/ImageDraw.pyi +++ b/stubs/Pillow/PIL/ImageDraw.pyi @@ -1,7 +1,7 @@ from _typeshed import Incomplete from collections.abc import Container, Sequence -from typing import Any, overload -from typing_extensions import Literal, TypeAlias +from typing import Any, Literal, overload +from typing_extensions import TypeAlias from .Image import Image from .ImageColor import _Ink diff --git a/stubs/Pillow/PIL/ImageFilter.pyi b/stubs/Pillow/PIL/ImageFilter.pyi index 0c622017c3ca..1ff1ac790d8d 100644 --- a/stubs/Pillow/PIL/ImageFilter.pyi +++ b/stubs/Pillow/PIL/ImageFilter.pyi @@ -1,6 +1,7 @@ from _typeshed import Incomplete from collections.abc import Callable, Iterable, Sequence -from typing_extensions import Literal, Self, TypeAlias +from typing import Literal +from typing_extensions import Self, TypeAlias from .Image import Image diff --git a/stubs/Pillow/PIL/ImageFont.pyi b/stubs/Pillow/PIL/ImageFont.pyi index a331dd4922e5..4a3f865ba4c9 100644 --- a/stubs/Pillow/PIL/ImageFont.pyi +++ b/stubs/Pillow/PIL/ImageFont.pyi @@ -1,7 +1,6 @@ from _typeshed import FileDescriptorOrPath, Incomplete, SupportsRead from enum import IntEnum -from typing import Protocol -from typing_extensions import Final, Literal +from typing import Final, Literal, Protocol from PIL.Image import Transpose diff --git a/stubs/Pillow/PIL/ImageQt.pyi b/stubs/Pillow/PIL/ImageQt.pyi index 72a03acf38fd..cb8c01f23377 100644 --- a/stubs/Pillow/PIL/ImageQt.pyi +++ b/stubs/Pillow/PIL/ImageQt.pyi @@ -1,6 +1,6 @@ from _typeshed import Incomplete -from typing import Any -from typing_extensions import Literal, TypeAlias +from typing import Any, Literal +from typing_extensions import TypeAlias from .Image import Image diff --git a/stubs/Pillow/PIL/ImageShow.pyi b/stubs/Pillow/PIL/ImageShow.pyi index 8da788178746..5503b426ccda 100644 --- a/stubs/Pillow/PIL/ImageShow.pyi +++ b/stubs/Pillow/PIL/ImageShow.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete, Unused -from typing import Any -from typing_extensions import Literal +from typing import Any, Literal def register(viewer, order: int = 1) -> None: ... def show(image, title: Incomplete | None = None, **options): ... diff --git a/stubs/Pillow/PIL/ImtImagePlugin.pyi b/stubs/Pillow/PIL/ImtImagePlugin.pyi index cba9ba6329ee..3abcb9e634c6 100644 --- a/stubs/Pillow/PIL/ImtImagePlugin.pyi +++ b/stubs/Pillow/PIL/ImtImagePlugin.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from .ImageFile import ImageFile diff --git a/stubs/Pillow/PIL/IptcImagePlugin.pyi b/stubs/Pillow/PIL/IptcImagePlugin.pyi index 4348c83206bc..ca07c96ae25c 100644 --- a/stubs/Pillow/PIL/IptcImagePlugin.pyi +++ b/stubs/Pillow/PIL/IptcImagePlugin.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from ._imaging import _PixelAccessor from .ImageFile import ImageFile diff --git a/stubs/Pillow/PIL/Jpeg2KImagePlugin.pyi b/stubs/Pillow/PIL/Jpeg2KImagePlugin.pyi index 749303a3d547..cab7d2bc6860 100644 --- a/stubs/Pillow/PIL/Jpeg2KImagePlugin.pyi +++ b/stubs/Pillow/PIL/Jpeg2KImagePlugin.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from ._imaging import _PixelAccessor from .ImageFile import ImageFile diff --git a/stubs/Pillow/PIL/JpegImagePlugin.pyi b/stubs/Pillow/PIL/JpegImagePlugin.pyi index bb938eab4c3d..33ce15ca3f7b 100644 --- a/stubs/Pillow/PIL/JpegImagePlugin.pyi +++ b/stubs/Pillow/PIL/JpegImagePlugin.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from .ImageFile import ImageFile diff --git a/stubs/Pillow/PIL/McIdasImagePlugin.pyi b/stubs/Pillow/PIL/McIdasImagePlugin.pyi index 6e7be9913b5a..e465f462fe69 100644 --- a/stubs/Pillow/PIL/McIdasImagePlugin.pyi +++ b/stubs/Pillow/PIL/McIdasImagePlugin.pyi @@ -1,5 +1,4 @@ -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from .ImageFile import ImageFile diff --git a/stubs/Pillow/PIL/MicImagePlugin.pyi b/stubs/Pillow/PIL/MicImagePlugin.pyi index 839f91cdde82..c43e11f9c7cd 100644 --- a/stubs/Pillow/PIL/MicImagePlugin.pyi +++ b/stubs/Pillow/PIL/MicImagePlugin.pyi @@ -1,5 +1,5 @@ -from typing import Any, ClassVar -from typing_extensions import Literal, TypeAlias +from typing import Any, ClassVar, Literal +from typing_extensions import TypeAlias from .TiffImagePlugin import TiffImageFile diff --git a/stubs/Pillow/PIL/MpegImagePlugin.pyi b/stubs/Pillow/PIL/MpegImagePlugin.pyi index ad5b1946cf22..39849ff2c07c 100644 --- a/stubs/Pillow/PIL/MpegImagePlugin.pyi +++ b/stubs/Pillow/PIL/MpegImagePlugin.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from .ImageFile import ImageFile diff --git a/stubs/Pillow/PIL/MpoImagePlugin.pyi b/stubs/Pillow/PIL/MpoImagePlugin.pyi index 979c08798748..c5df78f8b903 100644 --- a/stubs/Pillow/PIL/MpoImagePlugin.pyi +++ b/stubs/Pillow/PIL/MpoImagePlugin.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from .JpegImagePlugin import JpegImageFile diff --git a/stubs/Pillow/PIL/MspImagePlugin.pyi b/stubs/Pillow/PIL/MspImagePlugin.pyi index bc3f25db4952..4929768322b5 100644 --- a/stubs/Pillow/PIL/MspImagePlugin.pyi +++ b/stubs/Pillow/PIL/MspImagePlugin.pyi @@ -1,5 +1,4 @@ -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from .ImageFile import ImageFile, PyDecoder diff --git a/stubs/Pillow/PIL/PcdImagePlugin.pyi b/stubs/Pillow/PIL/PcdImagePlugin.pyi index c7b7ec8d1d66..5ecb598c5778 100644 --- a/stubs/Pillow/PIL/PcdImagePlugin.pyi +++ b/stubs/Pillow/PIL/PcdImagePlugin.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from .ImageFile import ImageFile diff --git a/stubs/Pillow/PIL/PcxImagePlugin.pyi b/stubs/Pillow/PIL/PcxImagePlugin.pyi index 5c3faba95339..e6b8e62800c8 100644 --- a/stubs/Pillow/PIL/PcxImagePlugin.pyi +++ b/stubs/Pillow/PIL/PcxImagePlugin.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from .ImageFile import ImageFile diff --git a/stubs/Pillow/PIL/PdfParser.pyi b/stubs/Pillow/PIL/PdfParser.pyi index 31c4f74a02a7..f0c48a7966fc 100644 --- a/stubs/Pillow/PIL/PdfParser.pyi +++ b/stubs/Pillow/PIL/PdfParser.pyi @@ -1,8 +1,7 @@ import collections from _typeshed import Incomplete from types import TracebackType -from typing import Any -from typing_extensions import Literal +from typing import Any, Literal def encode_text(s: str) -> bytes: ... diff --git a/stubs/Pillow/PIL/PixarImagePlugin.pyi b/stubs/Pillow/PIL/PixarImagePlugin.pyi index 8c9bcaf2f608..ec5386752fad 100644 --- a/stubs/Pillow/PIL/PixarImagePlugin.pyi +++ b/stubs/Pillow/PIL/PixarImagePlugin.pyi @@ -1,5 +1,4 @@ -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from .ImageFile import ImageFile diff --git a/stubs/Pillow/PIL/PngImagePlugin.pyi b/stubs/Pillow/PIL/PngImagePlugin.pyi index f4103951fac5..b510a259348b 100644 --- a/stubs/Pillow/PIL/PngImagePlugin.pyi +++ b/stubs/Pillow/PIL/PngImagePlugin.pyi @@ -1,7 +1,6 @@ from _typeshed import Incomplete, Unused from enum import IntEnum -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from ._binary import o8 as o8 from .ImageFile import ImageFile diff --git a/stubs/Pillow/PIL/PpmImagePlugin.pyi b/stubs/Pillow/PIL/PpmImagePlugin.pyi index 5a26914e56e6..dff7f0255f2d 100644 --- a/stubs/Pillow/PIL/PpmImagePlugin.pyi +++ b/stubs/Pillow/PIL/PpmImagePlugin.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from .ImageFile import ImageFile, PyDecoder diff --git a/stubs/Pillow/PIL/PsdImagePlugin.pyi b/stubs/Pillow/PIL/PsdImagePlugin.pyi index 452f087de589..255f557bdf4f 100644 --- a/stubs/Pillow/PIL/PsdImagePlugin.pyi +++ b/stubs/Pillow/PIL/PsdImagePlugin.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from .ImageFile import ImageFile diff --git a/stubs/Pillow/PIL/SgiImagePlugin.pyi b/stubs/Pillow/PIL/SgiImagePlugin.pyi index 556f2d981abb..c3f75d751c7e 100644 --- a/stubs/Pillow/PIL/SgiImagePlugin.pyi +++ b/stubs/Pillow/PIL/SgiImagePlugin.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from .ImageFile import ImageFile, PyDecoder diff --git a/stubs/Pillow/PIL/SpiderImagePlugin.pyi b/stubs/Pillow/PIL/SpiderImagePlugin.pyi index 2869c09271d0..77e11c760f5f 100644 --- a/stubs/Pillow/PIL/SpiderImagePlugin.pyi +++ b/stubs/Pillow/PIL/SpiderImagePlugin.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from .ImageFile import ImageFile diff --git a/stubs/Pillow/PIL/SunImagePlugin.pyi b/stubs/Pillow/PIL/SunImagePlugin.pyi index 27ac28a588ea..9ff1ab39e5fd 100644 --- a/stubs/Pillow/PIL/SunImagePlugin.pyi +++ b/stubs/Pillow/PIL/SunImagePlugin.pyi @@ -1,5 +1,4 @@ -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from .ImageFile import ImageFile diff --git a/stubs/Pillow/PIL/TgaImagePlugin.pyi b/stubs/Pillow/PIL/TgaImagePlugin.pyi index c46f6f583d50..e5f1ddffc049 100644 --- a/stubs/Pillow/PIL/TgaImagePlugin.pyi +++ b/stubs/Pillow/PIL/TgaImagePlugin.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from .ImageFile import ImageFile diff --git a/stubs/Pillow/PIL/TiffImagePlugin.pyi b/stubs/Pillow/PIL/TiffImagePlugin.pyi index a092e11b657a..996df62eec22 100644 --- a/stubs/Pillow/PIL/TiffImagePlugin.pyi +++ b/stubs/Pillow/PIL/TiffImagePlugin.pyi @@ -4,8 +4,8 @@ from collections.abc import Callable, MutableMapping from fractions import Fraction, _ComparableNum from numbers import Rational from types import TracebackType -from typing import ClassVar, overload -from typing_extensions import Final, Literal, SupportsIndex, TypeAlias +from typing import ClassVar, Final, Literal, SupportsIndex, overload +from typing_extensions import TypeAlias from ._imaging import _PixelAccessor from .ImageFile import ImageFile diff --git a/stubs/Pillow/PIL/TiffTags.pyi b/stubs/Pillow/PIL/TiffTags.pyi index ba9261184b99..f4e1f8e52a52 100644 --- a/stubs/Pillow/PIL/TiffTags.pyi +++ b/stubs/Pillow/PIL/TiffTags.pyi @@ -1,6 +1,6 @@ from _typeshed import Incomplete -from typing import NamedTuple -from typing_extensions import Final, Literal, TypeAlias +from typing import Final, Literal, NamedTuple +from typing_extensions import TypeAlias _TagType: TypeAlias = Literal[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16] _TagTuple: TypeAlias = tuple[str, _TagType, int] | tuple[str, _TagInfo, int, dict[str, int]] diff --git a/stubs/Pillow/PIL/WalImageFile.pyi b/stubs/Pillow/PIL/WalImageFile.pyi index 176f47eca59d..e69c2b308b2f 100644 --- a/stubs/Pillow/PIL/WalImageFile.pyi +++ b/stubs/Pillow/PIL/WalImageFile.pyi @@ -1,5 +1,4 @@ -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from . import ImageFile from ._imaging import _PixelAccessor diff --git a/stubs/Pillow/PIL/WebPImagePlugin.pyi b/stubs/Pillow/PIL/WebPImagePlugin.pyi index 406d4e906da2..b5aef7c7ad6c 100644 --- a/stubs/Pillow/PIL/WebPImagePlugin.pyi +++ b/stubs/Pillow/PIL/WebPImagePlugin.pyi @@ -1,6 +1,6 @@ from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import TypeAlias from ._imaging import _PixelAccessor from .ImageFile import ImageFile diff --git a/stubs/Pillow/PIL/WmfImagePlugin.pyi b/stubs/Pillow/PIL/WmfImagePlugin.pyi index 1b78d0d45e01..259c9b4a9739 100644 --- a/stubs/Pillow/PIL/WmfImagePlugin.pyi +++ b/stubs/Pillow/PIL/WmfImagePlugin.pyi @@ -1,7 +1,6 @@ import sys from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from ._imaging import _PixelAccessor from .ImageFile import StubImageFile diff --git a/stubs/Pillow/PIL/XVThumbImagePlugin.pyi b/stubs/Pillow/PIL/XVThumbImagePlugin.pyi index ebfc7d98d992..ff357385777e 100644 --- a/stubs/Pillow/PIL/XVThumbImagePlugin.pyi +++ b/stubs/Pillow/PIL/XVThumbImagePlugin.pyi @@ -1,5 +1,4 @@ -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from .ImageFile import ImageFile diff --git a/stubs/Pillow/PIL/XbmImagePlugin.pyi b/stubs/Pillow/PIL/XbmImagePlugin.pyi index d3d345bd4a73..a7b912dc52f8 100644 --- a/stubs/Pillow/PIL/XbmImagePlugin.pyi +++ b/stubs/Pillow/PIL/XbmImagePlugin.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from .ImageFile import ImageFile diff --git a/stubs/Pillow/PIL/XpmImagePlugin.pyi b/stubs/Pillow/PIL/XpmImagePlugin.pyi index c46c829c7b81..94bba4f91a51 100644 --- a/stubs/Pillow/PIL/XpmImagePlugin.pyi +++ b/stubs/Pillow/PIL/XpmImagePlugin.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from .ImageFile import ImageFile diff --git a/stubs/Pillow/PIL/_imaging.pyi b/stubs/Pillow/PIL/_imaging.pyi index 4cb18612b6c7..669d5a4f8c47 100644 --- a/stubs/Pillow/PIL/_imaging.pyi +++ b/stubs/Pillow/PIL/_imaging.pyi @@ -1,7 +1,6 @@ from _typeshed import Incomplete from collections.abc import Sequence -from typing import Protocol -from typing_extensions import Literal +from typing import Literal, Protocol DEFAULT_STRATEGY: Literal[0] FILTERED: Literal[1] diff --git a/stubs/PyAutoGUI/pyautogui/__init__.pyi b/stubs/PyAutoGUI/pyautogui/__init__.pyi index 423b4096d2f7..7b868e4caa1d 100644 --- a/stubs/PyAutoGUI/pyautogui/__init__.pyi +++ b/stubs/PyAutoGUI/pyautogui/__init__.pyi @@ -2,8 +2,8 @@ import contextlib from _typeshed import ConvertibleToInt from collections.abc import Callable, Iterable, Sequence from datetime import datetime -from typing import NamedTuple, SupportsInt, TypeVar -from typing_extensions import Final, ParamSpec, SupportsIndex, TypeAlias +from typing import Final, NamedTuple, SupportsIndex, SupportsInt, TypeVar +from typing_extensions import ParamSpec, TypeAlias from pyscreeze import ( center as center, diff --git a/stubs/PyScreeze/pyscreeze/__init__.pyi b/stubs/PyScreeze/pyscreeze/__init__.pyi index e8f4ef9acd76..538982f05ab9 100644 --- a/stubs/PyScreeze/pyscreeze/__init__.pyi +++ b/stubs/PyScreeze/pyscreeze/__init__.pyi @@ -1,8 +1,8 @@ import sys from _typeshed import ConvertibleToFloat, Incomplete, StrOrBytesPath, Unused from collections.abc import Callable, Generator -from typing import NamedTuple, TypeVar, overload -from typing_extensions import Final, ParamSpec, TypeAlias +from typing import Final, NamedTuple, TypeVar, overload +from typing_extensions import ParamSpec, TypeAlias from PIL import Image diff --git a/stubs/Pygments/pygments/lexers/javascript.pyi b/stubs/Pygments/pygments/lexers/javascript.pyi index 09e1c0949491..958ca3422c0c 100644 --- a/stubs/Pygments/pygments/lexers/javascript.pyi +++ b/stubs/Pygments/pygments/lexers/javascript.pyi @@ -1,5 +1,5 @@ from collections.abc import Iterator -from typing_extensions import Final +from typing import Final from ..lexer import Lexer, RegexLexer from ..token import _TokenType diff --git a/stubs/Pygments/pygments/lexers/kusto.pyi b/stubs/Pygments/pygments/lexers/kusto.pyi index 3fcb3152d622..7130f990315f 100644 --- a/stubs/Pygments/pygments/lexers/kusto.pyi +++ b/stubs/Pygments/pygments/lexers/kusto.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final from ..lexer import RegexLexer diff --git a/stubs/Pygments/pygments/style.pyi b/stubs/Pygments/pygments/style.pyi index 0dd9342bae78..e18f2adaee85 100644 --- a/stubs/Pygments/pygments/style.pyi +++ b/stubs/Pygments/pygments/style.pyi @@ -1,5 +1,5 @@ from collections.abc import Iterator, Mapping, Set as AbstractSet -from typing_extensions import TypedDict +from typing import TypedDict from pygments.token import _TokenType diff --git a/stubs/WTForms/wtforms/fields/numeric.pyi b/stubs/WTForms/wtforms/fields/numeric.pyi index 7288369c0dac..f7390d553f87 100644 --- a/stubs/WTForms/wtforms/fields/numeric.pyi +++ b/stubs/WTForms/wtforms/fields/numeric.pyi @@ -1,7 +1,7 @@ from collections.abc import Callable, Sequence from decimal import Decimal -from typing import Any, overload -from typing_extensions import Literal, Self +from typing import Any, Literal, overload +from typing_extensions import Self from wtforms.fields.core import Field, _Filter, _FormT, _Validator, _Widget from wtforms.form import BaseForm diff --git a/stubs/WTForms/wtforms/meta.pyi b/stubs/WTForms/wtforms/meta.pyi index a37ca489e128..a821e8a9a129 100644 --- a/stubs/WTForms/wtforms/meta.pyi +++ b/stubs/WTForms/wtforms/meta.pyi @@ -1,7 +1,7 @@ from _typeshed import SupportsItems from collections.abc import Collection, Iterator, MutableMapping -from typing import Any, Protocol, TypeVar, overload -from typing_extensions import Literal, TypeAlias +from typing import Any, Literal, Protocol, TypeVar, overload +from typing_extensions import TypeAlias from markupsafe import Markup from wtforms.fields.core import Field, UnboundField diff --git a/stubs/WTForms/wtforms/utils.pyi b/stubs/WTForms/wtforms/utils.pyi index ea7408985c91..ded0e7bc7e6c 100644 --- a/stubs/WTForms/wtforms/utils.pyi +++ b/stubs/WTForms/wtforms/utils.pyi @@ -1,6 +1,5 @@ from collections.abc import Iterable, Iterator -from typing import Any -from typing_extensions import Literal +from typing import Any, Literal from wtforms.meta import _MultiDictLikeWithGetall diff --git a/stubs/WTForms/wtforms/widgets/core.pyi b/stubs/WTForms/wtforms/widgets/core.pyi index 90d13e764a56..6b13b06cece7 100644 --- a/stubs/WTForms/wtforms/widgets/core.pyi +++ b/stubs/WTForms/wtforms/widgets/core.pyi @@ -1,6 +1,5 @@ from decimal import Decimal -from typing import Any -from typing_extensions import Literal +from typing import Any, Literal from markupsafe import Markup from wtforms.fields import Field, FormField, SelectFieldBase, StringField diff --git a/stubs/WebOb/webob/acceptparse.pyi b/stubs/WebOb/webob/acceptparse.pyi index 4dba5387c28a..04c711429a09 100644 --- a/stubs/WebOb/webob/acceptparse.pyi +++ b/stubs/WebOb/webob/acceptparse.pyi @@ -1,7 +1,7 @@ from _typeshed import SupportsItems from collections.abc import Callable, Iterable, Iterator -from typing import Any, NamedTuple, TypeVar, overload -from typing_extensions import Literal, Self, TypeAlias +from typing import Any, Literal, NamedTuple, TypeVar, overload +from typing_extensions import Self, TypeAlias _T = TypeVar("_T") _ListOrTuple: TypeAlias = list[_T] | tuple[_T, ...] diff --git a/stubs/WebOb/webob/cachecontrol.pyi b/stubs/WebOb/webob/cachecontrol.pyi index 9e42ae6058e6..d3a607fc12e4 100644 --- a/stubs/WebOb/webob/cachecontrol.pyi +++ b/stubs/WebOb/webob/cachecontrol.pyi @@ -1,6 +1,6 @@ from collections.abc import Callable, MutableMapping -from typing import Any, Generic, TypeVar, overload -from typing_extensions import Literal, Self, TypeAlias +from typing import Any, Generic, Literal, TypeVar, overload +from typing_extensions import Self, TypeAlias from webob.request import Request from webob.response import Response diff --git a/stubs/WebOb/webob/cookies.pyi b/stubs/WebOb/webob/cookies.pyi index 1e40719b9243..5ad5ff1b7485 100644 --- a/stubs/WebOb/webob/cookies.pyi +++ b/stubs/WebOb/webob/cookies.pyi @@ -3,8 +3,8 @@ from _typeshed.wsgi import WSGIEnvironment from collections.abc import Callable, Collection, ItemsView, Iterator, KeysView, MutableMapping, ValuesView from datetime import date, datetime, timedelta from hashlib import _Hash -from typing import Any, Protocol, TypeVar, overload -from typing_extensions import Literal, TypeAlias +from typing import Any, Literal, Protocol, TypeVar, overload +from typing_extensions import TypeAlias from webob.descriptors import _AsymmetricProperty from webob.request import Request diff --git a/stubs/WebOb/webob/exc.pyi b/stubs/WebOb/webob/exc.pyi index 26a5236c1069..4856ca590740 100644 --- a/stubs/WebOb/webob/exc.pyi +++ b/stubs/WebOb/webob/exc.pyi @@ -2,8 +2,8 @@ from _typeshed import SupportsItems, SupportsKeysAndGetItem from _typeshed.wsgi import StartResponse, WSGIApplication, WSGIEnvironment from collections.abc import Iterable from string import Template -from typing import Any, Protocol -from typing_extensions import Literal, Self +from typing import Any, Literal, Protocol +from typing_extensions import Self from webob.response import Response diff --git a/stubs/WebOb/webob/multidict.pyi b/stubs/WebOb/webob/multidict.pyi index 823fafe973e6..932c39c1f0eb 100644 --- a/stubs/WebOb/webob/multidict.pyi +++ b/stubs/WebOb/webob/multidict.pyi @@ -2,8 +2,8 @@ from _typeshed import SupportsItems, SupportsKeysAndGetItem from _typeshed.wsgi import WSGIEnvironment from cgi import FieldStorage from collections.abc import Collection, Iterable, Iterator, MutableMapping -from typing import Any, TypeVar, overload -from typing_extensions import Literal, Self +from typing import Any, Literal, TypeVar, overload +from typing_extensions import Self _T = TypeVar("_T") _KT = TypeVar("_KT") diff --git a/stubs/WebOb/webob/request.pyi b/stubs/WebOb/webob/request.pyi index d14ff8038cee..4526091ce0a7 100644 --- a/stubs/WebOb/webob/request.pyi +++ b/stubs/WebOb/webob/request.pyi @@ -14,8 +14,8 @@ from cgi import FieldStorage from collections.abc import Iterable, Mapping from re import Pattern from tempfile import _TemporaryFileWrapper -from typing import IO, Any, ClassVar, Protocol, TypeVar, overload -from typing_extensions import Literal, Self, TypeAlias, TypedDict +from typing import IO, Any, ClassVar, Literal, Protocol, TypedDict, TypeVar, overload +from typing_extensions import Self, TypeAlias from webob.acceptparse import _AcceptCharsetProperty, _AcceptEncodingProperty, _AcceptLanguageProperty, _AcceptProperty from webob.byterange import Range diff --git a/stubs/WebOb/webob/response.pyi b/stubs/WebOb/webob/response.pyi index ebd11adbac9a..c7f4e515844d 100644 --- a/stubs/WebOb/webob/response.pyi +++ b/stubs/WebOb/webob/response.pyi @@ -2,8 +2,8 @@ from _typeshed import SupportsItems, SupportsRead from _typeshed.wsgi import StartResponse, WSGIApplication, WSGIEnvironment from collections.abc import Iterable, Iterator, Sequence from datetime import timedelta -from typing import IO, Any, Protocol -from typing_extensions import Literal, TypeAlias, TypedDict +from typing import IO, Any, Literal, Protocol, TypedDict +from typing_extensions import TypeAlias from webob.byterange import ContentRange from webob.cachecontrol import _ResponseCacheControl diff --git a/stubs/aiofiles/aiofiles/tempfile/__init__.pyi b/stubs/aiofiles/aiofiles/tempfile/__init__.pyi index bc59935d7807..26323f9e875f 100644 --- a/stubs/aiofiles/aiofiles/tempfile/__init__.pyi +++ b/stubs/aiofiles/aiofiles/tempfile/__init__.pyi @@ -10,8 +10,7 @@ from _typeshed import ( StrPath, ) from asyncio import AbstractEventLoop -from typing import AnyStr, TypeVar, overload -from typing_extensions import Literal +from typing import AnyStr, Literal, TypeVar, overload from ..base import AiofilesContextManager from ..threadpool.binary import AsyncBufferedIOBase, AsyncBufferedReader, AsyncFileIO diff --git a/stubs/aiofiles/aiofiles/threadpool/__init__.pyi b/stubs/aiofiles/aiofiles/threadpool/__init__.pyi index e9d9ec50eb31..a7154e759f77 100644 --- a/stubs/aiofiles/aiofiles/threadpool/__init__.pyi +++ b/stubs/aiofiles/aiofiles/threadpool/__init__.pyi @@ -9,8 +9,8 @@ from _typeshed import ( ) from asyncio import AbstractEventLoop from collections.abc import Callable -from typing import overload -from typing_extensions import Literal, TypeAlias +from typing import Literal, overload +from typing_extensions import TypeAlias from ..base import AiofilesContextManager from .binary import AsyncBufferedIOBase, AsyncBufferedReader, AsyncFileIO, AsyncIndirectBufferedIOBase, _UnknownAsyncBinaryIO diff --git a/stubs/beautifulsoup4/bs4/dammit.pyi b/stubs/beautifulsoup4/bs4/dammit.pyi index 3de33971cc0c..0a63da49f03d 100644 --- a/stubs/beautifulsoup4/bs4/dammit.pyi +++ b/stubs/beautifulsoup4/bs4/dammit.pyi @@ -1,8 +1,7 @@ from _typeshed import Incomplete from collections.abc import Iterable, Iterator from logging import Logger -from typing import Any -from typing_extensions import Literal +from typing import Any, Literal def chardet_dammit(s): ... diff --git a/stubs/boltons/boltons/listutils.pyi b/stubs/boltons/boltons/listutils.pyi index af490dc466fa..b1036a93d7da 100644 --- a/stubs/boltons/boltons/listutils.pyi +++ b/stubs/boltons/boltons/listutils.pyi @@ -1,6 +1,6 @@ from collections.abc import Iterable -from typing import TypeVar, overload -from typing_extensions import Self, SupportsIndex, TypeAlias +from typing import SupportsIndex, TypeVar, overload +from typing_extensions import Self, TypeAlias _T = TypeVar("_T") diff --git a/stubs/caldav/caldav/objects.pyi b/stubs/caldav/caldav/objects.pyi index a00de57f1f2f..ee18c716fe84 100644 --- a/stubs/caldav/caldav/objects.pyi +++ b/stubs/caldav/caldav/objects.pyi @@ -2,8 +2,8 @@ import datetime from _typeshed import Incomplete from collections import defaultdict from collections.abc import Callable, Container, Iterable, Iterator, Mapping, Sequence -from typing import Any, TypeVar, overload -from typing_extensions import Literal, Self, TypeAlias +from typing import Any, Literal, TypeVar, overload +from typing_extensions import Self, TypeAlias from urllib.parse import ParseResult, SplitResult from vobject.base import VBase diff --git a/stubs/cffi/_cffi_backend.pyi b/stubs/cffi/_cffi_backend.pyi index 89130d0b5ccd..300da7c9f57c 100644 --- a/stubs/cffi/_cffi_backend.pyi +++ b/stubs/cffi/_cffi_backend.pyi @@ -2,8 +2,8 @@ import sys import types from _typeshed import Incomplete, ReadableBuffer, WriteableBuffer from collections.abc import Callable, Hashable -from typing import Any, ClassVar, Protocol, TypeVar, overload -from typing_extensions import Literal, SupportsIndex, TypeAlias, final +from typing import Any, ClassVar, Literal, Protocol, SupportsIndex, TypeVar, final, overload +from typing_extensions import TypeAlias _T = TypeVar("_T") diff --git a/stubs/cffi/cffi/api.pyi b/stubs/cffi/cffi/api.pyi index 85478ce662c0..5caf266535c0 100644 --- a/stubs/cffi/cffi/api.pyi +++ b/stubs/cffi/cffi/api.pyi @@ -2,8 +2,8 @@ import sys import types from _typeshed import Incomplete, ReadableBuffer, WriteableBuffer from collections.abc import Callable, Hashable -from typing import Any, TypeVar, overload -from typing_extensions import Literal, TypeAlias +from typing import Any, Literal, TypeVar, overload +from typing_extensions import TypeAlias import _cffi_backend from setuptools._distutils.extension import Extension diff --git a/stubs/chevron/chevron/renderer.pyi b/stubs/chevron/chevron/renderer.pyi index c7b8cb06982d..fceac1f1541f 100755 --- a/stubs/chevron/chevron/renderer.pyi +++ b/stubs/chevron/chevron/renderer.pyi @@ -1,7 +1,6 @@ from _typeshed import StrPath, SupportsRead from collections.abc import MutableSequence, Sequence -from typing import Any -from typing_extensions import Literal +from typing import Any, Literal g_token_cache: dict[str, list[tuple[str, str]]] # undocumented python3: Literal[True] diff --git a/stubs/click-spinner/click_spinner/__init__.pyi b/stubs/click-spinner/click_spinner/__init__.pyi index 1f280c63b7e4..f36cbf0fd38d 100644 --- a/stubs/click-spinner/click_spinner/__init__.pyi +++ b/stubs/click-spinner/click_spinner/__init__.pyi @@ -1,8 +1,8 @@ import threading from collections.abc import Iterator from types import TracebackType -from typing import Protocol -from typing_extensions import Literal, Self +from typing import Literal, Protocol +from typing_extensions import Self __version__: str diff --git a/stubs/colorama/colorama/win32.pyi b/stubs/colorama/colorama/win32.pyi index 7423c14d9983..548feab0cf6e 100644 --- a/stubs/colorama/colorama/win32.pyi +++ b/stubs/colorama/colorama/win32.pyi @@ -1,6 +1,6 @@ import sys from collections.abc import Callable -from typing_extensions import Literal +from typing import Literal STDOUT: Literal[-11] STDERR: Literal[-12] diff --git a/stubs/colorama/colorama/winterm.pyi b/stubs/colorama/colorama/winterm.pyi index 038f39838fed..7762e0236262 100644 --- a/stubs/colorama/colorama/winterm.pyi +++ b/stubs/colorama/colorama/winterm.pyi @@ -1,5 +1,5 @@ import sys -from typing_extensions import Final +from typing import Final if sys.platform == "win32": from . import win32 diff --git a/stubs/commonmark/commonmark/main.pyi b/stubs/commonmark/commonmark/main.pyi index c7c6b4219ea0..c1768b9203ad 100644 --- a/stubs/commonmark/commonmark/main.pyi +++ b/stubs/commonmark/commonmark/main.pyi @@ -1,3 +1,3 @@ -from typing_extensions import Literal +from typing import Literal def commonmark(text: str, format: Literal["html", "json", "ast", "rst"] = ...) -> str: ... diff --git a/stubs/croniter/croniter/croniter.pyi b/stubs/croniter/croniter/croniter.pyi index 4f0925703def..c57e0ba576bf 100644 --- a/stubs/croniter/croniter/croniter.pyi +++ b/stubs/croniter/croniter/croniter.pyi @@ -3,8 +3,8 @@ from _typeshed import Unused from collections import OrderedDict from collections.abc import Iterator from re import Match, Pattern -from typing import Any, overload -from typing_extensions import Final, Literal, Never, Self, TypeAlias +from typing import Any, Final, Literal, overload +from typing_extensions import Never, Self, TypeAlias _RetType: TypeAlias = type[float | datetime.datetime] _Expressions: TypeAlias = list[str] # fixed-length list of 5 or 6 strings diff --git a/stubs/dateparser/dateparser/__init__.pyi b/stubs/dateparser/dateparser/__init__.pyi index b0aaf351a3a9..4d259de3ae65 100644 --- a/stubs/dateparser/dateparser/__init__.pyi +++ b/stubs/dateparser/dateparser/__init__.pyi @@ -1,5 +1,6 @@ import datetime -from typing_extensions import Literal, TypeAlias, TypedDict +from typing import Literal, TypedDict +from typing_extensions import TypeAlias from .date import DateDataParser, _DetectLanguagesFunction diff --git a/stubs/dateparser/dateparser/date.pyi b/stubs/dateparser/dateparser/date.pyi index c92148d1c32e..f659361ea1f4 100644 --- a/stubs/dateparser/dateparser/date.pyi +++ b/stubs/dateparser/dateparser/date.pyi @@ -2,8 +2,8 @@ import collections from collections.abc import Callable, Iterable, Iterator from datetime import datetime from re import Pattern -from typing import ClassVar, overload -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal, overload +from typing_extensions import TypeAlias from dateparser import _Settings from dateparser.conf import Settings diff --git a/stubs/dateparser/dateparser/search/__init__.pyi b/stubs/dateparser/dateparser/search/__init__.pyi index 1920fa998f05..25afddd2b856 100644 --- a/stubs/dateparser/dateparser/search/__init__.pyi +++ b/stubs/dateparser/dateparser/search/__init__.pyi @@ -1,7 +1,6 @@ from collections.abc import Mapping, Set as AbstractSet from datetime import datetime -from typing import Any, overload -from typing_extensions import Literal +from typing import Any, Literal, overload from ..date import _DetectLanguagesFunction diff --git a/stubs/decorator/decorator.pyi b/stubs/decorator/decorator.pyi index 3eb509a0c7fa..d7631417ddec 100644 --- a/stubs/decorator/decorator.pyi +++ b/stubs/decorator/decorator.pyi @@ -4,8 +4,8 @@ from collections.abc import Callable, Iterator from contextlib import _GeneratorContextManager from inspect import Signature, getfullargspec as getfullargspec, iscoroutinefunction as iscoroutinefunction from re import Pattern -from typing import Any, TypeVar -from typing_extensions import Literal, ParamSpec +from typing import Any, Literal, TypeVar +from typing_extensions import ParamSpec _C = TypeVar("_C", bound=Callable[..., Any]) _Func = TypeVar("_Func", bound=Callable[..., Any]) diff --git a/stubs/dockerfile-parse/dockerfile_parse/parser.pyi b/stubs/dockerfile-parse/dockerfile_parse/parser.pyi index 3f06fbea9b19..a5e74082f522 100644 --- a/stubs/dockerfile-parse/dockerfile_parse/parser.pyi +++ b/stubs/dockerfile-parse/dockerfile_parse/parser.pyi @@ -1,7 +1,6 @@ import logging from collections.abc import Mapping, Sequence -from typing import IO, ClassVar -from typing_extensions import TypedDict +from typing import IO, ClassVar, TypedDict from .util import Context diff --git a/stubs/dockerfile-parse/dockerfile_parse/util.pyi b/stubs/dockerfile-parse/dockerfile_parse/util.pyi index 6677299fe366..a15048eb19c8 100644 --- a/stubs/dockerfile-parse/dockerfile_parse/util.pyi +++ b/stubs/dockerfile-parse/dockerfile_parse/util.pyi @@ -1,7 +1,7 @@ from collections.abc import Generator, Mapping, MutableMapping from io import StringIO -from typing import ClassVar -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import TypeAlias def b2u(string: bytes | str) -> str: ... def u2b(string: str | bytes) -> bytes: ... diff --git a/stubs/docutils/docutils/io.pyi b/stubs/docutils/docutils/io.pyi index 39efb9682bd8..f19e9fd6c0fc 100644 --- a/stubs/docutils/docutils/io.pyi +++ b/stubs/docutils/docutils/io.pyi @@ -8,8 +8,7 @@ from _typeshed import ( Unused, ) from re import Pattern -from typing import Any, ClassVar -from typing_extensions import Literal +from typing import Any, ClassVar, Literal from docutils import TransformSpec diff --git a/stubs/docutils/docutils/nodes.pyi b/stubs/docutils/docutils/nodes.pyi index 4059cd0d6214..5239fef9517f 100644 --- a/stubs/docutils/docutils/nodes.pyi +++ b/stubs/docutils/docutils/nodes.pyi @@ -3,8 +3,8 @@ import xml.dom.minidom from _typeshed import Incomplete from abc import abstractmethod from collections.abc import Callable, Generator, Iterable, Iterator, Sequence -from typing import Any, ClassVar, Protocol, TypeVar, overload -from typing_extensions import Literal, Self, SupportsIndex +from typing import Any, ClassVar, Literal, Protocol, SupportsIndex, TypeVar, overload +from typing_extensions import Self from docutils.transforms import Transformer diff --git a/stubs/docutils/docutils/parsers/rst/__init__.pyi b/stubs/docutils/docutils/parsers/rst/__init__.pyi index a7e314148620..46f7ee5b3951 100644 --- a/stubs/docutils/docutils/parsers/rst/__init__.pyi +++ b/stubs/docutils/docutils/parsers/rst/__init__.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -from typing import Any, ClassVar -from typing_extensions import Literal +from typing import Any, ClassVar, Literal from docutils import parsers from docutils.parsers.rst import states diff --git a/stubs/docutils/docutils/utils/__init__.pyi b/stubs/docutils/docutils/utils/__init__.pyi index cdd0065a30f5..7592037883ba 100644 --- a/stubs/docutils/docutils/utils/__init__.pyi +++ b/stubs/docutils/docutils/utils/__init__.pyi @@ -2,7 +2,8 @@ import optparse from _typeshed import Incomplete from builtins import list as _list # alias to avoid name clashes with fields named list from collections.abc import Iterable -from typing_extensions import Literal, TypeAlias +from typing import Literal +from typing_extensions import TypeAlias from docutils import ApplicationError from docutils.io import FileOutput diff --git a/stubs/fanstatic/fanstatic/compiler.pyi b/stubs/fanstatic/fanstatic/compiler.pyi index a3f31d8292bc..642a74fee84c 100644 --- a/stubs/fanstatic/fanstatic/compiler.pyi +++ b/stubs/fanstatic/fanstatic/compiler.pyi @@ -2,8 +2,7 @@ from _typeshed import StrOrBytesPath from abc import abstractmethod from logging import Logger from subprocess import Popen -from typing import Any, ClassVar, NewType -from typing_extensions import Literal +from typing import Any, ClassVar, Literal, NewType import setuptools.command.sdist from fanstatic.core import Resource diff --git a/stubs/fanstatic/fanstatic/core.pyi b/stubs/fanstatic/fanstatic/core.pyi index 304c74328dad..d7d518316bf4 100644 --- a/stubs/fanstatic/fanstatic/core.pyi +++ b/stubs/fanstatic/fanstatic/core.pyi @@ -2,8 +2,8 @@ from abc import abstractmethod from collections.abc import Callable, Iterable from threading import local from types import ModuleType -from typing import NewType -from typing_extensions import Literal, TypeAlias +from typing import Literal, NewType +from typing_extensions import TypeAlias from fanstatic.compiler import Compiler, Minifier diff --git a/stubs/fanstatic/fanstatic/injector.pyi b/stubs/fanstatic/fanstatic/injector.pyi index e76a7c878c9b..aed0ad9b4c8f 100644 --- a/stubs/fanstatic/fanstatic/injector.pyi +++ b/stubs/fanstatic/fanstatic/injector.pyi @@ -1,8 +1,8 @@ from _typeshed.wsgi import StartResponse, WSGIApplication, WSGIEnvironment from abc import abstractmethod from collections.abc import Iterable -from typing import Any -from typing_extensions import Literal, TypedDict, Unpack +from typing import Any, Literal, TypedDict +from typing_extensions import Unpack from fanstatic.core import Dependable, NeededResources, Resource from fanstatic.inclusion import Inclusion diff --git a/stubs/fanstatic/fanstatic/publisher.pyi b/stubs/fanstatic/fanstatic/publisher.pyi index 0e2ecf483e13..ac0257a60613 100644 --- a/stubs/fanstatic/fanstatic/publisher.pyi +++ b/stubs/fanstatic/fanstatic/publisher.pyi @@ -1,8 +1,7 @@ from _typeshed import StrOrBytesPath from _typeshed.wsgi import StartResponse, WSGIApplication, WSGIEnvironment from collections.abc import Iterable -from typing import IO, Any -from typing_extensions import Literal +from typing import IO, Any, Literal from fanstatic.core import Library from fanstatic.registry import LibraryRegistry diff --git a/stubs/fanstatic/fanstatic/registry.pyi b/stubs/fanstatic/fanstatic/registry.pyi index 3376e89c3da6..9612bb5f37f2 100644 --- a/stubs/fanstatic/fanstatic/registry.pyi +++ b/stubs/fanstatic/fanstatic/registry.pyi @@ -1,8 +1,8 @@ from abc import abstractmethod from collections.abc import Iterable from threading import Lock -from typing import Any, ClassVar, Protocol, TypeVar -from typing_extensions import Literal, Self +from typing import Any, ClassVar, Literal, Protocol, TypeVar +from typing_extensions import Self from fanstatic.compiler import Compiler, Minifier from fanstatic.core import Library diff --git a/stubs/fpdf2/fpdf/drawing.pyi b/stubs/fpdf2/fpdf/drawing.pyi index 9cfa8a0f0be1..07987ac1848e 100644 --- a/stubs/fpdf2/fpdf/drawing.pyi +++ b/stubs/fpdf2/fpdf/drawing.pyi @@ -4,8 +4,8 @@ from collections import OrderedDict from collections.abc import Callable, Generator, Iterator, Sequence from contextlib import contextmanager from re import Pattern -from typing import Any, ClassVar, NamedTuple, TypeVar, overload -from typing_extensions import Literal, Self, TypeAlias +from typing import Any, ClassVar, Literal, NamedTuple, TypeVar, overload +from typing_extensions import Self, TypeAlias from .syntax import Name, Raw diff --git a/stubs/fpdf2/fpdf/enums.pyi b/stubs/fpdf2/fpdf/enums.pyi index a0a0ff8a7700..f67ea17e0af1 100644 --- a/stubs/fpdf2/fpdf/enums.pyi +++ b/stubs/fpdf2/fpdf/enums.pyi @@ -1,5 +1,6 @@ from enum import Enum, Flag, IntEnum, IntFlag -from typing_extensions import Literal, Self +from typing import Literal +from typing_extensions import Self from .syntax import Name diff --git a/stubs/fpdf2/fpdf/fpdf.pyi b/stubs/fpdf2/fpdf/fpdf.pyi index 0b67f20fc600..94517be774ae 100644 --- a/stubs/fpdf2/fpdf/fpdf.pyi +++ b/stubs/fpdf2/fpdf/fpdf.pyi @@ -5,8 +5,8 @@ from contextlib import _GeneratorContextManager from io import BytesIO from pathlib import PurePath from re import Pattern -from typing import Any, ClassVar, NamedTuple, overload -from typing_extensions import Final, Literal, TypeAlias, deprecated +from typing import Any, ClassVar, Final, Literal, NamedTuple, overload +from typing_extensions import TypeAlias, deprecated from fpdf import ViewerPreferences from PIL import Image diff --git a/stubs/fpdf2/fpdf/html.pyi b/stubs/fpdf2/fpdf/html.pyi index 25ea7f1da1f1..2bd65a92b1c3 100644 --- a/stubs/fpdf2/fpdf/html.pyi +++ b/stubs/fpdf2/fpdf/html.pyi @@ -2,8 +2,7 @@ from _typeshed import Incomplete, SupportsKeysAndGetItem, Unused from collections.abc import Callable, Iterable from html.parser import HTMLParser from logging import Logger -from typing import ClassVar -from typing_extensions import Final +from typing import ClassVar, Final from fpdf import FPDF diff --git a/stubs/fpdf2/fpdf/image_datastructures.pyi b/stubs/fpdf2/fpdf/image_datastructures.pyi index 42ea9e5e535b..06f422893c3b 100644 --- a/stubs/fpdf2/fpdf/image_datastructures.pyi +++ b/stubs/fpdf2/fpdf/image_datastructures.pyi @@ -1,7 +1,7 @@ from _typeshed import Incomplete from dataclasses import dataclass -from typing import Any -from typing_extensions import Literal, TypeAlias +from typing import Any, Literal +from typing_extensions import TypeAlias from fpdf.enums import Align from fpdf.fpdf import FPDF diff --git a/stubs/fpdf2/fpdf/image_parsing.pyi b/stubs/fpdf2/fpdf/image_parsing.pyi index 8c859cf0b0e9..9f5d5a4924cf 100644 --- a/stubs/fpdf2/fpdf/image_parsing.pyi +++ b/stubs/fpdf2/fpdf/image_parsing.pyi @@ -3,8 +3,8 @@ from dataclasses import dataclass from io import BytesIO from logging import Logger from types import TracebackType -from typing import Any -from typing_extensions import Literal, TypeAlias +from typing import Any, Literal +from typing_extensions import TypeAlias from PIL import Image diff --git a/stubs/fpdf2/fpdf/line_break.pyi b/stubs/fpdf2/fpdf/line_break.pyi index 302b2e156610..52b130b50e18 100644 --- a/stubs/fpdf2/fpdf/line_break.pyi +++ b/stubs/fpdf2/fpdf/line_break.pyi @@ -1,7 +1,6 @@ from _typeshed import Incomplete from collections.abc import Callable, Sequence -from typing import NamedTuple -from typing_extensions import Final +from typing import Final, NamedTuple from .enums import Align, WrapMode diff --git a/stubs/fpdf2/fpdf/linearization.pyi b/stubs/fpdf2/fpdf/linearization.pyi index cfbaaf5ba42d..479a6b8d547c 100644 --- a/stubs/fpdf2/fpdf/linearization.pyi +++ b/stubs/fpdf2/fpdf/linearization.pyi @@ -1,5 +1,5 @@ from _typeshed import Incomplete -from typing_extensions import Final +from typing import Final from .encryption import StandardSecurityHandler from .output import ContentWithoutID, OutputProducer diff --git a/stubs/fpdf2/fpdf/output.pyi b/stubs/fpdf2/fpdf/output.pyi index 575d4d5d8338..1f081daeb442 100644 --- a/stubs/fpdf2/fpdf/output.pyi +++ b/stubs/fpdf2/fpdf/output.pyi @@ -1,7 +1,7 @@ from _typeshed import Incomplete, Unused from collections import defaultdict from logging import Logger -from typing_extensions import Final +from typing import Final from .annotations import AnnotationDict from .encryption import StandardSecurityHandler diff --git a/stubs/fpdf2/fpdf/svg.pyi b/stubs/fpdf2/fpdf/svg.pyi index 815c38a41c3d..d619f2c560d3 100644 --- a/stubs/fpdf2/fpdf/svg.pyi +++ b/stubs/fpdf2/fpdf/svg.pyi @@ -2,8 +2,7 @@ from _typeshed import Incomplete, Unused from collections.abc import Callable from logging import Logger from re import Pattern -from typing import NamedTuple, overload -from typing_extensions import Literal +from typing import Literal, NamedTuple, overload from ._fonttools_shims import BasePen, _TTGlyphSet from .drawing import ClippingPath, PaintedPath diff --git a/stubs/fpdf2/fpdf/syntax.pyi b/stubs/fpdf2/fpdf/syntax.pyi index e2ca70cdd6de..59d44648c47e 100644 --- a/stubs/fpdf2/fpdf/syntax.pyi +++ b/stubs/fpdf2/fpdf/syntax.pyi @@ -2,8 +2,8 @@ import datetime from _typeshed import Incomplete, SupportsItems from abc import ABC, abstractmethod from re import Pattern -from typing import ClassVar, TypeVar -from typing_extensions import Literal, Self +from typing import ClassVar, Literal, TypeVar +from typing_extensions import Self from .encryption import StandardSecurityHandler diff --git a/stubs/fpdf2/fpdf/table.pyi b/stubs/fpdf2/fpdf/table.pyi index 9dedab1bef0e..68aac2d6843a 100644 --- a/stubs/fpdf2/fpdf/table.pyi +++ b/stubs/fpdf2/fpdf/table.pyi @@ -1,9 +1,9 @@ -from _typeshed import Incomplete from collections.abc import Iterable from dataclasses import dataclass from io import BytesIO -from typing_extensions import Literal +from typing import Literal +from _typeshed import Incomplete from PIL import Image from .drawing import DeviceGray, DeviceRGB diff --git a/stubs/fpdf2/fpdf/transitions.pyi b/stubs/fpdf2/fpdf/transitions.pyi index b10df4bd6538..7d7f2e6f9737 100644 --- a/stubs/fpdf2/fpdf/transitions.pyi +++ b/stubs/fpdf2/fpdf/transitions.pyi @@ -1,5 +1,5 @@ from abc import ABC, abstractmethod -from typing_extensions import Literal +from typing import Literal class Transition(ABC): @abstractmethod diff --git a/stubs/fpdf2/fpdf/util.pyi b/stubs/fpdf2/fpdf/util.pyi index 63b13b49e79e..2f20897dc839 100644 --- a/stubs/fpdf2/fpdf/util.pyi +++ b/stubs/fpdf2/fpdf/util.pyi @@ -1,6 +1,6 @@ from collections.abc import Iterable -from typing import Any, AnyStr, NamedTuple -from typing_extensions import Final, Literal, TypeAlias +from typing import Any, AnyStr, Final, Literal, NamedTuple +from typing_extensions import TypeAlias _Unit: TypeAlias = Literal["pt", "mm", "cm", "in"] diff --git a/stubs/gevent/gevent/_ffi/watcher.pyi b/stubs/gevent/gevent/_ffi/watcher.pyi index 9b1e36f762fa..112396aa10ba 100644 --- a/stubs/gevent/gevent/_ffi/watcher.pyi +++ b/stubs/gevent/gevent/_ffi/watcher.pyi @@ -1,8 +1,8 @@ from _typeshed import FileDescriptor, StrOrBytesPath from collections.abc import Callable from types import TracebackType -from typing import Any, overload -from typing_extensions import Literal, Self, TypeVarTuple, Unpack +from typing import Any, Literal, overload +from typing_extensions import Self, TypeVarTuple, Unpack from gevent._types import _Loop, _StatResult diff --git a/stubs/gevent/gevent/_fileobjectcommon.pyi b/stubs/gevent/gevent/_fileobjectcommon.pyi index a35636364238..2aac3bc65e1e 100644 --- a/stubs/gevent/gevent/_fileobjectcommon.pyi +++ b/stubs/gevent/gevent/_fileobjectcommon.pyi @@ -9,8 +9,8 @@ from _typeshed import ( ReadableBuffer, ) from types import TracebackType -from typing import IO, Any, AnyStr, ClassVar, Generic, TypeVar, overload -from typing_extensions import Literal, Self +from typing import IO, Any, AnyStr, ClassVar, Generic, Literal, TypeVar, overload +from typing_extensions import Self from gevent.lock import DummySemaphore, Semaphore from gevent.threadpool import ThreadPool diff --git a/stubs/gevent/gevent/_ident.pyi b/stubs/gevent/gevent/_ident.pyi index 303e2992ec14..56144a379f13 100644 --- a/stubs/gevent/gevent/_ident.pyi +++ b/stubs/gevent/gevent/_ident.pyi @@ -1,5 +1,4 @@ -from typing import Any -from typing_extensions import final +from typing import Any, final from weakref import ref @final diff --git a/stubs/gevent/gevent/_types.pyi b/stubs/gevent/gevent/_types.pyi index e790e7e54b38..26f481e45bc5 100644 --- a/stubs/gevent/gevent/_types.pyi +++ b/stubs/gevent/gevent/_types.pyi @@ -2,8 +2,8 @@ import sys from _typeshed import FileDescriptor, StrOrBytesPath from collections.abc import Callable from types import TracebackType -from typing import Any, Protocol, overload -from typing_extensions import Literal, TypeAlias, TypeVarTuple, Unpack +from typing import Any, Literal, Protocol, overload +from typing_extensions import TypeAlias, TypeVarTuple, Unpack _Ts = TypeVarTuple("_Ts") diff --git a/stubs/gevent/gevent/_waiter.pyi b/stubs/gevent/gevent/_waiter.pyi index 71a7879acc33..ed29f5879236 100644 --- a/stubs/gevent/gevent/_waiter.pyi +++ b/stubs/gevent/gevent/_waiter.pyi @@ -1,6 +1,6 @@ from types import TracebackType -from typing import Generic, TypeVar, overload -from typing_extensions import TypeAlias, final +from typing import Generic, TypeVar, final, overload +from typing_extensions import TypeAlias from gevent.event import _ValueSource from gevent.hub import Hub diff --git a/stubs/gevent/gevent/baseserver.pyi b/stubs/gevent/gevent/baseserver.pyi index 74ae39294f27..aa7375c84f13 100644 --- a/stubs/gevent/gevent/baseserver.pyi +++ b/stubs/gevent/gevent/baseserver.pyi @@ -1,7 +1,7 @@ from collections.abc import Callable, Container from types import TracebackType -from typing import Any, Generic, Protocol -from typing_extensions import Literal, ParamSpec, Self, TypeAlias +from typing import Any, Generic, Literal, Protocol +from typing_extensions import ParamSpec, Self, TypeAlias from gevent._types import _Loop from gevent.pool import Pool diff --git a/stubs/gevent/gevent/event.pyi b/stubs/gevent/gevent/event.pyi index 7c478535453a..199a63f88eca 100644 --- a/stubs/gevent/gevent/event.pyi +++ b/stubs/gevent/gevent/event.pyi @@ -1,6 +1,6 @@ from types import TracebackType -from typing import Generic, Protocol, TypeVar, overload -from typing_extensions import Literal, TypeAlias +from typing import Generic, Literal, Protocol, TypeVar, overload +from typing_extensions import TypeAlias from gevent._abstract_linkable import AbstractLinkable diff --git a/stubs/gevent/gevent/fileobject.pyi b/stubs/gevent/gevent/fileobject.pyi index 1f130443c561..4138b6e25a97 100644 --- a/stubs/gevent/gevent/fileobject.pyi +++ b/stubs/gevent/gevent/fileobject.pyi @@ -14,8 +14,7 @@ if sys.platform != "win32": OpenBinaryModeWriting, OpenTextMode, ) - from typing import IO, AnyStr, overload - from typing_extensions import Literal + from typing import IO, AnyStr, Literal, overload from gevent._fileobjectcommon import _IOT, FileObjectBase diff --git a/stubs/gevent/gevent/lock.pyi b/stubs/gevent/gevent/lock.pyi index fab3e5c1c8e4..ddaf1ab85701 100644 --- a/stubs/gevent/gevent/lock.pyi +++ b/stubs/gevent/gevent/lock.pyi @@ -1,7 +1,6 @@ from collections.abc import Callable from types import TracebackType -from typing import Any -from typing_extensions import Literal +from typing import Any, Literal from gevent._abstract_linkable import AbstractLinkable from gevent.hub import Hub diff --git a/stubs/gevent/gevent/os.pyi b/stubs/gevent/gevent/os.pyi index 985858dd9155..915f1e3fcf86 100644 --- a/stubs/gevent/gevent/os.pyi +++ b/stubs/gevent/gevent/os.pyi @@ -1,8 +1,9 @@ import os import sys -from _typeshed import FileDescriptor, Incomplete, ReadableBuffer from collections.abc import Callable -from typing_extensions import Literal +from typing import Literal + +from _typeshed import FileDescriptor, Incomplete, ReadableBuffer def tp_read(fd: FileDescriptor, n: int) -> bytes: ... def tp_write(fd: FileDescriptor, buf: ReadableBuffer) -> int: ... diff --git a/stubs/gevent/gevent/pywsgi.pyi b/stubs/gevent/gevent/pywsgi.pyi index 576b308b90f0..d512d6f63896 100644 --- a/stubs/gevent/gevent/pywsgi.pyi +++ b/stubs/gevent/gevent/pywsgi.pyi @@ -5,8 +5,8 @@ from http.client import HTTPMessage from io import BufferedIOBase, BufferedReader from logging import Logger from types import TracebackType -from typing import Any, ClassVar, Protocol, TypeVar, overload -from typing_extensions import Literal, Self +from typing import Any, ClassVar, Literal, Protocol, TypeVar, overload +from typing_extensions import Self from gevent.baseserver import _Spawner from gevent.server import StreamServer diff --git a/stubs/gevent/gevent/queue.pyi b/stubs/gevent/gevent/queue.pyi index 663bd8fb646d..f8327e9f23b9 100644 --- a/stubs/gevent/gevent/queue.pyi +++ b/stubs/gevent/gevent/queue.pyi @@ -3,8 +3,8 @@ from collections.abc import Iterable # technically it is using _PySimpleQueue, which has the same interface as SimpleQueue from queue import Empty as Empty, Full as Full, SimpleQueue as SimpleQueue -from typing import Any, Generic, TypeVar, overload -from typing_extensions import Literal, Self, final +from typing import Any, Generic, Literal, TypeVar, final, overload +from typing_extensions import Self from gevent._waiter import Waiter from gevent.hub import Hub diff --git a/stubs/gevent/gevent/resolver/ares.pyi b/stubs/gevent/gevent/resolver/ares.pyi index 6cf5a5322663..c63cb40843ec 100644 --- a/stubs/gevent/gevent/resolver/ares.pyi +++ b/stubs/gevent/gevent/resolver/ares.pyi @@ -2,7 +2,7 @@ import sys if sys.platform != "win32": from collections.abc import Sequence - from typing_extensions import TypedDict + from typing import TypedDict from gevent._types import _Watcher from gevent.hub import Hub diff --git a/stubs/gevent/gevent/server.pyi b/stubs/gevent/gevent/server.pyi index cce84c07e4c5..71608e51fc3b 100644 --- a/stubs/gevent/gevent/server.pyi +++ b/stubs/gevent/gevent/server.pyi @@ -1,8 +1,8 @@ from _socket import _Address as _StrictAddress from _typeshed import ReadableBuffer, StrOrBytesPath from collections.abc import Callable -from typing import Any, ClassVar, overload -from typing_extensions import TypeAlias, TypedDict +from typing import Any, ClassVar, TypedDict, overload +from typing_extensions import TypeAlias from gevent.baseserver import BaseServer, _Spawner from gevent.socket import socket as _GeventSocket diff --git a/stubs/gevent/gevent/timeout.pyi b/stubs/gevent/gevent/timeout.pyi index c96f90cabe77..abfa0b56b541 100644 --- a/stubs/gevent/gevent/timeout.pyi +++ b/stubs/gevent/gevent/timeout.pyi @@ -1,7 +1,7 @@ from collections.abc import Callable from types import TracebackType -from typing import Any, TypeVar, overload -from typing_extensions import Literal, ParamSpec, Self +from typing import Any, Literal, TypeVar, overload +from typing_extensions import ParamSpec, Self from gevent._types import _TimerWatcher diff --git a/stubs/google-cloud-ndb/google/cloud/ndb/_datastore_api.pyi b/stubs/google-cloud-ndb/google/cloud/ndb/_datastore_api.pyi index 67b9641d6080..e1dda8111460 100644 --- a/stubs/google-cloud-ndb/google/cloud/ndb/_datastore_api.pyi +++ b/stubs/google-cloud-ndb/google/cloud/ndb/_datastore_api.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Literal +from typing import Literal EVENTUAL: Literal[2] EVENTUAL_CONSISTENCY: Literal[2] diff --git a/stubs/google-cloud-ndb/google/cloud/ndb/model.pyi b/stubs/google-cloud-ndb/google/cloud/ndb/model.pyi index 38b2eeeca3d1..45ca105ee608 100644 --- a/stubs/google-cloud-ndb/google/cloud/ndb/model.pyi +++ b/stubs/google-cloud-ndb/google/cloud/ndb/model.pyi @@ -1,8 +1,8 @@ import datetime from _typeshed import Unused from collections.abc import Callable, Iterable, Sequence -from typing import Any, NoReturn -from typing_extensions import Literal, Self, TypeAlias +from typing import Any, Literal, NoReturn +from typing_extensions import Self, TypeAlias from google.cloud.ndb import exceptions, key as key_module, query as query_module, tasklets as tasklets_module diff --git a/stubs/greenlet/greenlet/_greenlet.pyi b/stubs/greenlet/greenlet/_greenlet.pyi index e873b1083e69..9c85d6ac4873 100644 --- a/stubs/greenlet/greenlet/_greenlet.pyi +++ b/stubs/greenlet/greenlet/_greenlet.pyi @@ -1,8 +1,8 @@ from collections.abc import Callable from contextvars import Context from types import FrameType, TracebackType -from typing import Any, Protocol, overload -from typing_extensions import Literal, TypeAlias +from typing import Any, Literal, Protocol, overload +from typing_extensions import TypeAlias _TraceEvent: TypeAlias = Literal["switch", "throw"] _TraceCallback: TypeAlias = Callable[[_TraceEvent, tuple[greenlet, greenlet]], object] diff --git a/stubs/hdbcli/hdbcli/dbapi.pyi b/stubs/hdbcli/hdbcli/dbapi.pyi index c236a8880520..68d14ca6baf5 100644 --- a/stubs/hdbcli/hdbcli/dbapi.pyi +++ b/stubs/hdbcli/hdbcli/dbapi.pyi @@ -3,8 +3,8 @@ from _typeshed import Incomplete, ReadableBuffer from collections.abc import Sequence from datetime import date, datetime, time from types import TracebackType -from typing import Any, overload -from typing_extensions import Literal, Self, TypeAlias +from typing import Any, Literal, overload +from typing_extensions import Self, TypeAlias from .resultrow import ResultRow diff --git a/stubs/html5lib/html5lib/html5parser.pyi b/stubs/html5lib/html5lib/html5parser.pyi index 4f08a2e2cd01..7ef664ef33cb 100644 --- a/stubs/html5lib/html5lib/html5parser.pyi +++ b/stubs/html5lib/html5lib/html5parser.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete, SupportsRead -from typing import Any, overload -from typing_extensions import Literal +from typing import Any, Literal, overload from xml.etree.ElementTree import Element @overload diff --git a/stubs/ibm-db/ibm_db.pyi b/stubs/ibm-db/ibm_db.pyi index 9baf80d9072e..9f094343d4d4 100644 --- a/stubs/ibm-db/ibm_db.pyi +++ b/stubs/ibm-db/ibm_db.pyi @@ -1,5 +1,5 @@ -from typing import Any, overload -from typing_extensions import Self, final +from typing import Any, final, overload +from typing_extensions import Self ATTR_CASE: int CASE_LOWER: int diff --git a/stubs/influxdb-client/influxdb_client/client/write/point.pyi b/stubs/influxdb-client/influxdb_client/client/write/point.pyi index c160541d99ac..ff635dcbee14 100644 --- a/stubs/influxdb-client/influxdb_client/client/write/point.pyi +++ b/stubs/influxdb-client/influxdb_client/client/write/point.pyi @@ -2,8 +2,8 @@ from _typeshed import Incomplete, SupportsGetItem, SupportsItems from collections.abc import Iterable from datetime import datetime, timedelta from numbers import Integral -from typing import Any -from typing_extensions import Literal, Self, TypeAlias +from typing import Any, Literal +from typing_extensions import Self, TypeAlias from influxdb_client.domain.write_precision import _WritePrecision diff --git a/stubs/influxdb-client/influxdb_client/domain/script_language.pyi b/stubs/influxdb-client/influxdb_client/domain/script_language.pyi index bedb98e43b54..18147050209b 100644 --- a/stubs/influxdb-client/influxdb_client/domain/script_language.pyi +++ b/stubs/influxdb-client/influxdb_client/domain/script_language.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Final +from typing import ClassVar, Final class ScriptLanguage: FLUX: Final = "flux" diff --git a/stubs/influxdb-client/influxdb_client/domain/write_precision.pyi b/stubs/influxdb-client/influxdb_client/domain/write_precision.pyi index 88f738314ae1..f9832543de5c 100644 --- a/stubs/influxdb-client/influxdb_client/domain/write_precision.pyi +++ b/stubs/influxdb-client/influxdb_client/domain/write_precision.pyi @@ -1,6 +1,6 @@ from _typeshed import Incomplete -from typing import Any, ClassVar -from typing_extensions import Final, Literal, TypeAlias +from typing import Any, ClassVar, Final, Literal +from typing_extensions import TypeAlias _WritePrecision: TypeAlias = Literal["ms", "s", "us", "ns"] # noqa: Y047 diff --git a/stubs/inifile/inifile.pyi b/stubs/inifile/inifile.pyi index a4cf997e8cff..8dd54936e82f 100644 --- a/stubs/inifile/inifile.pyi +++ b/stubs/inifile/inifile.pyi @@ -1,7 +1,7 @@ from _typeshed import StrPath, SupportsKeysAndGetItem from collections.abc import Container, Iterable, Iterator, Mapping, MutableMapping, Sequence -from typing import TypeVar, overload -from typing_extensions import Literal, TypeAlias +from typing import Literal, TypeVar, overload +from typing_extensions import TypeAlias from uuid import UUID _T = TypeVar("_T") diff --git a/stubs/jmespath/jmespath/functions.pyi b/stubs/jmespath/jmespath/functions.pyi index 836f80e38e92..0ae554becab9 100644 --- a/stubs/jmespath/jmespath/functions.pyi +++ b/stubs/jmespath/jmespath/functions.pyi @@ -1,6 +1,6 @@ from collections.abc import Callable, Iterable -from typing import Any, TypeVar -from typing_extensions import NotRequired, TypedDict +from typing import Any, TypedDict, TypeVar +from typing_extensions import NotRequired TYPES_MAP: dict[str, str] REVERSE_TYPES_MAP: dict[str, tuple[str, ...]] diff --git a/stubs/jmespath/jmespath/lexer.pyi b/stubs/jmespath/jmespath/lexer.pyi index 9e44bf803768..ac89d2e1e667 100644 --- a/stubs/jmespath/jmespath/lexer.pyi +++ b/stubs/jmespath/jmespath/lexer.pyi @@ -1,6 +1,5 @@ from collections.abc import Iterator -from typing import ClassVar -from typing_extensions import TypedDict +from typing import ClassVar, TypedDict from jmespath.exceptions import EmptyExpressionError as EmptyExpressionError, LexerError as LexerError diff --git a/stubs/jmespath/jmespath/visitor.pyi b/stubs/jmespath/jmespath/visitor.pyi index 7338286d086e..ba2065a481b7 100644 --- a/stubs/jmespath/jmespath/visitor.pyi +++ b/stubs/jmespath/jmespath/visitor.pyi @@ -1,6 +1,5 @@ from collections.abc import Callable, MutableMapping -from typing import Any, ClassVar, NoReturn -from typing_extensions import TypedDict +from typing import Any, ClassVar, NoReturn, TypedDict from jmespath.functions import Functions diff --git a/stubs/keyboard/keyboard/_generic.pyi b/stubs/keyboard/keyboard/_generic.pyi index 21f74b9e1830..8f61d95c2698 100644 --- a/stubs/keyboard/keyboard/_generic.pyi +++ b/stubs/keyboard/keyboard/_generic.pyi @@ -1,8 +1,8 @@ from collections.abc import Callable from queue import Queue from threading import Lock, Thread -from typing import ClassVar -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import TypeAlias from ._keyboard_event import KeyboardEvent from ._mouse_event import _MouseEvent diff --git a/stubs/keyboard/keyboard/_keyboard_event.pyi b/stubs/keyboard/keyboard/_keyboard_event.pyi index e96ced9e1db6..e8614c816667 100644 --- a/stubs/keyboard/keyboard/_keyboard_event.pyi +++ b/stubs/keyboard/keyboard/_keyboard_event.pyi @@ -1,6 +1,7 @@ -from typing_extensions import Literal +from typing import Literal -from ._canonical_names import canonical_names as canonical_names, normalize_name as normalize_name +from ._canonical_names import canonical_names as canonical_names +from ._canonical_names import normalize_name as normalize_name KEY_DOWN: Literal["down"] KEY_UP: Literal["up"] diff --git a/stubs/keyboard/keyboard/_mouse_event.pyi b/stubs/keyboard/keyboard/_mouse_event.pyi index 479fe4c9dbd8..ce8e04af9482 100644 --- a/stubs/keyboard/keyboard/_mouse_event.pyi +++ b/stubs/keyboard/keyboard/_mouse_event.pyi @@ -1,6 +1,6 @@ import sys -from typing import NamedTuple -from typing_extensions import Literal, TypeAlias +from typing import Literal, NamedTuple +from typing_extensions import TypeAlias _MouseEvent: TypeAlias = ButtonEvent | WheelEvent | MoveEvent # noqa: Y047 # Used outside diff --git a/stubs/keyboard/keyboard/mouse.pyi b/stubs/keyboard/keyboard/mouse.pyi index 71484222c405..16008246893d 100644 --- a/stubs/keyboard/keyboard/mouse.pyi +++ b/stubs/keyboard/keyboard/mouse.pyi @@ -1,8 +1,8 @@ import sys from collections.abc import Callable, Iterable from ctypes import c_long -from typing import SupportsInt, TypeVar -from typing_extensions import Literal, TypeAlias +from typing import Literal, SupportsInt, TypeVar +from typing_extensions import TypeAlias from ._generic import GenericListener as _GenericListener from ._mouse_event import ( diff --git a/stubs/ldap3/ldap3/__init__.pyi b/stubs/ldap3/ldap3/__init__.pyi index 4e9d2efd2d8f..d5eeedd55773 100644 --- a/stubs/ldap3/ldap3/__init__.pyi +++ b/stubs/ldap3/ldap3/__init__.pyi @@ -1,5 +1,4 @@ -from typing import Any -from typing_extensions import Literal +from typing import Any, Literal from .abstract.attrDef import AttrDef as AttrDef from .abstract.attribute import ( diff --git a/stubs/ldap3/ldap3/core/connection.pyi b/stubs/ldap3/ldap3/core/connection.pyi index 2c9628d086a9..d40527a1430b 100644 --- a/stubs/ldap3/ldap3/core/connection.pyi +++ b/stubs/ldap3/ldap3/core/connection.pyi @@ -1,7 +1,8 @@ from _collections_abc import Generator, dict_keys from _typeshed import Incomplete, ReadableBuffer from types import TracebackType -from typing_extensions import Literal, Self, TypeAlias +from typing import Literal +from typing_extensions import Self, TypeAlias from pyasn1.type.base import Asn1Item diff --git a/stubs/ldap3/ldap3/core/server.pyi b/stubs/ldap3/ldap3/core/server.pyi index cf109594f2ff..c56c6a4ff05d 100644 --- a/stubs/ldap3/ldap3/core/server.pyi +++ b/stubs/ldap3/ldap3/core/server.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -from typing import Any -from typing_extensions import Literal +from typing import Any, Literal unix_socket_available: bool diff --git a/stubs/ldap3/ldap3/protocol/rfc2696.pyi b/stubs/ldap3/ldap3/protocol/rfc2696.pyi index 86d70346bc9e..7e72093e8b51 100644 --- a/stubs/ldap3/ldap3/protocol/rfc2696.pyi +++ b/stubs/ldap3/ldap3/protocol/rfc2696.pyi @@ -1,5 +1,5 @@ from _typeshed import Incomplete -from typing_extensions import Final +from typing import Final from pyasn1.type.constraint import ConstraintsIntersection, ValueRangeConstraint from pyasn1.type.namedtype import NamedTypes diff --git a/stubs/ldap3/ldap3/protocol/rfc4511.pyi b/stubs/ldap3/ldap3/protocol/rfc4511.pyi index 7dcd3f58f8e9..b7c71cb26539 100644 --- a/stubs/ldap3/ldap3/protocol/rfc4511.pyi +++ b/stubs/ldap3/ldap3/protocol/rfc4511.pyi @@ -1,5 +1,5 @@ # Alias the import to avoid name clash with a class called "Final" -from typing_extensions import Final as _Final +from typing import Final as _Final from pyasn1.type.constraint import ConstraintsIntersection, SingleValueConstraint, ValueRangeConstraint, ValueSizeConstraint from pyasn1.type.namedtype import NamedTypes diff --git a/stubs/ldap3/ldap3/utils/asn1.pyi b/stubs/ldap3/ldap3/utils/asn1.pyi index ff28c62cd424..e29518128a5a 100644 --- a/stubs/ldap3/ldap3/utils/asn1.pyi +++ b/stubs/ldap3/ldap3/utils/asn1.pyi @@ -1,7 +1,7 @@ from _typeshed import Incomplete, IndexableBuffer, SliceableBuffer, Unused from collections.abc import Callable, Mapping -from typing import Any, TypeVar, overload -from typing_extensions import Final, TypeAlias +from typing import Any, Final, TypeVar, overload +from typing_extensions import TypeAlias from pyasn1.codec.ber.encoder import AbstractItemEncoder diff --git a/stubs/libsass/sass.pyi b/stubs/libsass/sass.pyi index 5b73a1f10c5f..840b9a2c68c0 100644 --- a/stubs/libsass/sass.pyi +++ b/stubs/libsass/sass.pyi @@ -1,8 +1,8 @@ import enum from _typeshed import ConvertibleToFloat, SupportsKeysAndGetItem from collections.abc import Callable, Iterable, Iterator, Mapping, Sequence, Set as AbstractSet -from typing import Any, Generic, NamedTuple, TypeVar, overload, type_check_only -from typing_extensions import Literal, ParamSpec, Self, TypeAlias +from typing import Any, Generic, Literal, NamedTuple, TypeVar, overload, type_check_only +from typing_extensions import ParamSpec, Self, TypeAlias _T = TypeVar("_T") _KT = TypeVar("_KT") diff --git a/stubs/mock/mock/mock.pyi b/stubs/mock/mock/mock.pyi index b8e043523f49..d8355bdad0e1 100644 --- a/stubs/mock/mock/mock.pyi +++ b/stubs/mock/mock/mock.pyi @@ -2,8 +2,8 @@ from _typeshed import Incomplete from collections.abc import Callable, Coroutine, Iterable, Mapping, Sequence from contextlib import AbstractContextManager from types import TracebackType -from typing import Any, ClassVar, Generic, TypeVar, overload -from typing_extensions import Literal, ParamSpec, Self +from typing import Any, ClassVar, Generic, Literal, TypeVar, overload +from typing_extensions import ParamSpec, Self _F = TypeVar("_F", bound=Callable[..., Any]) _AF = TypeVar("_AF", bound=Callable[..., Coroutine[Any, Any, Any]]) diff --git a/stubs/netaddr/netaddr/core.pyi b/stubs/netaddr/netaddr/core.pyi index acde2a06ef14..0a2a055b4054 100644 --- a/stubs/netaddr/netaddr/core.pyi +++ b/stubs/netaddr/netaddr/core.pyi @@ -1,6 +1,6 @@ from _typeshed import Incomplete, SupportsWrite from collections.abc import Iterator, Mapping -from typing_extensions import Final +from typing import Final BIG_ENDIAN_PLATFORM: bool P: Final = 1 diff --git a/stubs/netaddr/netaddr/eui/__init__.pyi b/stubs/netaddr/netaddr/eui/__init__.pyi index a2f0e4660464..931b28301c9e 100644 --- a/stubs/netaddr/netaddr/eui/__init__.pyi +++ b/stubs/netaddr/netaddr/eui/__init__.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToInt -from typing import ClassVar, overload -from typing_extensions import Literal, Self +from typing import ClassVar, Literal, overload +from typing_extensions import Self from netaddr.core import DictDotLookup from netaddr.ip import IPAddress diff --git a/stubs/netaddr/netaddr/fbsocket.pyi b/stubs/netaddr/netaddr/fbsocket.pyi index e924e7575896..f33989b5b19d 100644 --- a/stubs/netaddr/netaddr/fbsocket.pyi +++ b/stubs/netaddr/netaddr/fbsocket.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Literal +from typing import Literal AF_INET: Literal[2] AF_INET6: Literal[10] diff --git a/stubs/netaddr/netaddr/ip/__init__.pyi b/stubs/netaddr/netaddr/ip/__init__.pyi index 4fc525bbe5ee..f0ea90b4e5a1 100644 --- a/stubs/netaddr/netaddr/ip/__init__.pyi +++ b/stubs/netaddr/netaddr/ip/__init__.pyi @@ -1,8 +1,8 @@ from _typeshed import ConvertibleToInt, Incomplete, Unused from abc import abstractmethod from collections.abc import Iterable, Iterator -from typing import SupportsInt, overload -from typing_extensions import Literal, Self, SupportsIndex, TypeAlias +from typing import Literal, SupportsIndex, SupportsInt, overload +from typing_extensions import Self, TypeAlias from netaddr.core import DictDotLookup from netaddr.strategy.ipv6 import ipv6_verbose diff --git a/stubs/netaddr/netaddr/strategy/eui48.pyi b/stubs/netaddr/netaddr/strategy/eui48.pyi index 8f62c3295619..d220ff484156 100644 --- a/stubs/netaddr/netaddr/strategy/eui48.pyi +++ b/stubs/netaddr/netaddr/strategy/eui48.pyi @@ -1,7 +1,6 @@ from collections.abc import Iterable, Sequence from re import Pattern -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal AF_LINK: Literal[48] width: Literal[48] diff --git a/stubs/netaddr/netaddr/strategy/eui64.pyi b/stubs/netaddr/netaddr/strategy/eui64.pyi index fff9e76b857d..243a14f7d436 100644 --- a/stubs/netaddr/netaddr/strategy/eui64.pyi +++ b/stubs/netaddr/netaddr/strategy/eui64.pyi @@ -1,7 +1,6 @@ from collections.abc import Iterable, Sequence from re import Pattern -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal AF_EUI64: Literal[64] width: Literal[64] diff --git a/stubs/netaddr/netaddr/strategy/ipv4.pyi b/stubs/netaddr/netaddr/strategy/ipv4.pyi index 707fa2174842..335800c2f00b 100644 --- a/stubs/netaddr/netaddr/strategy/ipv4.pyi +++ b/stubs/netaddr/netaddr/strategy/ipv4.pyi @@ -1,9 +1,10 @@ -from _typeshed import Unused from collections.abc import Iterable, Sequence from socket import AddressFamily -from typing_extensions import Literal +from typing import Literal -from netaddr.core import INET_PTON as INET_PTON, ZEROFILL as ZEROFILL +from _typeshed import Unused +from netaddr.core import INET_PTON as INET_PTON +from netaddr.core import ZEROFILL as ZEROFILL width: Literal[32] word_size: Literal[8] diff --git a/stubs/netaddr/netaddr/strategy/ipv6.pyi b/stubs/netaddr/netaddr/strategy/ipv6.pyi index b553ef001a65..a2988ffb8837 100644 --- a/stubs/netaddr/netaddr/strategy/ipv6.pyi +++ b/stubs/netaddr/netaddr/strategy/ipv6.pyi @@ -1,6 +1,5 @@ from collections.abc import Iterable, Sequence -from typing import ClassVar -from typing_extensions import Final, Literal +from typing import ClassVar, Final, Literal from netaddr.fbsocket import AF_INET6 diff --git a/stubs/networkx/networkx/algorithms/boundary.pyi b/stubs/networkx/networkx/algorithms/boundary.pyi index 10200a11b249..725469948a73 100644 --- a/stubs/networkx/networkx/algorithms/boundary.pyi +++ b/stubs/networkx/networkx/algorithms/boundary.pyi @@ -1,7 +1,6 @@ from _typeshed import Incomplete from collections.abc import Generator, Iterable -from typing import TypeVar, overload -from typing_extensions import Literal +from typing import Literal, TypeVar, overload from networkx.classes.graph import Graph, _Node diff --git a/stubs/networkx/networkx/algorithms/bridges.pyi b/stubs/networkx/networkx/algorithms/bridges.pyi index c528d29fa6c9..af357c046c2d 100644 --- a/stubs/networkx/networkx/algorithms/bridges.pyi +++ b/stubs/networkx/networkx/algorithms/bridges.pyi @@ -1,7 +1,6 @@ from _typeshed import Incomplete from collections.abc import Callable, Generator -from typing import overload -from typing_extensions import Literal +from typing import Literal, overload from networkx.classes.graph import Graph, _Node diff --git a/stubs/networkx/networkx/classes/function.pyi b/stubs/networkx/networkx/classes/function.pyi index 60c231b3adf5..03a8222861fb 100644 --- a/stubs/networkx/networkx/classes/function.pyi +++ b/stubs/networkx/networkx/classes/function.pyi @@ -1,7 +1,6 @@ from _typeshed import Incomplete, SupportsItems, SupportsKeysAndGetItem, Unused from collections.abc import Generator, Hashable, Iterable, Iterator -from typing import TypeVar, overload -from typing_extensions import Literal +from typing import Literal, TypeVar, overload from networkx.algorithms.planarity import PlanarEmbedding from networkx.classes.digraph import DiGraph diff --git a/stubs/networkx/networkx/classes/reportviews.pyi b/stubs/networkx/networkx/classes/reportviews.pyi index 93332cdb5320..6a8c34d811b3 100644 --- a/stubs/networkx/networkx/classes/reportviews.pyi +++ b/stubs/networkx/networkx/classes/reportviews.pyi @@ -1,7 +1,7 @@ from _typeshed import Incomplete, Unused from collections.abc import Iterator, Mapping, Set as AbstractSet -from typing import Any, Generic, TypeVar, overload -from typing_extensions import Literal, Self +from typing import Any, Generic, Literal, TypeVar, overload +from typing_extensions import Self from networkx.classes.graph import Graph, _Edge, _NBunch, _Node diff --git a/stubs/networkx/networkx/convert_matrix.pyi b/stubs/networkx/networkx/convert_matrix.pyi index ffbaf05d2326..4cbcb69d78c7 100644 --- a/stubs/networkx/networkx/convert_matrix.pyi +++ b/stubs/networkx/networkx/convert_matrix.pyi @@ -1,7 +1,7 @@ from _typeshed import Incomplete from collections.abc import Callable, Collection, Hashable, Iterable -from typing import TypeVar, overload -from typing_extensions import Literal, TypeAlias +from typing import Literal, TypeVar, overload +from typing_extensions import TypeAlias import numpy from networkx.classes.graph import Graph, _Node diff --git a/stubs/networkx/networkx/readwrite/graphml.pyi b/stubs/networkx/networkx/readwrite/graphml.pyi index 6771f6e1c0c1..83b866123614 100644 --- a/stubs/networkx/networkx/readwrite/graphml.pyi +++ b/stubs/networkx/networkx/readwrite/graphml.pyi @@ -1,6 +1,6 @@ from _typeshed import Incomplete from collections.abc import Generator -from typing_extensions import Final +from typing import Final __all__ = [ "write_graphml", diff --git a/stubs/networkx/networkx/relabel.pyi b/stubs/networkx/networkx/relabel.pyi index d70ed9c8a239..7788ba91ca43 100644 --- a/stubs/networkx/networkx/relabel.pyi +++ b/stubs/networkx/networkx/relabel.pyi @@ -1,7 +1,6 @@ from _typeshed import Incomplete from collections.abc import Hashable, Mapping -from typing import TypeVar, overload -from typing_extensions import Literal +from typing import Literal, TypeVar, overload from networkx.classes.digraph import DiGraph from networkx.classes.graph import Graph diff --git a/stubs/openpyxl/@tests/test_cases/check_base_descriptors.py b/stubs/openpyxl/@tests/test_cases/check_base_descriptors.py index 16973dbfcb18..0bbbb9877155 100644 --- a/stubs/openpyxl/@tests/test_cases/check_base_descriptors.py +++ b/stubs/openpyxl/@tests/test_cases/check_base_descriptors.py @@ -4,8 +4,7 @@ from _typeshed import ReadableBuffer from datetime import date, datetime, time -from typing import Any, List, Tuple, Union -from typing_extensions import Literal, assert_type +from typing import Any, List, Literal, Tuple, Union, assert_type from openpyxl.descriptors import Strict from openpyxl.descriptors.base import ( diff --git a/stubs/openpyxl/@tests/test_cases/check_nested_descriptors.py b/stubs/openpyxl/@tests/test_cases/check_nested_descriptors.py index 7570b11044a4..a439d2665ffb 100644 --- a/stubs/openpyxl/@tests/test_cases/check_nested_descriptors.py +++ b/stubs/openpyxl/@tests/test_cases/check_nested_descriptors.py @@ -4,8 +4,7 @@ # These tests are essentially a mirror of check_base_descriptors from __future__ import annotations -from typing import Union, cast -from typing_extensions import Literal, assert_type +from typing import Literal, Union, assert_type, cast from openpyxl.descriptors import Strict from openpyxl.descriptors.nested import ( diff --git a/stubs/openpyxl/openpyxl/__init__.pyi b/stubs/openpyxl/openpyxl/__init__.pyi index 2b1c6fc90be5..93fdac8047cd 100644 --- a/stubs/openpyxl/openpyxl/__init__.pyi +++ b/stubs/openpyxl/openpyxl/__init__.pyi @@ -1,6 +1,6 @@ from _typeshed import StrPath, SupportsRead -from typing import IO, Protocol -from typing_extensions import Literal, TypeAlias +from typing import IO, Literal, Protocol +from typing_extensions import TypeAlias from openpyxl.compat.numbers import NUMPY as NUMPY from openpyxl.reader.excel import load_workbook as load_workbook diff --git a/stubs/openpyxl/openpyxl/cell/cell.pyi b/stubs/openpyxl/openpyxl/cell/cell.pyi index 5c961240b880..b46e20a43043 100644 --- a/stubs/openpyxl/openpyxl/cell/cell.pyi +++ b/stubs/openpyxl/openpyxl/cell/cell.pyi @@ -1,8 +1,7 @@ from _typeshed import ReadableBuffer from datetime import datetime from re import Pattern -from typing import overload -from typing_extensions import Final, Literal +from typing import Final, Literal, overload from openpyxl.cell import _CellValue, _TimeTypes from openpyxl.comments.comments import Comment diff --git a/stubs/openpyxl/openpyxl/cell/read_only.pyi b/stubs/openpyxl/openpyxl/cell/read_only.pyi index 293a838fa8bd..2e6082c65f9e 100644 --- a/stubs/openpyxl/openpyxl/cell/read_only.pyi +++ b/stubs/openpyxl/openpyxl/cell/read_only.pyi @@ -1,5 +1,5 @@ from _typeshed import Incomplete -from typing_extensions import Final +from typing import Final from openpyxl.cell import _CellValue from openpyxl.styles.alignment import Alignment diff --git a/stubs/openpyxl/openpyxl/cell/rich_text.pyi b/stubs/openpyxl/openpyxl/cell/rich_text.pyi index 0732bccea2f9..1be2f4a5cb3c 100644 --- a/stubs/openpyxl/openpyxl/cell/rich_text.pyi +++ b/stubs/openpyxl/openpyxl/cell/rich_text.pyi @@ -1,6 +1,6 @@ from collections.abc import Iterable -from typing import overload -from typing_extensions import Literal, Self +from typing import Literal, overload +from typing_extensions import Self from openpyxl.cell.text import InlineFont from openpyxl.descriptors import Strict, String, Typed diff --git a/stubs/openpyxl/openpyxl/cell/text.pyi b/stubs/openpyxl/openpyxl/cell/text.pyi index 752a5e6c3d09..1a81339267a3 100644 --- a/stubs/openpyxl/openpyxl/cell/text.pyi +++ b/stubs/openpyxl/openpyxl/cell/text.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete -from typing import ClassVar -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import TypeAlias from openpyxl.descriptors.base import Alias, Integer, NoneSet, Typed, _ConvertibleToBool from openpyxl.descriptors.nested import NestedString, NestedText, _NestedNoneSetParam diff --git a/stubs/openpyxl/openpyxl/chart/_3d.pyi b/stubs/openpyxl/openpyxl/chart/_3d.pyi index 3be80799ccf6..6c12831498f8 100644 --- a/stubs/openpyxl/openpyxl/chart/_3d.pyi +++ b/stubs/openpyxl/openpyxl/chart/_3d.pyi @@ -1,6 +1,5 @@ from _typeshed import ConvertibleToFloat, ConvertibleToInt, Unused -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from openpyxl.chart.picture import PictureOptions from openpyxl.chart.shapes import GraphicalProperties diff --git a/stubs/openpyxl/openpyxl/chart/_chart.pyi b/stubs/openpyxl/openpyxl/chart/_chart.pyi index 6431f52d443e..0c7220617894 100644 --- a/stubs/openpyxl/openpyxl/chart/_chart.pyi +++ b/stubs/openpyxl/openpyxl/chart/_chart.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToInt, Incomplete, Unused -from typing import ClassVar -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import TypeAlias from openpyxl.chart.layout import Layout from openpyxl.chart.legend import Legend diff --git a/stubs/openpyxl/openpyxl/chart/area_chart.pyi b/stubs/openpyxl/openpyxl/chart/area_chart.pyi index 1842c9011fa3..1ff454f00cfb 100644 --- a/stubs/openpyxl/openpyxl/chart/area_chart.pyi +++ b/stubs/openpyxl/openpyxl/chart/area_chart.pyi @@ -1,6 +1,6 @@ from _typeshed import Incomplete, Unused -from typing import ClassVar -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import TypeAlias from openpyxl.chart.axis import ChartLines, NumericAxis, SeriesAxis, TextAxis from openpyxl.chart.label import DataLabelList diff --git a/stubs/openpyxl/openpyxl/chart/axis.pyi b/stubs/openpyxl/openpyxl/chart/axis.pyi index 9eac604b472c..a724d9633728 100644 --- a/stubs/openpyxl/openpyxl/chart/axis.pyi +++ b/stubs/openpyxl/openpyxl/chart/axis.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete, Unused -from typing import ClassVar, overload -from typing_extensions import Literal, Self, TypeAlias +from typing import ClassVar, Literal, overload +from typing_extensions import Self, TypeAlias from openpyxl.chart.layout import Layout from openpyxl.chart.shapes import GraphicalProperties diff --git a/stubs/openpyxl/openpyxl/chart/bar_chart.pyi b/stubs/openpyxl/openpyxl/chart/bar_chart.pyi index 9663fbd089c4..b45a3096c65e 100644 --- a/stubs/openpyxl/openpyxl/chart/bar_chart.pyi +++ b/stubs/openpyxl/openpyxl/chart/bar_chart.pyi @@ -1,6 +1,6 @@ from _typeshed import Incomplete, Unused -from typing import ClassVar -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import TypeAlias from openpyxl.chart.axis import ChartLines, NumericAxis, SeriesAxis, TextAxis from openpyxl.chart.label import DataLabelList diff --git a/stubs/openpyxl/openpyxl/chart/bubble_chart.pyi b/stubs/openpyxl/openpyxl/chart/bubble_chart.pyi index 9bc5c6aba554..a6585ddd213e 100644 --- a/stubs/openpyxl/openpyxl/chart/bubble_chart.pyi +++ b/stubs/openpyxl/openpyxl/chart/bubble_chart.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToFloat, Incomplete, Unused -from typing import ClassVar -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import TypeAlias from openpyxl.chart.axis import NumericAxis from openpyxl.chart.label import DataLabelList diff --git a/stubs/openpyxl/openpyxl/chart/chartspace.pyi b/stubs/openpyxl/openpyxl/chart/chartspace.pyi index 791c45e741b3..12797dfc58af 100644 --- a/stubs/openpyxl/openpyxl/chart/chartspace.pyi +++ b/stubs/openpyxl/openpyxl/chart/chartspace.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToFloat, Incomplete, Unused -from typing import ClassVar, overload -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal, overload +from typing_extensions import TypeAlias from openpyxl.chart._3d import Surface, View3D from openpyxl.chart.legend import Legend diff --git a/stubs/openpyxl/openpyxl/chart/data_source.pyi b/stubs/openpyxl/openpyxl/chart/data_source.pyi index bebd7f8af840..186c02c6f36e 100644 --- a/stubs/openpyxl/openpyxl/chart/data_source.pyi +++ b/stubs/openpyxl/openpyxl/chart/data_source.pyi @@ -1,6 +1,5 @@ from _typeshed import ConvertibleToInt, Incomplete, Unused -from typing import ClassVar, NoReturn, overload -from typing_extensions import Literal +from typing import ClassVar, Literal, NoReturn, overload from openpyxl.descriptors import Strict from openpyxl.descriptors.base import Alias, Bool, Integer, String, Typed, _ConvertibleToBool diff --git a/stubs/openpyxl/openpyxl/chart/descriptors.pyi b/stubs/openpyxl/openpyxl/chart/descriptors.pyi index eb1d72593fb4..fa6f41d0238c 100644 --- a/stubs/openpyxl/openpyxl/chart/descriptors.pyi +++ b/stubs/openpyxl/openpyxl/chart/descriptors.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Literal +from typing import Literal from openpyxl.chart.data_source import NumFmt from openpyxl.descriptors import Strict, Typed diff --git a/stubs/openpyxl/openpyxl/chart/error_bar.pyi b/stubs/openpyxl/openpyxl/chart/error_bar.pyi index d74bd7905105..4eb20316a98e 100644 --- a/stubs/openpyxl/openpyxl/chart/error_bar.pyi +++ b/stubs/openpyxl/openpyxl/chart/error_bar.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToFloat, Unused -from typing import ClassVar -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import TypeAlias from openpyxl.chart.data_source import NumDataSource from openpyxl.chart.shapes import GraphicalProperties diff --git a/stubs/openpyxl/openpyxl/chart/label.pyi b/stubs/openpyxl/openpyxl/chart/label.pyi index a114617be95a..a5b11f8b4f45 100644 --- a/stubs/openpyxl/openpyxl/chart/label.pyi +++ b/stubs/openpyxl/openpyxl/chart/label.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToInt, Incomplete, Unused -from typing import ClassVar -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import TypeAlias from openpyxl.chart.shapes import GraphicalProperties from openpyxl.chart.text import RichText diff --git a/stubs/openpyxl/openpyxl/chart/layout.pyi b/stubs/openpyxl/openpyxl/chart/layout.pyi index ab00511abba6..92cd7dd2b317 100644 --- a/stubs/openpyxl/openpyxl/chart/layout.pyi +++ b/stubs/openpyxl/openpyxl/chart/layout.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToFloat, Unused -from typing import ClassVar -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import TypeAlias from openpyxl.descriptors.base import Alias, Typed from openpyxl.descriptors.excel import ExtensionList diff --git a/stubs/openpyxl/openpyxl/chart/legend.pyi b/stubs/openpyxl/openpyxl/chart/legend.pyi index 9d3bd50d37f7..341e60026289 100644 --- a/stubs/openpyxl/openpyxl/chart/legend.pyi +++ b/stubs/openpyxl/openpyxl/chart/legend.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToInt, Incomplete, Unused -from typing import ClassVar -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import TypeAlias from openpyxl.chart.layout import Layout from openpyxl.chart.shapes import GraphicalProperties diff --git a/stubs/openpyxl/openpyxl/chart/line_chart.pyi b/stubs/openpyxl/openpyxl/chart/line_chart.pyi index ee5efbb39efc..c6949aed2168 100644 --- a/stubs/openpyxl/openpyxl/chart/line_chart.pyi +++ b/stubs/openpyxl/openpyxl/chart/line_chart.pyi @@ -1,6 +1,6 @@ from _typeshed import Incomplete, Unused -from typing import ClassVar -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import TypeAlias from openpyxl.chart.axis import ChartLines, NumericAxis, _BaseAxis from openpyxl.chart.label import DataLabelList diff --git a/stubs/openpyxl/openpyxl/chart/marker.pyi b/stubs/openpyxl/openpyxl/chart/marker.pyi index d7775f5850a6..2b13a32b17dc 100644 --- a/stubs/openpyxl/openpyxl/chart/marker.pyi +++ b/stubs/openpyxl/openpyxl/chart/marker.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToFloat, ConvertibleToInt, Unused -from typing import ClassVar -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import TypeAlias from openpyxl.chart.picture import PictureOptions from openpyxl.chart.shapes import GraphicalProperties diff --git a/stubs/openpyxl/openpyxl/chart/picture.pyi b/stubs/openpyxl/openpyxl/chart/picture.pyi index ebfe62893821..d82a9022eb29 100644 --- a/stubs/openpyxl/openpyxl/chart/picture.pyi +++ b/stubs/openpyxl/openpyxl/chart/picture.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToFloat -from typing import ClassVar -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import TypeAlias from openpyxl.descriptors.base import _ConvertibleToBool from openpyxl.descriptors.nested import NestedBool, NestedFloat, NestedNoneSet, _NestedNoneSetParam diff --git a/stubs/openpyxl/openpyxl/chart/pie_chart.pyi b/stubs/openpyxl/openpyxl/chart/pie_chart.pyi index b4670c939946..c29375bcd023 100644 --- a/stubs/openpyxl/openpyxl/chart/pie_chart.pyi +++ b/stubs/openpyxl/openpyxl/chart/pie_chart.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToFloat, Incomplete, Unused -from typing import ClassVar -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import TypeAlias from openpyxl.chart.axis import ChartLines from openpyxl.chart.label import DataLabelList diff --git a/stubs/openpyxl/openpyxl/chart/pivot.pyi b/stubs/openpyxl/openpyxl/chart/pivot.pyi index e59bb1aed660..e0df463d6b13 100644 --- a/stubs/openpyxl/openpyxl/chart/pivot.pyi +++ b/stubs/openpyxl/openpyxl/chart/pivot.pyi @@ -1,6 +1,5 @@ from _typeshed import ConvertibleToInt, Unused -from typing import ClassVar, overload -from typing_extensions import Literal +from typing import ClassVar, Literal, overload from openpyxl.chart.label import DataLabel as _DataLabel from openpyxl.chart.marker import Marker diff --git a/stubs/openpyxl/openpyxl/chart/plotarea.pyi b/stubs/openpyxl/openpyxl/chart/plotarea.pyi index 69131c406b6e..286b8150c5ca 100644 --- a/stubs/openpyxl/openpyxl/chart/plotarea.pyi +++ b/stubs/openpyxl/openpyxl/chart/plotarea.pyi @@ -1,6 +1,6 @@ from _typeshed import Incomplete, Unused -from typing import ClassVar -from typing_extensions import Literal, Self +from typing import ClassVar, Literal +from typing_extensions import Self from openpyxl.chart.layout import Layout from openpyxl.chart.shapes import GraphicalProperties diff --git a/stubs/openpyxl/openpyxl/chart/print_settings.pyi b/stubs/openpyxl/openpyxl/chart/print_settings.pyi index 018654fe1162..280114e4d7ac 100644 --- a/stubs/openpyxl/openpyxl/chart/print_settings.pyi +++ b/stubs/openpyxl/openpyxl/chart/print_settings.pyi @@ -1,6 +1,5 @@ from _typeshed import ConvertibleToFloat -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from openpyxl.descriptors.base import Alias, Float, Typed from openpyxl.descriptors.serialisable import Serialisable diff --git a/stubs/openpyxl/openpyxl/chart/radar_chart.pyi b/stubs/openpyxl/openpyxl/chart/radar_chart.pyi index 7e7a1c760c3b..c5b8fced041a 100644 --- a/stubs/openpyxl/openpyxl/chart/radar_chart.pyi +++ b/stubs/openpyxl/openpyxl/chart/radar_chart.pyi @@ -1,6 +1,6 @@ from _typeshed import Incomplete, Unused -from typing import ClassVar -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import TypeAlias from openpyxl.chart.axis import NumericAxis, TextAxis from openpyxl.chart.label import DataLabelList diff --git a/stubs/openpyxl/openpyxl/chart/reference.pyi b/stubs/openpyxl/openpyxl/chart/reference.pyi index 7a087196bb15..408dbb32d31a 100644 --- a/stubs/openpyxl/openpyxl/chart/reference.pyi +++ b/stubs/openpyxl/openpyxl/chart/reference.pyi @@ -1,7 +1,6 @@ from _typeshed import ConvertibleToInt, Incomplete, Unused from collections.abc import Generator -from typing import overload -from typing_extensions import Literal +from typing import Literal, overload from openpyxl.descriptors import Strict from openpyxl.descriptors.base import MinMax, String diff --git a/stubs/openpyxl/openpyxl/chart/scatter_chart.pyi b/stubs/openpyxl/openpyxl/chart/scatter_chart.pyi index 31c88d3be7c3..03e0ae289ca3 100644 --- a/stubs/openpyxl/openpyxl/chart/scatter_chart.pyi +++ b/stubs/openpyxl/openpyxl/chart/scatter_chart.pyi @@ -1,6 +1,6 @@ from _typeshed import Incomplete, Unused -from typing import ClassVar -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import TypeAlias from openpyxl.chart.axis import NumericAxis, TextAxis from openpyxl.chart.label import DataLabelList diff --git a/stubs/openpyxl/openpyxl/chart/series.pyi b/stubs/openpyxl/openpyxl/chart/series.pyi index 3baa78698838..fe34bc76bf92 100644 --- a/stubs/openpyxl/openpyxl/chart/series.pyi +++ b/stubs/openpyxl/openpyxl/chart/series.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToInt, Incomplete, Unused -from typing import ClassVar -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import TypeAlias from openpyxl.chart.data_source import AxDataSource, NumDataSource, StrRef from openpyxl.chart.error_bar import ErrorBars diff --git a/stubs/openpyxl/openpyxl/chart/shapes.pyi b/stubs/openpyxl/openpyxl/chart/shapes.pyi index ab7de9d1a312..1d43dd8ab0ab 100644 --- a/stubs/openpyxl/openpyxl/chart/shapes.pyi +++ b/stubs/openpyxl/openpyxl/chart/shapes.pyi @@ -1,6 +1,6 @@ from _typeshed import Incomplete, Unused -from typing import ClassVar -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import TypeAlias from openpyxl.descriptors.base import Alias, NoneSet, Typed, _ConvertibleToBool from openpyxl.descriptors.nested import EmptyTag diff --git a/stubs/openpyxl/openpyxl/chart/stock_chart.pyi b/stubs/openpyxl/openpyxl/chart/stock_chart.pyi index 54ac6ae5ef52..1d2a715e4e6d 100644 --- a/stubs/openpyxl/openpyxl/chart/stock_chart.pyi +++ b/stubs/openpyxl/openpyxl/chart/stock_chart.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete, Unused -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from openpyxl.chart.axis import ChartLines, NumericAxis, TextAxis from openpyxl.chart.label import DataLabelList diff --git a/stubs/openpyxl/openpyxl/chart/surface_chart.pyi b/stubs/openpyxl/openpyxl/chart/surface_chart.pyi index 8762ee780752..944a588bd508 100644 --- a/stubs/openpyxl/openpyxl/chart/surface_chart.pyi +++ b/stubs/openpyxl/openpyxl/chart/surface_chart.pyi @@ -1,6 +1,5 @@ from _typeshed import ConvertibleToInt, Incomplete -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from openpyxl.chart.axis import NumericAxis, SeriesAxis, TextAxis from openpyxl.chart.shapes import GraphicalProperties diff --git a/stubs/openpyxl/openpyxl/chart/text.pyi b/stubs/openpyxl/openpyxl/chart/text.pyi index 354ebe774c58..481dfa60c93e 100644 --- a/stubs/openpyxl/openpyxl/chart/text.pyi +++ b/stubs/openpyxl/openpyxl/chart/text.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete, Unused -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from openpyxl.chart.data_source import StrRef from openpyxl.descriptors.base import Alias, Typed diff --git a/stubs/openpyxl/openpyxl/chart/title.pyi b/stubs/openpyxl/openpyxl/chart/title.pyi index 4876baffb972..b602afe2e066 100644 --- a/stubs/openpyxl/openpyxl/chart/title.pyi +++ b/stubs/openpyxl/openpyxl/chart/title.pyi @@ -1,6 +1,5 @@ from _typeshed import Unused -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from openpyxl.chart.layout import Layout from openpyxl.chart.shapes import GraphicalProperties diff --git a/stubs/openpyxl/openpyxl/chart/trendline.pyi b/stubs/openpyxl/openpyxl/chart/trendline.pyi index e7870e72f9f9..88b6fd46d75a 100644 --- a/stubs/openpyxl/openpyxl/chart/trendline.pyi +++ b/stubs/openpyxl/openpyxl/chart/trendline.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToFloat, ConvertibleToInt, Unused -from typing import ClassVar -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import TypeAlias from openpyxl.chart.data_source import NumFmt from openpyxl.chart.layout import Layout diff --git a/stubs/openpyxl/openpyxl/chart/updown_bars.pyi b/stubs/openpyxl/openpyxl/chart/updown_bars.pyi index 60e7ad44751e..15fb09bef0c2 100644 --- a/stubs/openpyxl/openpyxl/chart/updown_bars.pyi +++ b/stubs/openpyxl/openpyxl/chart/updown_bars.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete, Unused -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from openpyxl.chart.axis import ChartLines from openpyxl.descriptors.base import Typed diff --git a/stubs/openpyxl/openpyxl/chartsheet/chartsheet.pyi b/stubs/openpyxl/openpyxl/chartsheet/chartsheet.pyi index 51b307a96026..74e752b7d8a6 100644 --- a/stubs/openpyxl/openpyxl/chartsheet/chartsheet.pyi +++ b/stubs/openpyxl/openpyxl/chartsheet/chartsheet.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete, Unused -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from openpyxl import _Decodable, _VisibilityType from openpyxl.chartsheet.custom import CustomChartsheetViews diff --git a/stubs/openpyxl/openpyxl/chartsheet/custom.pyi b/stubs/openpyxl/openpyxl/chartsheet/custom.pyi index 3b2c403bcb7e..70865e0cb01b 100644 --- a/stubs/openpyxl/openpyxl/chartsheet/custom.pyi +++ b/stubs/openpyxl/openpyxl/chartsheet/custom.pyi @@ -1,6 +1,5 @@ from _typeshed import ConvertibleToInt, Incomplete -from typing import ClassVar, overload -from typing_extensions import Literal +from typing import ClassVar, Literal, overload from openpyxl import _VisibilityType from openpyxl.descriptors.base import Bool, Integer, Set, Typed, _ConvertibleToBool diff --git a/stubs/openpyxl/openpyxl/chartsheet/properties.pyi b/stubs/openpyxl/openpyxl/chartsheet/properties.pyi index 973b86374e7a..c04213b58c33 100644 --- a/stubs/openpyxl/openpyxl/chartsheet/properties.pyi +++ b/stubs/openpyxl/openpyxl/chartsheet/properties.pyi @@ -1,5 +1,4 @@ -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from openpyxl.descriptors.base import Bool, String, Typed, _ConvertibleToBool from openpyxl.descriptors.serialisable import Serialisable diff --git a/stubs/openpyxl/openpyxl/chartsheet/protection.pyi b/stubs/openpyxl/openpyxl/chartsheet/protection.pyi index eabd074a0d90..95266410c76f 100644 --- a/stubs/openpyxl/openpyxl/chartsheet/protection.pyi +++ b/stubs/openpyxl/openpyxl/chartsheet/protection.pyi @@ -1,6 +1,5 @@ from _typeshed import ConvertibleToInt, Incomplete -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from openpyxl.descriptors.base import Bool, Integer, String, _ConvertibleToBool from openpyxl.descriptors.serialisable import Serialisable diff --git a/stubs/openpyxl/openpyxl/chartsheet/publish.pyi b/stubs/openpyxl/openpyxl/chartsheet/publish.pyi index bc3436892a24..c69ecce3e05d 100644 --- a/stubs/openpyxl/openpyxl/chartsheet/publish.pyi +++ b/stubs/openpyxl/openpyxl/chartsheet/publish.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToInt, Incomplete -from typing import ClassVar, overload -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal, overload +from typing_extensions import TypeAlias from openpyxl.descriptors.base import Bool, Integer, Set, String, _ConvertibleToBool from openpyxl.descriptors.serialisable import Serialisable diff --git a/stubs/openpyxl/openpyxl/chartsheet/relation.pyi b/stubs/openpyxl/openpyxl/chartsheet/relation.pyi index fb5bece10128..d43efafa5fe0 100644 --- a/stubs/openpyxl/openpyxl/chartsheet/relation.pyi +++ b/stubs/openpyxl/openpyxl/chartsheet/relation.pyi @@ -1,6 +1,5 @@ from _typeshed import ConvertibleToInt, Incomplete -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from openpyxl.descriptors.base import Alias, Integer from openpyxl.descriptors.serialisable import Serialisable diff --git a/stubs/openpyxl/openpyxl/chartsheet/views.pyi b/stubs/openpyxl/openpyxl/chartsheet/views.pyi index e96b32c192b0..4cabc25d45f8 100644 --- a/stubs/openpyxl/openpyxl/chartsheet/views.pyi +++ b/stubs/openpyxl/openpyxl/chartsheet/views.pyi @@ -1,6 +1,5 @@ from _typeshed import ConvertibleToInt, Incomplete, Unused -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from openpyxl.descriptors.base import Bool, Integer, Typed, _ConvertibleToBool from openpyxl.descriptors.excel import ExtensionList diff --git a/stubs/openpyxl/openpyxl/comments/comment_sheet.pyi b/stubs/openpyxl/openpyxl/comments/comment_sheet.pyi index c268f92095ce..f7fd4b59ee50 100644 --- a/stubs/openpyxl/openpyxl/comments/comment_sheet.pyi +++ b/stubs/openpyxl/openpyxl/comments/comment_sheet.pyi @@ -1,7 +1,7 @@ from _typeshed import ConvertibleToInt, Incomplete, Unused from collections.abc import Generator -from typing import ClassVar, overload -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal, overload +from typing_extensions import TypeAlias from openpyxl.cell.text import Text from openpyxl.comments.author import AuthorList diff --git a/stubs/openpyxl/openpyxl/compat/numbers.pyi b/stubs/openpyxl/openpyxl/compat/numbers.pyi index 3912a9333ed4..7db010ddb060 100644 --- a/stubs/openpyxl/openpyxl/compat/numbers.pyi +++ b/stubs/openpyxl/openpyxl/compat/numbers.pyi @@ -1,5 +1,6 @@ from decimal import Decimal -from typing_extensions import Final, TypeAlias +from typing import Final +from typing_extensions import TypeAlias # NOTE: Can't specify numpy as a dependency because openpyxl doesn't declare it as one # import numpy diff --git a/stubs/openpyxl/openpyxl/compat/strings.pyi b/stubs/openpyxl/openpyxl/compat/strings.pyi index 0f4343df6c6c..7d21aa72e2a7 100644 --- a/stubs/openpyxl/openpyxl/compat/strings.pyi +++ b/stubs/openpyxl/openpyxl/compat/strings.pyi @@ -1,5 +1,5 @@ import sys -from typing_extensions import Final +from typing import Final VER: Final[sys._version_info] diff --git a/stubs/openpyxl/openpyxl/descriptors/base.pyi b/stubs/openpyxl/openpyxl/descriptors/base.pyi index 532636d7e346..230808f0ae63 100644 --- a/stubs/openpyxl/openpyxl/descriptors/base.pyi +++ b/stubs/openpyxl/openpyxl/descriptors/base.pyi @@ -2,8 +2,8 @@ from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete, Readable from collections.abc import Iterable, Sized from datetime import datetime from re import Pattern -from typing import Any, Generic, TypeVar, overload -from typing_extensions import Literal, TypeAlias +from typing import Any, Generic, Literal, TypeVar, overload +from typing_extensions import TypeAlias from openpyxl.descriptors import Strict from openpyxl.descriptors.serialisable import Serialisable diff --git a/stubs/openpyxl/openpyxl/descriptors/excel.pyi b/stubs/openpyxl/openpyxl/descriptors/excel.pyi index fc4dcdaf3572..bd25919de534 100644 --- a/stubs/openpyxl/openpyxl/descriptors/excel.pyi +++ b/stubs/openpyxl/openpyxl/descriptors/excel.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from . import Integer, MatchPattern, MinMax, Strict, String from .base import _M, _N diff --git a/stubs/openpyxl/openpyxl/descriptors/nested.pyi b/stubs/openpyxl/openpyxl/descriptors/nested.pyi index cf3ebaf9f89c..b7cb17ca2a8b 100644 --- a/stubs/openpyxl/openpyxl/descriptors/nested.pyi +++ b/stubs/openpyxl/openpyxl/descriptors/nested.pyi @@ -1,7 +1,7 @@ from _typeshed import ConvertibleToFloat, ConvertibleToInt, Unused from collections.abc import Iterable -from typing import Any, ClassVar, NoReturn, overload -from typing_extensions import Literal, TypeAlias +from typing import Any, ClassVar, Literal, NoReturn, overload +from typing_extensions import TypeAlias from openpyxl.descriptors import Strict from openpyxl.descriptors.base import Bool, Convertible, Descriptor, Float, Integer, MinMax, NoneSet, Set, String diff --git a/stubs/openpyxl/openpyxl/descriptors/serialisable.pyi b/stubs/openpyxl/openpyxl/descriptors/serialisable.pyi index 8bb5463f228e..eee7d3bce7ea 100644 --- a/stubs/openpyxl/openpyxl/descriptors/serialisable.pyi +++ b/stubs/openpyxl/openpyxl/descriptors/serialisable.pyi @@ -1,7 +1,7 @@ from _typeshed import ConvertibleToInt, Incomplete, SupportsIter from collections.abc import Iterator -from typing import Any, ClassVar, Protocol -from typing_extensions import Final, Self +from typing import Any, ClassVar, Final, Protocol +from typing_extensions import Self from openpyxl.descriptors import MetaSerialisable from openpyxl.xml.functions import Element diff --git a/stubs/openpyxl/openpyxl/drawing/colors.pyi b/stubs/openpyxl/openpyxl/drawing/colors.pyi index 69b87ad2b52d..8795cdd13d98 100644 --- a/stubs/openpyxl/openpyxl/drawing/colors.pyi +++ b/stubs/openpyxl/openpyxl/drawing/colors.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete -from typing import ClassVar, overload -from typing_extensions import Final, Literal, TypeAlias +from typing import ClassVar, Final, Literal, overload +from typing_extensions import TypeAlias from openpyxl.descriptors import Strict, Typed from openpyxl.descriptors.base import Alias, Integer, MinMax, Set, _ConvertibleToBool diff --git a/stubs/openpyxl/openpyxl/drawing/connector.pyi b/stubs/openpyxl/openpyxl/drawing/connector.pyi index a6025f79a08a..0bf756647eac 100644 --- a/stubs/openpyxl/openpyxl/drawing/connector.pyi +++ b/stubs/openpyxl/openpyxl/drawing/connector.pyi @@ -1,6 +1,5 @@ from _typeshed import ConvertibleToInt -from typing import ClassVar, overload -from typing_extensions import Literal +from typing import ClassVar, Literal, overload from openpyxl.chart.shapes import GraphicalProperties from openpyxl.chart.text import RichText diff --git a/stubs/openpyxl/openpyxl/drawing/effect.pyi b/stubs/openpyxl/openpyxl/drawing/effect.pyi index 93837af088e6..839440db4c7e 100644 --- a/stubs/openpyxl/openpyxl/drawing/effect.pyi +++ b/stubs/openpyxl/openpyxl/drawing/effect.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToFloat, ConvertibleToInt -from typing import ClassVar, overload -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal, overload +from typing_extensions import TypeAlias from openpyxl.descriptors.base import Bool, Float, Integer, Set, String, Typed, _ConvertibleToBool from openpyxl.descriptors.serialisable import Serialisable diff --git a/stubs/openpyxl/openpyxl/drawing/fill.pyi b/stubs/openpyxl/openpyxl/drawing/fill.pyi index 97ad091df42c..17e5656f81c7 100644 --- a/stubs/openpyxl/openpyxl/drawing/fill.pyi +++ b/stubs/openpyxl/openpyxl/drawing/fill.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete -from typing import ClassVar -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import TypeAlias from openpyxl.descriptors.base import Alias, Bool, Integer, MinMax, NoneSet, Set, Typed, _ConvertibleToBool from openpyxl.descriptors.excel import ExtensionList diff --git a/stubs/openpyxl/openpyxl/drawing/geometry.pyi b/stubs/openpyxl/openpyxl/drawing/geometry.pyi index ecdc0473eedc..82079d9cfc87 100644 --- a/stubs/openpyxl/openpyxl/drawing/geometry.pyi +++ b/stubs/openpyxl/openpyxl/drawing/geometry.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete, Unused -from typing import ClassVar, overload -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal, overload +from typing_extensions import TypeAlias from openpyxl.descriptors.base import Alias, Bool, Float, Integer, MinMax, NoneSet, Set, String, Typed, _ConvertibleToBool from openpyxl.descriptors.excel import Coordinate, ExtensionList, Percentage diff --git a/stubs/openpyxl/openpyxl/drawing/graphic.pyi b/stubs/openpyxl/openpyxl/drawing/graphic.pyi index a23c66b0b286..675f0585cf97 100644 --- a/stubs/openpyxl/openpyxl/drawing/graphic.pyi +++ b/stubs/openpyxl/openpyxl/drawing/graphic.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from openpyxl.descriptors.base import Alias, Bool, String, Typed, _ConvertibleToBool from openpyxl.descriptors.excel import ExtensionList diff --git a/stubs/openpyxl/openpyxl/drawing/image.pyi b/stubs/openpyxl/openpyxl/drawing/image.pyi index 3bd545df3254..490429aa4752 100644 --- a/stubs/openpyxl/openpyxl/drawing/image.pyi +++ b/stubs/openpyxl/openpyxl/drawing/image.pyi @@ -1,8 +1,8 @@ from _typeshed import SupportsRead from pathlib import Path from types import ModuleType -from typing import Any -from typing_extensions import Literal, TypeAlias +from typing import Any, Literal +from typing_extensions import TypeAlias # Is actually PIL.Image.Image _PILImageImage: TypeAlias = Any diff --git a/stubs/openpyxl/openpyxl/drawing/line.pyi b/stubs/openpyxl/openpyxl/drawing/line.pyi index 321851a3ee56..668c5c98ced4 100644 --- a/stubs/openpyxl/openpyxl/drawing/line.pyi +++ b/stubs/openpyxl/openpyxl/drawing/line.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete, Unused -from typing import ClassVar -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import TypeAlias from openpyxl.descriptors.base import Alias, Integer, MinMax, NoneSet, Typed, _ConvertibleToBool from openpyxl.descriptors.excel import ExtensionList diff --git a/stubs/openpyxl/openpyxl/drawing/picture.pyi b/stubs/openpyxl/openpyxl/drawing/picture.pyi index 776129e148ce..74a29558685d 100644 --- a/stubs/openpyxl/openpyxl/drawing/picture.pyi +++ b/stubs/openpyxl/openpyxl/drawing/picture.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete, Unused -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from openpyxl.chart.shapes import GraphicalProperties from openpyxl.descriptors.base import Alias, Bool, String, Typed, _ConvertibleToBool diff --git a/stubs/openpyxl/openpyxl/drawing/properties.pyi b/stubs/openpyxl/openpyxl/drawing/properties.pyi index a7b12d4462f9..0d9c33726daf 100644 --- a/stubs/openpyxl/openpyxl/drawing/properties.pyi +++ b/stubs/openpyxl/openpyxl/drawing/properties.pyi @@ -1,6 +1,6 @@ from _typeshed import Incomplete, Unused -from typing import ClassVar, overload -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal, overload +from typing_extensions import TypeAlias from openpyxl.descriptors.base import Bool, NoneSet, String, Typed, _ConvertibleToBool from openpyxl.descriptors.excel import ExtensionList diff --git a/stubs/openpyxl/openpyxl/drawing/spreadsheet_drawing.pyi b/stubs/openpyxl/openpyxl/drawing/spreadsheet_drawing.pyi index dc0972481209..17a8d36ad9e7 100644 --- a/stubs/openpyxl/openpyxl/drawing/spreadsheet_drawing.pyi +++ b/stubs/openpyxl/openpyxl/drawing/spreadsheet_drawing.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToInt, Incomplete -from typing import ClassVar -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import TypeAlias from openpyxl.descriptors.base import Alias, Bool, NoneSet, Typed, _ConvertibleToBool from openpyxl.descriptors.nested import NestedText diff --git a/stubs/openpyxl/openpyxl/drawing/text.pyi b/stubs/openpyxl/openpyxl/drawing/text.pyi index 8af0c18ef785..02c18ff83617 100644 --- a/stubs/openpyxl/openpyxl/drawing/text.pyi +++ b/stubs/openpyxl/openpyxl/drawing/text.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete, Unused -from typing import ClassVar -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import TypeAlias from openpyxl.descriptors.base import Alias, Bool, Integer, MinMax, NoneSet, Set, String, Typed, _ConvertibleToBool from openpyxl.descriptors.excel import Coordinate, ExtensionList diff --git a/stubs/openpyxl/openpyxl/formatting/formatting.pyi b/stubs/openpyxl/openpyxl/formatting/formatting.pyi index 0e6ac27ce6b5..9d6e9e423f1f 100644 --- a/stubs/openpyxl/openpyxl/formatting/formatting.pyi +++ b/stubs/openpyxl/openpyxl/formatting/formatting.pyi @@ -1,7 +1,6 @@ from _typeshed import Incomplete, Unused from collections.abc import Iterator -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from openpyxl.descriptors.base import Alias, Bool, Convertible, _ConvertibleToBool, _ConvertibleToMultiCellRange from openpyxl.descriptors.serialisable import Serialisable diff --git a/stubs/openpyxl/openpyxl/formatting/rule.pyi b/stubs/openpyxl/openpyxl/formatting/rule.pyi index fe264e06f3ae..9b04c503e6b4 100644 --- a/stubs/openpyxl/openpyxl/formatting/rule.pyi +++ b/stubs/openpyxl/openpyxl/formatting/rule.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToInt, Incomplete, Unused -from typing import ClassVar, overload -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal, overload +from typing_extensions import TypeAlias from openpyxl.descriptors import Float, Strict from openpyxl.descriptors.base import Bool, Integer, NoneSet, Set, String, Typed, _ConvertibleToBool diff --git a/stubs/openpyxl/openpyxl/formula/tokenizer.pyi b/stubs/openpyxl/openpyxl/formula/tokenizer.pyi index acf53bcb91f0..2aafed4d0357 100644 --- a/stubs/openpyxl/openpyxl/formula/tokenizer.pyi +++ b/stubs/openpyxl/openpyxl/formula/tokenizer.pyi @@ -1,6 +1,7 @@ from _typeshed import Incomplete from re import Pattern -from typing_extensions import Final, Literal, TypeAlias +from typing import Final, Literal +from typing_extensions import TypeAlias _TokenTypesNotOperand: TypeAlias = Literal[ "LITERAL", "FUNC", "ARRAY", "PAREN", "SEP", "OPERATOR-PREFIX", "OPERATOR-INFIX", "OPERATOR-POSTFIX", "WHITE-SPACE" diff --git a/stubs/openpyxl/openpyxl/formula/translate.pyi b/stubs/openpyxl/openpyxl/formula/translate.pyi index edbec1d541f8..3f03b328b884 100644 --- a/stubs/openpyxl/openpyxl/formula/translate.pyi +++ b/stubs/openpyxl/openpyxl/formula/translate.pyi @@ -1,6 +1,6 @@ from _typeshed import Incomplete from re import Pattern -from typing_extensions import Final +from typing import Final class TranslatorError(Exception): ... diff --git a/stubs/openpyxl/openpyxl/packaging/core.pyi b/stubs/openpyxl/openpyxl/packaging/core.pyi index e7145130229e..0106e8cb9222 100644 --- a/stubs/openpyxl/openpyxl/packaging/core.pyi +++ b/stubs/openpyxl/openpyxl/packaging/core.pyi @@ -1,7 +1,6 @@ from _typeshed import Incomplete from datetime import datetime -from typing import ClassVar, overload -from typing_extensions import Literal +from typing import ClassVar, Literal, overload from openpyxl.descriptors import DateTime from openpyxl.descriptors.base import Alias diff --git a/stubs/openpyxl/openpyxl/packaging/custom.pyi b/stubs/openpyxl/openpyxl/packaging/custom.pyi index 529284a87799..46121a55b285 100644 --- a/stubs/openpyxl/openpyxl/packaging/custom.pyi +++ b/stubs/openpyxl/openpyxl/packaging/custom.pyi @@ -1,8 +1,8 @@ from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete from collections.abc import Iterator from datetime import datetime -from typing import Any, Generic, TypeVar -from typing_extensions import Final, Literal, Self, TypeAlias +from typing import Any, Final, Generic, Literal, TypeVar +from typing_extensions import Self, TypeAlias from openpyxl.descriptors import Sequence, Strict from openpyxl.descriptors.base import Bool, DateTime, Float, Integer, String, _ConvertibleToBool diff --git a/stubs/openpyxl/openpyxl/packaging/extended.pyi b/stubs/openpyxl/openpyxl/packaging/extended.pyi index ed3c636d5787..9eedb949ff86 100644 --- a/stubs/openpyxl/openpyxl/packaging/extended.pyi +++ b/stubs/openpyxl/openpyxl/packaging/extended.pyi @@ -1,6 +1,5 @@ from _typeshed import ConvertibleToInt, Unused -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from openpyxl.descriptors.base import Typed from openpyxl.descriptors.nested import NestedText diff --git a/stubs/openpyxl/openpyxl/packaging/manifest.pyi b/stubs/openpyxl/openpyxl/packaging/manifest.pyi index 4205048a829a..8d0f3a15f13f 100644 --- a/stubs/openpyxl/openpyxl/packaging/manifest.pyi +++ b/stubs/openpyxl/openpyxl/packaging/manifest.pyi @@ -1,7 +1,6 @@ from _typeshed import Incomplete from collections.abc import Generator -from typing import ClassVar -from typing_extensions import Final, Literal +from typing import ClassVar, Final, Literal from openpyxl.descriptors.base import String from openpyxl.descriptors.serialisable import Serialisable diff --git a/stubs/openpyxl/openpyxl/packaging/relationship.pyi b/stubs/openpyxl/openpyxl/packaging/relationship.pyi index 27f5e7495b38..e0ddf4c8b3b2 100644 --- a/stubs/openpyxl/openpyxl/packaging/relationship.pyi +++ b/stubs/openpyxl/openpyxl/packaging/relationship.pyi @@ -1,7 +1,6 @@ from _typeshed import Incomplete, Unused from collections.abc import Generator -from typing import ClassVar, TypeVar, overload -from typing_extensions import Literal +from typing import ClassVar, Literal, TypeVar, overload from zipfile import ZipFile from openpyxl.descriptors.base import Alias, String diff --git a/stubs/openpyxl/openpyxl/packaging/workbook.pyi b/stubs/openpyxl/openpyxl/packaging/workbook.pyi index ccc66b48c719..08322f8a0f17 100644 --- a/stubs/openpyxl/openpyxl/packaging/workbook.pyi +++ b/stubs/openpyxl/openpyxl/packaging/workbook.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToInt, Incomplete, Unused -from typing import ClassVar -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import TypeAlias from openpyxl import _VisibilityType from openpyxl.descriptors.base import Alias, Bool, Integer, NoneSet, String, Typed, _ConvertibleToBool diff --git a/stubs/openpyxl/openpyxl/pivot/cache.pyi b/stubs/openpyxl/openpyxl/pivot/cache.pyi index 700fea4af00b..5cb3571cd434 100644 --- a/stubs/openpyxl/openpyxl/pivot/cache.pyi +++ b/stubs/openpyxl/openpyxl/pivot/cache.pyi @@ -1,7 +1,7 @@ from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete, Unused from datetime import datetime -from typing import ClassVar, overload -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal, overload +from typing_extensions import TypeAlias from openpyxl.descriptors.base import Bool, DateTime, Float, Integer, Set, String, Typed, _ConvertibleToBool from openpyxl.descriptors.excel import ExtensionList diff --git a/stubs/openpyxl/openpyxl/pivot/fields.pyi b/stubs/openpyxl/openpyxl/pivot/fields.pyi index 9779bc6410fb..3076fed4a36b 100644 --- a/stubs/openpyxl/openpyxl/pivot/fields.pyi +++ b/stubs/openpyxl/openpyxl/pivot/fields.pyi @@ -1,7 +1,6 @@ from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete from datetime import datetime -from typing import ClassVar, overload -from typing_extensions import Literal +from typing import ClassVar, Literal, overload from openpyxl.descriptors.base import Bool, DateTime, Float, Integer, String, Typed, _ConvertibleToBool from openpyxl.descriptors.serialisable import Serialisable diff --git a/stubs/openpyxl/openpyxl/pivot/record.pyi b/stubs/openpyxl/openpyxl/pivot/record.pyi index 573bc570eeec..3c1429e962ca 100644 --- a/stubs/openpyxl/openpyxl/pivot/record.pyi +++ b/stubs/openpyxl/openpyxl/pivot/record.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete, Unused -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from openpyxl.descriptors.base import Typed from openpyxl.descriptors.excel import ExtensionList diff --git a/stubs/openpyxl/openpyxl/pivot/table.pyi b/stubs/openpyxl/openpyxl/pivot/table.pyi index db074ea9c6a8..0a3009f6cd2e 100644 --- a/stubs/openpyxl/openpyxl/pivot/table.pyi +++ b/stubs/openpyxl/openpyxl/pivot/table.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToInt, Incomplete, Unused -from typing import ClassVar, overload -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal, overload +from typing_extensions import TypeAlias from openpyxl.descriptors.base import Bool, Integer, NoneSet, Set, String, Typed, _ConvertibleToBool from openpyxl.descriptors.excel import ExtensionList diff --git a/stubs/openpyxl/openpyxl/reader/excel.pyi b/stubs/openpyxl/openpyxl/reader/excel.pyi index 4d707269683b..661ddcbd19be 100644 --- a/stubs/openpyxl/openpyxl/reader/excel.pyi +++ b/stubs/openpyxl/openpyxl/reader/excel.pyi @@ -1,5 +1,6 @@ from _typeshed import Incomplete -from typing_extensions import Final, Literal, TypeAlias +from typing import Final, Literal +from typing_extensions import TypeAlias from zipfile import ZipFile from openpyxl import _ZipFileFileProtocol diff --git a/stubs/openpyxl/openpyxl/styles/alignment.pyi b/stubs/openpyxl/openpyxl/styles/alignment.pyi index 0cdaebafdea3..d2b96de0aea6 100644 --- a/stubs/openpyxl/openpyxl/styles/alignment.pyi +++ b/stubs/openpyxl/openpyxl/styles/alignment.pyi @@ -1,7 +1,7 @@ from _typeshed import ConvertibleToFloat, Incomplete from collections.abc import Iterator -from typing import ClassVar -from typing_extensions import Final, Literal, TypeAlias +from typing import ClassVar, Final, Literal +from typing_extensions import TypeAlias from openpyxl.descriptors.base import Alias, Bool, Min, MinMax, NoneSet, _ConvertibleToBool from openpyxl.descriptors.serialisable import Serialisable diff --git a/stubs/openpyxl/openpyxl/styles/borders.pyi b/stubs/openpyxl/openpyxl/styles/borders.pyi index 5e9c0ebf6cd7..5c05d5666c29 100644 --- a/stubs/openpyxl/openpyxl/styles/borders.pyi +++ b/stubs/openpyxl/openpyxl/styles/borders.pyi @@ -1,7 +1,7 @@ from _typeshed import Incomplete from collections.abc import Iterator -from typing import ClassVar -from typing_extensions import Final, Literal, TypeAlias +from typing import ClassVar, Final, Literal +from typing_extensions import TypeAlias from openpyxl.descriptors.base import Alias, Bool, NoneSet, Typed, _ConvertibleToBool from openpyxl.descriptors.serialisable import Serialisable diff --git a/stubs/openpyxl/openpyxl/styles/cell_style.pyi b/stubs/openpyxl/openpyxl/styles/cell_style.pyi index 630bf9fd1bc3..cc97daf6abdc 100644 --- a/stubs/openpyxl/openpyxl/styles/cell_style.pyi +++ b/stubs/openpyxl/openpyxl/styles/cell_style.pyi @@ -1,8 +1,8 @@ from _typeshed import ConvertibleToInt, Incomplete, Unused from array import array from collections.abc import Iterable, MutableSequence -from typing import ClassVar, Generic, TypeVar -from typing_extensions import Literal, Self +from typing import ClassVar, Generic, Literal, TypeVar +from typing_extensions import Self from openpyxl.descriptors.base import Bool, Integer, Typed, _ConvertibleToBool from openpyxl.descriptors.excel import ExtensionList diff --git a/stubs/openpyxl/openpyxl/styles/colors.pyi b/stubs/openpyxl/openpyxl/styles/colors.pyi index b61e021bb669..a9b5c4f58829 100644 --- a/stubs/openpyxl/openpyxl/styles/colors.pyi +++ b/stubs/openpyxl/openpyxl/styles/colors.pyi @@ -1,8 +1,8 @@ from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete, Unused from collections.abc import Iterator from re import Pattern -from typing import ClassVar, TypeVar, overload -from typing_extensions import Final, Literal, Self +from typing import ClassVar, Final, Literal, TypeVar, overload +from typing_extensions import Self from openpyxl.descriptors import Strict, Typed from openpyxl.descriptors.base import _N, Bool, Integer, MinMax, String, _ConvertibleToBool diff --git a/stubs/openpyxl/openpyxl/styles/differential.pyi b/stubs/openpyxl/openpyxl/styles/differential.pyi index 3946cba221cd..aacdc31ef7b0 100644 --- a/stubs/openpyxl/openpyxl/styles/differential.pyi +++ b/stubs/openpyxl/openpyxl/styles/differential.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete, Unused -from typing import ClassVar -from typing_extensions import Literal, SupportsIndex +from typing import ClassVar, Literal, SupportsIndex from openpyxl.descriptors.base import Alias, Typed from openpyxl.descriptors.excel import ExtensionList diff --git a/stubs/openpyxl/openpyxl/styles/fills.pyi b/stubs/openpyxl/openpyxl/styles/fills.pyi index b56b9d9562e4..7e1a62a988e6 100644 --- a/stubs/openpyxl/openpyxl/styles/fills.pyi +++ b/stubs/openpyxl/openpyxl/styles/fills.pyi @@ -1,7 +1,7 @@ from _typeshed import ConvertibleToFloat, Incomplete, Unused from collections.abc import Iterable, Iterator, Sequence as ABCSequence -from typing import ClassVar -from typing_extensions import Final, Literal, TypeAlias +from typing import ClassVar, Final, Literal +from typing_extensions import TypeAlias from openpyxl.descriptors import Sequence, Strict from openpyxl.descriptors.base import Alias, Float, MinMax, NoneSet, Set diff --git a/stubs/openpyxl/openpyxl/styles/fonts.pyi b/stubs/openpyxl/openpyxl/styles/fonts.pyi index 30547e4957f7..91ec30035922 100644 --- a/stubs/openpyxl/openpyxl/styles/fonts.pyi +++ b/stubs/openpyxl/openpyxl/styles/fonts.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToFloat, ConvertibleToInt -from typing import ClassVar -from typing_extensions import Final, Literal, Self, TypeAlias +from typing import ClassVar, Final, Literal +from typing_extensions import Self, TypeAlias from openpyxl.descriptors.base import Alias, _ConvertibleToBool from openpyxl.descriptors.nested import ( diff --git a/stubs/openpyxl/openpyxl/styles/named_styles.pyi b/stubs/openpyxl/openpyxl/styles/named_styles.pyi index 805034cff490..2cb2b24510fe 100644 --- a/stubs/openpyxl/openpyxl/styles/named_styles.pyi +++ b/stubs/openpyxl/openpyxl/styles/named_styles.pyi @@ -1,7 +1,6 @@ from _typeshed import ConvertibleToInt, Incomplete, Unused from collections.abc import Iterator -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from openpyxl.descriptors.base import Bool, Integer, String, Typed, _ConvertibleToBool from openpyxl.descriptors.excel import ExtensionList diff --git a/stubs/openpyxl/openpyxl/styles/numbers.pyi b/stubs/openpyxl/openpyxl/styles/numbers.pyi index 1fdf97202126..56ded3062828 100644 --- a/stubs/openpyxl/openpyxl/styles/numbers.pyi +++ b/stubs/openpyxl/openpyxl/styles/numbers.pyi @@ -1,7 +1,7 @@ from _typeshed import ConvertibleToInt, Incomplete, Unused from re import Pattern -from typing import ClassVar, overload -from typing_extensions import Final, Literal, SupportsIndex, TypeGuard +from typing import ClassVar, Final, Literal, SupportsIndex, overload +from typing_extensions import TypeGuard from openpyxl.descriptors import Strict, String from openpyxl.descriptors.base import Integer diff --git a/stubs/openpyxl/openpyxl/styles/protection.pyi b/stubs/openpyxl/openpyxl/styles/protection.pyi index d317a5d46acf..8d4652f2e5b0 100644 --- a/stubs/openpyxl/openpyxl/styles/protection.pyi +++ b/stubs/openpyxl/openpyxl/styles/protection.pyi @@ -1,5 +1,4 @@ -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from openpyxl.descriptors.base import Bool, _ConvertibleToBool from openpyxl.descriptors.serialisable import Serialisable diff --git a/stubs/openpyxl/openpyxl/styles/stylesheet.pyi b/stubs/openpyxl/openpyxl/styles/stylesheet.pyi index b36fd5bc0385..1d4f1e8324dd 100644 --- a/stubs/openpyxl/openpyxl/styles/stylesheet.pyi +++ b/stubs/openpyxl/openpyxl/styles/stylesheet.pyi @@ -1,6 +1,6 @@ from _typeshed import Incomplete, Unused -from typing import ClassVar, TypeVar -from typing_extensions import Literal, Self +from typing import ClassVar, Literal, TypeVar +from typing_extensions import Self from zipfile import ZipFile from openpyxl.descriptors.base import Typed diff --git a/stubs/openpyxl/openpyxl/styles/table.pyi b/stubs/openpyxl/openpyxl/styles/table.pyi index 47480919e8cf..889b12ea4da3 100644 --- a/stubs/openpyxl/openpyxl/styles/table.pyi +++ b/stubs/openpyxl/openpyxl/styles/table.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToInt, Incomplete, Unused -from typing import ClassVar -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import TypeAlias from openpyxl.descriptors.base import Bool, Integer, Set, String, _ConvertibleToBool from openpyxl.descriptors.serialisable import Serialisable diff --git a/stubs/openpyxl/openpyxl/utils/cell.pyi b/stubs/openpyxl/openpyxl/utils/cell.pyi index 815c8c750ab3..1d3b0b8e2e4d 100644 --- a/stubs/openpyxl/openpyxl/utils/cell.pyi +++ b/stubs/openpyxl/openpyxl/utils/cell.pyi @@ -1,6 +1,7 @@ from collections.abc import Generator from re import Pattern -from typing_extensions import Final, TypeAlias +from typing import Final +from typing_extensions import TypeAlias # "1:1" | "A1:A1" | "A:A" _RangeBoundariesTuple: TypeAlias = tuple[None, int, None, int] | tuple[int, int, int, int] | tuple[int, None, int, None] diff --git a/stubs/openpyxl/openpyxl/utils/datetime.pyi b/stubs/openpyxl/openpyxl/utils/datetime.pyi index de2c233d5274..ecb645ccb656 100644 --- a/stubs/openpyxl/openpyxl/utils/datetime.pyi +++ b/stubs/openpyxl/openpyxl/utils/datetime.pyi @@ -1,6 +1,6 @@ from datetime import datetime from re import Pattern -from typing_extensions import Final +from typing import Final MAC_EPOCH: Final[datetime] WINDOWS_EPOCH: Final[datetime] diff --git a/stubs/openpyxl/openpyxl/utils/formulas.pyi b/stubs/openpyxl/openpyxl/utils/formulas.pyi index af0607318be5..ea7f2d97bc85 100644 --- a/stubs/openpyxl/openpyxl/utils/formulas.pyi +++ b/stubs/openpyxl/openpyxl/utils/formulas.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final FORMULAE: Final[frozenset[str]] diff --git a/stubs/openpyxl/openpyxl/utils/inference.pyi b/stubs/openpyxl/openpyxl/utils/inference.pyi index 85e0441c609e..5787b6f19652 100644 --- a/stubs/openpyxl/openpyxl/utils/inference.pyi +++ b/stubs/openpyxl/openpyxl/utils/inference.pyi @@ -1,5 +1,5 @@ from re import Pattern -from typing_extensions import Final +from typing import Final PERCENT_REGEX: Final[Pattern[str]] TIME_REGEX: Final[Pattern[str]] diff --git a/stubs/openpyxl/openpyxl/utils/units.pyi b/stubs/openpyxl/openpyxl/utils/units.pyi index 6264bc8263e8..6a799ed06424 100644 --- a/stubs/openpyxl/openpyxl/utils/units.pyi +++ b/stubs/openpyxl/openpyxl/utils/units.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final DEFAULT_ROW_HEIGHT: Final[float] BASE_COL_WIDTH: Final = 8 diff --git a/stubs/openpyxl/openpyxl/workbook/child.pyi b/stubs/openpyxl/openpyxl/workbook/child.pyi index c4e07c6e6383..b6b041e596e3 100644 --- a/stubs/openpyxl/openpyxl/workbook/child.pyi +++ b/stubs/openpyxl/openpyxl/workbook/child.pyi @@ -1,6 +1,6 @@ from collections.abc import Iterable from re import Pattern -from typing_extensions import Final +from typing import Final from openpyxl import _Decodable from openpyxl.workbook.workbook import Workbook diff --git a/stubs/openpyxl/openpyxl/workbook/defined_name.pyi b/stubs/openpyxl/openpyxl/workbook/defined_name.pyi index ace0b18e8cab..0e7393ccf01a 100644 --- a/stubs/openpyxl/openpyxl/workbook/defined_name.pyi +++ b/stubs/openpyxl/openpyxl/workbook/defined_name.pyi @@ -2,8 +2,7 @@ from _typeshed import ConvertibleToInt, Incomplete from collections import defaultdict from collections.abc import Generator, Iterator from re import Pattern -from typing import ClassVar -from typing_extensions import Final, Literal +from typing import ClassVar, Final, Literal from openpyxl.descriptors import Sequence from openpyxl.descriptors.base import Alias, Bool, Integer, String, _ConvertibleToBool diff --git a/stubs/openpyxl/openpyxl/workbook/external_link/external.pyi b/stubs/openpyxl/openpyxl/workbook/external_link/external.pyi index 0292eb33eb6d..cc7e5ceaf3d3 100644 --- a/stubs/openpyxl/openpyxl/workbook/external_link/external.pyi +++ b/stubs/openpyxl/openpyxl/workbook/external_link/external.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToInt, Incomplete, Unused -from typing import ClassVar -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import TypeAlias from zipfile import ZipFile from openpyxl.descriptors.base import Bool, Integer, NoneSet, String, Typed, _ConvertibleToBool diff --git a/stubs/openpyxl/openpyxl/workbook/function_group.pyi b/stubs/openpyxl/openpyxl/workbook/function_group.pyi index 59fe8696b68e..48bc87d80b8d 100644 --- a/stubs/openpyxl/openpyxl/workbook/function_group.pyi +++ b/stubs/openpyxl/openpyxl/workbook/function_group.pyi @@ -1,6 +1,5 @@ from _typeshed import ConvertibleToInt, Incomplete -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from openpyxl.descriptors.base import Integer, String from openpyxl.descriptors.serialisable import Serialisable diff --git a/stubs/openpyxl/openpyxl/workbook/properties.pyi b/stubs/openpyxl/openpyxl/workbook/properties.pyi index 6cf3be532427..ccc400f8f7ec 100644 --- a/stubs/openpyxl/openpyxl/workbook/properties.pyi +++ b/stubs/openpyxl/openpyxl/workbook/properties.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete -from typing import ClassVar -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import TypeAlias from openpyxl.descriptors.base import Bool, Float, Integer, NoneSet, String, _ConvertibleToBool from openpyxl.descriptors.serialisable import Serialisable diff --git a/stubs/openpyxl/openpyxl/workbook/protection.pyi b/stubs/openpyxl/openpyxl/workbook/protection.pyi index 91d8c67e2c3e..81bf5b4ab92d 100644 --- a/stubs/openpyxl/openpyxl/workbook/protection.pyi +++ b/stubs/openpyxl/openpyxl/workbook/protection.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToInt, Incomplete -from typing import ClassVar, overload -from typing_extensions import Literal, Self +from typing import ClassVar, Literal, overload +from typing_extensions import Self from openpyxl.descriptors.base import Alias, Bool, Integer, String, _ConvertibleToBool from openpyxl.descriptors.serialisable import Serialisable diff --git a/stubs/openpyxl/openpyxl/workbook/smart_tags.pyi b/stubs/openpyxl/openpyxl/workbook/smart_tags.pyi index bc7a95d7e7b0..f6ae41ad7030 100644 --- a/stubs/openpyxl/openpyxl/workbook/smart_tags.pyi +++ b/stubs/openpyxl/openpyxl/workbook/smart_tags.pyi @@ -1,6 +1,6 @@ from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import TypeAlias from openpyxl.descriptors.base import Bool, NoneSet, String, _ConvertibleToBool from openpyxl.descriptors.serialisable import Serialisable diff --git a/stubs/openpyxl/openpyxl/workbook/views.pyi b/stubs/openpyxl/openpyxl/workbook/views.pyi index 6f6fbdefb989..2850d363b0e0 100644 --- a/stubs/openpyxl/openpyxl/workbook/views.pyi +++ b/stubs/openpyxl/openpyxl/workbook/views.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToInt, Incomplete, Unused -from typing import ClassVar, overload -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal, overload +from typing_extensions import TypeAlias from openpyxl import _VisibilityType from openpyxl.descriptors.base import Bool, Integer, NoneSet, String, Typed, _ConvertibleToBool diff --git a/stubs/openpyxl/openpyxl/workbook/web.pyi b/stubs/openpyxl/openpyxl/workbook/web.pyi index 4bc6b2c20b32..a83615353cd8 100644 --- a/stubs/openpyxl/openpyxl/workbook/web.pyi +++ b/stubs/openpyxl/openpyxl/workbook/web.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToInt, Incomplete, Unused -from typing import ClassVar, overload -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal, overload +from typing_extensions import TypeAlias from openpyxl.descriptors.base import Bool, Integer, NoneSet, String, _ConvertibleToBool from openpyxl.descriptors.serialisable import Serialisable diff --git a/stubs/openpyxl/openpyxl/workbook/workbook.pyi b/stubs/openpyxl/openpyxl/workbook/workbook.pyi index 515010b243d0..6f9daec50e30 100644 --- a/stubs/openpyxl/openpyxl/workbook/workbook.pyi +++ b/stubs/openpyxl/openpyxl/workbook/workbook.pyi @@ -1,8 +1,7 @@ from _typeshed import Incomplete, Unused from collections.abc import Iterator from datetime import datetime -from typing import Any -from typing_extensions import Final +from typing import Any, Final from zipfile import ZipFile from openpyxl import _Decodable, _ZipFileFileProtocol diff --git a/stubs/openpyxl/openpyxl/worksheet/_reader.pyi b/stubs/openpyxl/openpyxl/worksheet/_reader.pyi index c5568abfdc85..604835921457 100644 --- a/stubs/openpyxl/openpyxl/worksheet/_reader.pyi +++ b/stubs/openpyxl/openpyxl/worksheet/_reader.pyi @@ -1,7 +1,7 @@ from _typeshed import Incomplete, SupportsGetItem, Unused from collections.abc import Container, Generator from datetime import datetime -from typing_extensions import Final +from typing import Final from xml.etree.ElementTree import _FileRead from openpyxl.cell.rich_text import CellRichText diff --git a/stubs/openpyxl/openpyxl/worksheet/cell_range.pyi b/stubs/openpyxl/openpyxl/worksheet/cell_range.pyi index edea01770f8b..9b2ca08e58c2 100644 --- a/stubs/openpyxl/openpyxl/worksheet/cell_range.pyi +++ b/stubs/openpyxl/openpyxl/worksheet/cell_range.pyi @@ -1,8 +1,7 @@ from _typeshed import ConvertibleToInt, Incomplete from collections.abc import Generator, Iterator from itertools import product -from typing import Any, overload -from typing_extensions import Literal +from typing import Any, Literal, overload from openpyxl.descriptors import Strict from openpyxl.descriptors.base import MinMax diff --git a/stubs/openpyxl/openpyxl/worksheet/cell_watch.pyi b/stubs/openpyxl/openpyxl/worksheet/cell_watch.pyi index d6d3c26b92db..5cece50ffa7c 100644 --- a/stubs/openpyxl/openpyxl/worksheet/cell_watch.pyi +++ b/stubs/openpyxl/openpyxl/worksheet/cell_watch.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from openpyxl.descriptors.base import String from openpyxl.descriptors.serialisable import Serialisable diff --git a/stubs/openpyxl/openpyxl/worksheet/controls.pyi b/stubs/openpyxl/openpyxl/worksheet/controls.pyi index 8eb3a05cbbf1..47480d501b85 100644 --- a/stubs/openpyxl/openpyxl/worksheet/controls.pyi +++ b/stubs/openpyxl/openpyxl/worksheet/controls.pyi @@ -1,6 +1,5 @@ from _typeshed import ConvertibleToInt, Incomplete -from typing import ClassVar, overload -from typing_extensions import Literal +from typing import ClassVar, Literal, overload from openpyxl.descriptors.base import Bool, Integer, String, Typed, _ConvertibleToBool from openpyxl.descriptors.serialisable import Serialisable diff --git a/stubs/openpyxl/openpyxl/worksheet/custom.pyi b/stubs/openpyxl/openpyxl/worksheet/custom.pyi index e395773bcebd..53d330806ca1 100644 --- a/stubs/openpyxl/openpyxl/worksheet/custom.pyi +++ b/stubs/openpyxl/openpyxl/worksheet/custom.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from openpyxl.descriptors.base import String from openpyxl.descriptors.serialisable import Serialisable diff --git a/stubs/openpyxl/openpyxl/worksheet/datavalidation.pyi b/stubs/openpyxl/openpyxl/worksheet/datavalidation.pyi index c0295ff453e2..cd44c40a183e 100644 --- a/stubs/openpyxl/openpyxl/worksheet/datavalidation.pyi +++ b/stubs/openpyxl/openpyxl/worksheet/datavalidation.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToInt, Incomplete -from typing import ClassVar, Protocol -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal, Protocol +from typing_extensions import TypeAlias from openpyxl.descriptors.base import ( Alias, diff --git a/stubs/openpyxl/openpyxl/worksheet/dimensions.pyi b/stubs/openpyxl/openpyxl/worksheet/dimensions.pyi index 442d8415d02b..27c71c274ced 100644 --- a/stubs/openpyxl/openpyxl/worksheet/dimensions.pyi +++ b/stubs/openpyxl/openpyxl/worksheet/dimensions.pyi @@ -1,7 +1,7 @@ from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete, Unused from collections.abc import Callable, Iterator -from typing import ClassVar, Generic, TypeVar -from typing_extensions import Literal, Self +from typing import ClassVar, Generic, Literal, TypeVar +from typing_extensions import Self from openpyxl.descriptors import Strict from openpyxl.descriptors.base import Alias, Bool, Float, Integer, String, _ConvertibleToBool diff --git a/stubs/openpyxl/openpyxl/worksheet/errors.pyi b/stubs/openpyxl/openpyxl/worksheet/errors.pyi index e5f790588203..41bd07af54b5 100644 --- a/stubs/openpyxl/openpyxl/worksheet/errors.pyi +++ b/stubs/openpyxl/openpyxl/worksheet/errors.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from openpyxl.descriptors.base import Bool, String, Typed, _ConvertibleToBool from openpyxl.descriptors.serialisable import Serialisable diff --git a/stubs/openpyxl/openpyxl/worksheet/filters.pyi b/stubs/openpyxl/openpyxl/worksheet/filters.pyi index 8af86e1471e0..a757630b6577 100644 --- a/stubs/openpyxl/openpyxl/worksheet/filters.pyi +++ b/stubs/openpyxl/openpyxl/worksheet/filters.pyi @@ -1,8 +1,8 @@ from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete, Unused from datetime import datetime from re import Pattern -from typing import ClassVar, overload -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal, overload +from typing_extensions import TypeAlias from openpyxl.descriptors import Strict from openpyxl.descriptors.base import ( diff --git a/stubs/openpyxl/openpyxl/worksheet/header_footer.pyi b/stubs/openpyxl/openpyxl/worksheet/header_footer.pyi index 567ff5f88f86..60936a73b7cd 100644 --- a/stubs/openpyxl/openpyxl/worksheet/header_footer.pyi +++ b/stubs/openpyxl/openpyxl/worksheet/header_footer.pyi @@ -1,7 +1,7 @@ from _typeshed import ConvertibleToInt from re import Pattern -from typing import ClassVar -from typing_extensions import Final, Literal, Self +from typing import ClassVar, Final, Literal +from typing_extensions import Self from openpyxl.descriptors import Strict from openpyxl.descriptors.base import Alias, Bool, Integer, MatchPattern, String, Typed, _ConvertibleToBool diff --git a/stubs/openpyxl/openpyxl/worksheet/hyperlink.pyi b/stubs/openpyxl/openpyxl/worksheet/hyperlink.pyi index 7281d4cd4348..03fa57ea752b 100644 --- a/stubs/openpyxl/openpyxl/worksheet/hyperlink.pyi +++ b/stubs/openpyxl/openpyxl/worksheet/hyperlink.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from openpyxl.descriptors.base import String from openpyxl.descriptors.serialisable import Serialisable diff --git a/stubs/openpyxl/openpyxl/worksheet/ole.pyi b/stubs/openpyxl/openpyxl/worksheet/ole.pyi index a5bf6fdad6d2..2b8d68e78de2 100644 --- a/stubs/openpyxl/openpyxl/worksheet/ole.pyi +++ b/stubs/openpyxl/openpyxl/worksheet/ole.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToInt, Incomplete -from typing import ClassVar, overload -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal, overload +from typing_extensions import TypeAlias from openpyxl.descriptors.base import Bool, Integer, Set, String, Typed, _ConvertibleToBool from openpyxl.descriptors.serialisable import Serialisable diff --git a/stubs/openpyxl/openpyxl/worksheet/page.pyi b/stubs/openpyxl/openpyxl/worksheet/page.pyi index d41ebead40b4..28368f924d41 100644 --- a/stubs/openpyxl/openpyxl/worksheet/page.pyi +++ b/stubs/openpyxl/openpyxl/worksheet/page.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete -from typing import ClassVar -from typing_extensions import Literal, Self, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import Self, TypeAlias from openpyxl.descriptors.base import Bool, Float, Integer, NoneSet, _ConvertibleToBool from openpyxl.descriptors.serialisable import Serialisable, _ChildSerialisableTreeElement diff --git a/stubs/openpyxl/openpyxl/worksheet/pagebreak.pyi b/stubs/openpyxl/openpyxl/worksheet/pagebreak.pyi index a4e76bc27713..47ff5d24e8da 100644 --- a/stubs/openpyxl/openpyxl/worksheet/pagebreak.pyi +++ b/stubs/openpyxl/openpyxl/worksheet/pagebreak.pyi @@ -1,6 +1,5 @@ from _typeshed import ConvertibleToInt, Incomplete, Unused -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from openpyxl.descriptors.base import Bool, Integer, _ConvertibleToBool from openpyxl.descriptors.serialisable import Serialisable diff --git a/stubs/openpyxl/openpyxl/worksheet/print_settings.pyi b/stubs/openpyxl/openpyxl/worksheet/print_settings.pyi index 2205b2c3dda2..2ceb189a3c45 100644 --- a/stubs/openpyxl/openpyxl/worksheet/print_settings.pyi +++ b/stubs/openpyxl/openpyxl/worksheet/print_settings.pyi @@ -1,7 +1,7 @@ from _typeshed import ConvertibleToInt, Incomplete, Unused from re import Pattern -from typing import overload -from typing_extensions import Final, Literal, Self +from typing import Final, Literal, overload +from typing_extensions import Self from openpyxl.descriptors import Integer, Strict, String from openpyxl.descriptors.base import Typed diff --git a/stubs/openpyxl/openpyxl/worksheet/properties.pyi b/stubs/openpyxl/openpyxl/worksheet/properties.pyi index 3a2195906e8a..ff31bb890d13 100644 --- a/stubs/openpyxl/openpyxl/worksheet/properties.pyi +++ b/stubs/openpyxl/openpyxl/worksheet/properties.pyi @@ -1,5 +1,4 @@ -from typing import ClassVar -from typing_extensions import Literal +from typing import ClassVar, Literal from openpyxl.descriptors.base import Bool, String, Typed, _ConvertibleToBool from openpyxl.descriptors.serialisable import Serialisable diff --git a/stubs/openpyxl/openpyxl/worksheet/protection.pyi b/stubs/openpyxl/openpyxl/worksheet/protection.pyi index da544224f2a2..285576f3219f 100644 --- a/stubs/openpyxl/openpyxl/worksheet/protection.pyi +++ b/stubs/openpyxl/openpyxl/worksheet/protection.pyi @@ -1,6 +1,5 @@ from _typeshed import ConvertibleToInt, Incomplete -from typing import ClassVar, overload -from typing_extensions import Literal +from typing import ClassVar, Literal, overload from openpyxl.descriptors.base import Alias, Bool, Integer, String, _ConvertibleToBool from openpyxl.descriptors.serialisable import Serialisable diff --git a/stubs/openpyxl/openpyxl/worksheet/scenario.pyi b/stubs/openpyxl/openpyxl/worksheet/scenario.pyi index bf2bbdf816f9..976054fe1b44 100644 --- a/stubs/openpyxl/openpyxl/worksheet/scenario.pyi +++ b/stubs/openpyxl/openpyxl/worksheet/scenario.pyi @@ -1,6 +1,5 @@ from _typeshed import ConvertibleToInt, Incomplete, Unused -from typing import ClassVar, overload -from typing_extensions import Literal +from typing import ClassVar, Literal, overload from openpyxl.descriptors.base import Bool, Convertible, Integer, String, _ConvertibleToBool, _ConvertibleToMultiCellRange from openpyxl.descriptors.serialisable import Serialisable diff --git a/stubs/openpyxl/openpyxl/worksheet/smart_tag.pyi b/stubs/openpyxl/openpyxl/worksheet/smart_tag.pyi index 51c109d1dbd5..bcea5f9dfe3c 100644 --- a/stubs/openpyxl/openpyxl/worksheet/smart_tag.pyi +++ b/stubs/openpyxl/openpyxl/worksheet/smart_tag.pyi @@ -1,6 +1,5 @@ from _typeshed import ConvertibleToInt, Incomplete -from typing import ClassVar, overload -from typing_extensions import Literal +from typing import ClassVar, Literal, overload from openpyxl.descriptors.base import Bool, Integer, String, _ConvertibleToBool from openpyxl.descriptors.serialisable import Serialisable diff --git a/stubs/openpyxl/openpyxl/worksheet/table.pyi b/stubs/openpyxl/openpyxl/worksheet/table.pyi index 367ac22e6759..a4808c85f04e 100644 --- a/stubs/openpyxl/openpyxl/worksheet/table.pyi +++ b/stubs/openpyxl/openpyxl/worksheet/table.pyi @@ -1,7 +1,7 @@ from _typeshed import ConvertibleToInt, Incomplete, Unused from collections.abc import Iterator -from typing import ClassVar, overload -from typing_extensions import Final, Literal, Self, TypeAlias +from typing import ClassVar, Final, Literal, overload +from typing_extensions import Self, TypeAlias from openpyxl.descriptors import Strict, String from openpyxl.descriptors.base import Alias, Bool, Integer, NoneSet, Typed, _ConvertibleToBool diff --git a/stubs/openpyxl/openpyxl/worksheet/views.pyi b/stubs/openpyxl/openpyxl/worksheet/views.pyi index f2b8537026f8..0663b9ea4637 100644 --- a/stubs/openpyxl/openpyxl/worksheet/views.pyi +++ b/stubs/openpyxl/openpyxl/worksheet/views.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete, Unused -from typing import ClassVar -from typing_extensions import Literal, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import TypeAlias from openpyxl.descriptors.base import Bool, Float, Integer, NoneSet, Set, String, Typed, _ConvertibleToBool from openpyxl.descriptors.excel import ExtensionList diff --git a/stubs/openpyxl/openpyxl/worksheet/worksheet.pyi b/stubs/openpyxl/openpyxl/worksheet/worksheet.pyi index 6964d601883a..d9a2b4a95948 100644 --- a/stubs/openpyxl/openpyxl/worksheet/worksheet.pyi +++ b/stubs/openpyxl/openpyxl/worksheet/worksheet.pyi @@ -2,8 +2,7 @@ from _typeshed import ConvertibleToInt, Incomplete from collections.abc import Generator, Iterable, Iterator from datetime import datetime from types import GeneratorType -from typing import Any, NoReturn, overload -from typing_extensions import Final, Literal +from typing import Any, Final, Literal, NoReturn, overload from openpyxl import _Decodable, _VisibilityType from openpyxl.cell import _CellValue diff --git a/stubs/openpyxl/openpyxl/writer/excel.pyi b/stubs/openpyxl/openpyxl/writer/excel.pyi index 059baeb022e7..3d8ab5354747 100644 --- a/stubs/openpyxl/openpyxl/writer/excel.pyi +++ b/stubs/openpyxl/openpyxl/writer/excel.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Literal +from typing import Literal from zipfile import ZipFile from openpyxl import _ZipFileFileProtocol diff --git a/stubs/openpyxl/openpyxl/xml/__init__.pyi b/stubs/openpyxl/openpyxl/xml/__init__.pyi index df18f5d1ff9d..f3d56263e6ee 100644 --- a/stubs/openpyxl/openpyxl/xml/__init__.pyi +++ b/stubs/openpyxl/openpyxl/xml/__init__.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final def lxml_available() -> bool: ... def lxml_env_set() -> bool: ... diff --git a/stubs/openpyxl/openpyxl/xml/constants.pyi b/stubs/openpyxl/openpyxl/xml/constants.pyi index 0903b9c24f93..1c5a15bb8fd7 100644 --- a/stubs/openpyxl/openpyxl/xml/constants.pyi +++ b/stubs/openpyxl/openpyxl/xml/constants.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final MIN_ROW: Final = 0 MIN_COLUMN: Final = 0 diff --git a/stubs/openpyxl/openpyxl/xml/functions.pyi b/stubs/openpyxl/openpyxl/xml/functions.pyi index 8b6089eb9734..3c299029b4e6 100644 --- a/stubs/openpyxl/openpyxl/xml/functions.pyi +++ b/stubs/openpyxl/openpyxl/xml/functions.pyi @@ -1,6 +1,6 @@ from _typeshed import Incomplete from re import Pattern -from typing_extensions import Final +from typing import Final # Can actually be imported from a mix of xml, lxml, et_xmlfile as defusedxml # But et_xmlfile is untyped. openpyxl does not directly depend on lxml/lxml-stubs. diff --git a/stubs/paho-mqtt/paho/mqtt/publish.pyi b/stubs/paho-mqtt/paho/mqtt/publish.pyi index aeb033d3cfb7..581408f7c1df 100644 --- a/stubs/paho-mqtt/paho/mqtt/publish.pyi +++ b/stubs/paho-mqtt/paho/mqtt/publish.pyi @@ -1,6 +1,7 @@ import ssl from collections.abc import Iterable -from typing_extensions import NotRequired, TypeAlias, TypedDict +from typing import TypedDict +from typing_extensions import NotRequired, TypeAlias _Payload: TypeAlias = str | bytes | bytearray | float diff --git a/stubs/paho-mqtt/paho/mqtt/subscribeoptions.pyi b/stubs/paho-mqtt/paho/mqtt/subscribeoptions.pyi index 9356f791133a..6ca40acdde18 100644 --- a/stubs/paho-mqtt/paho/mqtt/subscribeoptions.pyi +++ b/stubs/paho-mqtt/paho/mqtt/subscribeoptions.pyi @@ -1,5 +1,4 @@ -from typing import Any -from typing_extensions import TypedDict +from typing import Any, TypedDict from . import MQTTException as MQTTException diff --git a/stubs/paramiko/paramiko/channel.pyi b/stubs/paramiko/paramiko/channel.pyi index 6b5a3664f7fc..0d8482db0556 100644 --- a/stubs/paramiko/paramiko/channel.pyi +++ b/stubs/paramiko/paramiko/channel.pyi @@ -2,8 +2,7 @@ from _typeshed import SupportsItems from collections.abc import Callable from logging import Logger from threading import Condition, Event, Lock -from typing import Any, TypeVar -from typing_extensions import Literal +from typing import Any, Literal, TypeVar from paramiko.buffered_pipe import BufferedPipe from paramiko.file import BufferedFile diff --git a/stubs/paramiko/paramiko/win_pageant.pyi b/stubs/paramiko/paramiko/win_pageant.pyi index 9c8dba685d51..5fdf8e41602e 100644 --- a/stubs/paramiko/paramiko/win_pageant.pyi +++ b/stubs/paramiko/paramiko/win_pageant.pyi @@ -1,6 +1,7 @@ import ctypes import sys -from typing_extensions import Literal, TypeAlias +from typing import Literal +from typing_extensions import TypeAlias if sys.platform == "win32": win32con_WM_COPYDATA: int diff --git a/stubs/passlib/passlib/ifc.pyi b/stubs/passlib/passlib/ifc.pyi index 64aa0575596f..b91cb6993afa 100644 --- a/stubs/passlib/passlib/ifc.pyi +++ b/stubs/passlib/passlib/ifc.pyi @@ -1,6 +1,6 @@ from abc import ABCMeta, abstractmethod -from typing import Any, ClassVar -from typing_extensions import Literal, Self +from typing import Any, ClassVar, Literal +from typing_extensions import Self class PasswordHash(metaclass=ABCMeta): is_disabled: ClassVar[bool] diff --git a/stubs/passlib/passlib/utils/compat/__init__.pyi b/stubs/passlib/passlib/utils/compat/__init__.pyi index 808c7f8d9f4c..591083c8a8dd 100644 --- a/stubs/passlib/passlib/utils/compat/__init__.pyi +++ b/stubs/passlib/passlib/utils/compat/__init__.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Literal +from typing import Literal PY2: Literal[False] PY3: Literal[True] diff --git a/stubs/pika/pika/channel.pyi b/stubs/pika/pika/channel.pyi index 8947c91a32eb..c0252bbb65a8 100644 --- a/stubs/pika/pika/channel.pyi +++ b/stubs/pika/pika/channel.pyi @@ -1,8 +1,8 @@ from _typeshed import Incomplete from collections.abc import Callable from logging import Logger -from typing import Any -from typing_extensions import Final, Self +from typing import Any, Final +from typing_extensions import Self from .callback import CallbackManager from .connection import Connection diff --git a/stubs/pika/pika/compat.pyi b/stubs/pika/pika/compat.pyi index de6dd8e9deb5..f1ee28d7bd9a 100644 --- a/stubs/pika/pika/compat.pyi +++ b/stubs/pika/pika/compat.pyi @@ -2,8 +2,8 @@ from abc import ABCMeta from collections.abc import ItemsView, Mapping, ValuesView from io import StringIO as StringIO from re import Pattern -from typing import Any, TypeVar -from typing_extensions import Final, Literal, SupportsIndex, TypeGuard +from typing import Any, Final, Literal, SupportsIndex, TypeVar +from typing_extensions import TypeGuard from urllib.parse import parse_qs, quote, unquote, urlencode as urlencode, urlparse as urlparse _KT = TypeVar("_KT") diff --git a/stubs/pika/pika/connection.pyi b/stubs/pika/pika/connection.pyi index 889e667b1dff..9e620e25ca19 100644 --- a/stubs/pika/pika/connection.pyi +++ b/stubs/pika/pika/connection.pyi @@ -2,7 +2,8 @@ import abc from _typeshed import Incomplete from collections.abc import Callable from logging import Logger -from typing_extensions import Final, Self +from typing import Final +from typing_extensions import Self from .callback import CallbackManager from .channel import Channel diff --git a/stubs/pika/pika/spec.pyi b/stubs/pika/pika/spec.pyi index 303743359fcb..caf0626be24c 100644 --- a/stubs/pika/pika/spec.pyi +++ b/stubs/pika/pika/spec.pyi @@ -1,7 +1,7 @@ import builtins from _typeshed import Incomplete -from typing import ClassVar -from typing_extensions import Literal, Self, TypeAlias +from typing import ClassVar, Literal +from typing_extensions import Self, TypeAlias from .amqp_object import Class, Method, Properties diff --git a/stubs/pluggy/pluggy/_hooks.pyi b/stubs/pluggy/pluggy/_hooks.pyi index 5d8596a06ee5..14f8e30b4faa 100644 --- a/stubs/pluggy/pluggy/_hooks.pyi +++ b/stubs/pluggy/pluggy/_hooks.pyi @@ -1,7 +1,7 @@ from collections.abc import Callable, Generator, Mapping, Sequence from types import ModuleType -from typing import Any, TypeVar, overload -from typing_extensions import TypeAlias, TypedDict +from typing import Any, TypedDict, TypeVar, overload +from typing_extensions import TypeAlias from ._result import _Result diff --git a/stubs/polib/polib.pyi b/stubs/polib/polib.pyi index 03a0338b42f7..cb6da5c09f99 100644 --- a/stubs/polib/polib.pyi +++ b/stubs/polib/polib.pyi @@ -1,6 +1,5 @@ from collections.abc import Callable -from typing import IO, Any, Generic, TypeVar, overload -from typing_extensions import SupportsIndex +from typing import IO, Any, Generic, SupportsIndex, TypeVar, overload _TB = TypeVar("_TB", bound=_BaseEntry) _TP = TypeVar("_TP", bound=POFile) diff --git a/stubs/protobuf/google/protobuf/internal/containers.pyi b/stubs/protobuf/google/protobuf/internal/containers.pyi index 044cd65dc02b..6b0227059ec4 100644 --- a/stubs/protobuf/google/protobuf/internal/containers.pyi +++ b/stubs/protobuf/google/protobuf/internal/containers.pyi @@ -1,6 +1,5 @@ from collections.abc import Callable, Iterable, Iterator, MutableMapping, Sequence -from typing import Any, TypeVar, overload -from typing_extensions import SupportsIndex +from typing import Any, SupportsIndex, TypeVar, overload from google.protobuf.descriptor import Descriptor from google.protobuf.internal.message_listener import MessageListener diff --git a/stubs/psutil/psutil/__init__.pyi b/stubs/psutil/psutil/__init__.pyi index f989270ad5f7..196066879415 100644 --- a/stubs/psutil/psutil/__init__.pyi +++ b/stubs/psutil/psutil/__init__.pyi @@ -2,8 +2,8 @@ import sys from _typeshed import Incomplete from collections.abc import Callable, Iterable, Iterator from contextlib import AbstractContextManager -from typing import Any, overload -from typing_extensions import Literal, Self, TypeAlias +from typing import Any, Literal, overload +from typing_extensions import Self, TypeAlias from psutil._common import ( AIX as AIX, diff --git a/stubs/psutil/psutil/_common.pyi b/stubs/psutil/psutil/_common.pyi index 46fba3619552..771525faba86 100644 --- a/stubs/psutil/psutil/_common.pyi +++ b/stubs/psutil/psutil/_common.pyi @@ -2,8 +2,7 @@ import enum from _typeshed import Incomplete, StrOrBytesPath, SupportsWrite from collections.abc import Callable from socket import AF_INET6 as AF_INET6, AddressFamily, SocketKind -from typing import Any, NamedTuple, TypeVar, overload -from typing_extensions import Literal +from typing import Any, Literal, NamedTuple, TypeVar, overload POSIX: bool WINDOWS: bool diff --git a/stubs/psutil/psutil/_compat.pyi b/stubs/psutil/psutil/_compat.pyi index 410a291fb3e7..c1adc4c40b2d 100644 --- a/stubs/psutil/psutil/_compat.pyi +++ b/stubs/psutil/psutil/_compat.pyi @@ -1,18 +1,17 @@ -from builtins import ( - ChildProcessError as ChildProcessError, - FileExistsError as FileExistsError, - FileNotFoundError as FileNotFoundError, - InterruptedError as InterruptedError, - PermissionError as PermissionError, - ProcessLookupError as ProcessLookupError, - range as range, - super as super, -) +from builtins import ChildProcessError as ChildProcessError +from builtins import FileExistsError as FileExistsError +from builtins import FileNotFoundError as FileNotFoundError +from builtins import InterruptedError as InterruptedError +from builtins import PermissionError as PermissionError +from builtins import ProcessLookupError as ProcessLookupError +from builtins import range as range +from builtins import super as super from contextlib import redirect_stderr as redirect_stderr from functools import lru_cache as lru_cache -from shutil import get_terminal_size as get_terminal_size, which as which +from shutil import get_terminal_size as get_terminal_size +from shutil import which as which from subprocess import TimeoutExpired -from typing_extensions import Literal +from typing import Literal PY3: Literal[True] long = int diff --git a/stubs/psycopg2/psycopg2/_psycopg.pyi b/stubs/psycopg2/psycopg2/_psycopg.pyi index fa688be63b0a..58b2db415a54 100644 --- a/stubs/psycopg2/psycopg2/_psycopg.pyi +++ b/stubs/psycopg2/psycopg2/_psycopg.pyi @@ -2,8 +2,8 @@ import datetime as dt from _typeshed import ConvertibleToInt, Incomplete, SupportsRead, SupportsReadline, SupportsWrite, Unused from collections.abc import Callable, Iterable, Mapping, Sequence from types import TracebackType -from typing import Any, NoReturn, Protocol, TypeVar, overload, type_check_only -from typing_extensions import Literal, Self, TypeAlias +from typing import Any, Literal, NoReturn, Protocol, TypeVar, overload, type_check_only +from typing_extensions import Self, TypeAlias from psycopg2.sql import Composable diff --git a/stubs/pyOpenSSL/OpenSSL/rand.pyi b/stubs/pyOpenSSL/OpenSSL/rand.pyi index 30a76ee77711..488966641169 100644 --- a/stubs/pyOpenSSL/OpenSSL/rand.pyi +++ b/stubs/pyOpenSSL/OpenSSL/rand.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Literal +from typing import Literal def add(buffer: bytes, entropy: int) -> None: ... def status() -> Literal[0, 1]: ... diff --git a/stubs/pyasn1/pyasn1/__init__.pyi b/stubs/pyasn1/pyasn1/__init__.pyi index a578d2b81556..c5dd95466063 100644 --- a/stubs/pyasn1/pyasn1/__init__.pyi +++ b/stubs/pyasn1/pyasn1/__init__.pyi @@ -1,3 +1,3 @@ -from typing_extensions import Final +from typing import Final __version__: Final[str] diff --git a/stubs/pyasn1/pyasn1/compat/integer.pyi b/stubs/pyasn1/pyasn1/compat/integer.pyi index b4f9c80ed742..334f28467986 100644 --- a/stubs/pyasn1/pyasn1/compat/integer.pyi +++ b/stubs/pyasn1/pyasn1/compat/integer.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Literal +from typing import Literal implementation: str null: Literal[b""] diff --git a/stubs/pyasn1/pyasn1/compat/octets.pyi b/stubs/pyasn1/pyasn1/compat/octets.pyi index a5ad961dd450..162d786b195e 100644 --- a/stubs/pyasn1/pyasn1/compat/octets.pyi +++ b/stubs/pyasn1/pyasn1/compat/octets.pyi @@ -1,5 +1,4 @@ -from typing import TypeVar -from typing_extensions import Literal +from typing import Literal, TypeVar _T = TypeVar("_T") diff --git a/stubs/pyasn1/pyasn1/type/base.pyi b/stubs/pyasn1/pyasn1/type/base.pyi index a5f60f50e57d..4830d2b64481 100644 --- a/stubs/pyasn1/pyasn1/type/base.pyi +++ b/stubs/pyasn1/pyasn1/type/base.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete, Unused -from typing import NoReturn, type_check_only -from typing_extensions import final +from typing import NoReturn, final, type_check_only from pyasn1.type import constraint, namedtype from pyasn1.type.tag import TagSet diff --git a/stubs/pyaudio/pyaudio.pyi b/stubs/pyaudio/pyaudio.pyi index b7a57cee461c..214688981ab6 100644 --- a/stubs/pyaudio/pyaudio.pyi +++ b/stubs/pyaudio/pyaudio.pyi @@ -1,7 +1,7 @@ import sys from collections.abc import Callable, Mapping, Sequence -from typing import ClassVar -from typing_extensions import Final, TypeAlias +from typing import ClassVar, Final +from typing_extensions import TypeAlias __docformat__: str diff --git a/stubs/pycocotools/pycocotools/__init__.pyi b/stubs/pycocotools/pycocotools/__init__.pyi index f8b7a404eceb..04adef9dad84 100644 --- a/stubs/pycocotools/pycocotools/__init__.pyi +++ b/stubs/pycocotools/pycocotools/__init__.pyi @@ -1,4 +1,4 @@ -from typing_extensions import TypedDict +from typing import TypedDict # Unused in this module, but imported in multiple submodules. class _EncodedRLE(TypedDict): # noqa: Y049 diff --git a/stubs/pycocotools/pycocotools/coco.pyi b/stubs/pycocotools/pycocotools/coco.pyi index 50e5bebce42c..3cac74aeda72 100644 --- a/stubs/pycocotools/pycocotools/coco.pyi +++ b/stubs/pycocotools/pycocotools/coco.pyi @@ -1,8 +1,8 @@ from _typeshed import Incomplete from collections.abc import Collection, Sequence from pathlib import Path -from typing import Generic, TypeVar, overload -from typing_extensions import Literal, TypeAlias, TypedDict +from typing import Generic, Literal, TypedDict, TypeVar, overload +from typing_extensions import TypeAlias from . import _EncodedRLE diff --git a/stubs/pycocotools/pycocotools/cocoeval.pyi b/stubs/pycocotools/pycocotools/cocoeval.pyi index 366f2138edc3..5dedb9bf1aea 100644 --- a/stubs/pycocotools/pycocotools/cocoeval.pyi +++ b/stubs/pycocotools/pycocotools/cocoeval.pyi @@ -1,5 +1,6 @@ from _typeshed import Incomplete -from typing_extensions import Literal, TypeAlias, TypedDict +from typing import Literal, TypedDict +from typing_extensions import TypeAlias from .coco import COCO diff --git a/stubs/pycurl/pycurl.pyi b/stubs/pycurl/pycurl.pyi index 1fa0ce48edb6..50e5ccb89f40 100644 --- a/stubs/pycurl/pycurl.pyi +++ b/stubs/pycurl/pycurl.pyi @@ -1,6 +1,7 @@ import sys from _typeshed import Incomplete -from typing_extensions import Self, final +from typing import final +from typing_extensions import Self version: str diff --git a/stubs/pyflakes/pyflakes/checker.pyi b/stubs/pyflakes/pyflakes/checker.pyi index b861c7c6cd20..4a18d8d70327 100644 --- a/stubs/pyflakes/pyflakes/checker.pyi +++ b/stubs/pyflakes/pyflakes/checker.pyi @@ -3,8 +3,8 @@ import sys from collections.abc import Callable, Iterable, Iterator from contextlib import contextmanager from re import Pattern -from typing import Any, ClassVar, TypeVar, overload -from typing_extensions import Literal, ParamSpec, TypeAlias +from typing import Any, ClassVar, Literal, TypeVar, overload +from typing_extensions import ParamSpec, TypeAlias from pyflakes.messages import Message diff --git a/stubs/pyinstaller/PyInstaller/__init__.pyi b/stubs/pyinstaller/PyInstaller/__init__.pyi index fc98d648b295..a36cbd690d8b 100644 --- a/stubs/pyinstaller/PyInstaller/__init__.pyi +++ b/stubs/pyinstaller/PyInstaller/__init__.pyi @@ -1,4 +1,5 @@ -from typing_extensions import Final, LiteralString +from typing import Final +from typing_extensions import LiteralString from PyInstaller import compat as compat diff --git a/stubs/pyinstaller/PyInstaller/building/api.pyi b/stubs/pyinstaller/PyInstaller/building/api.pyi index afc53a69b635..69573a78a66a 100644 --- a/stubs/pyinstaller/PyInstaller/building/api.pyi +++ b/stubs/pyinstaller/PyInstaller/building/api.pyi @@ -6,8 +6,8 @@ import sys from _typeshed import FileDescriptorOrPath, StrOrBytesPath, StrPath, Unused from collections.abc import Iterable, Mapping, Sequence from types import CodeType -from typing import ClassVar -from typing_extensions import Final, Literal, TypeAlias +from typing import ClassVar, Final, Literal +from typing_extensions import TypeAlias from PyInstaller.building import _PyiBlockCipher from PyInstaller.building.build_main import Analysis diff --git a/stubs/pyinstaller/PyInstaller/building/datastruct.pyi b/stubs/pyinstaller/PyInstaller/building/datastruct.pyi index 8db3cd5e7eb4..cfb1cf70b6d3 100644 --- a/stubs/pyinstaller/PyInstaller/building/datastruct.pyi +++ b/stubs/pyinstaller/PyInstaller/building/datastruct.pyi @@ -1,7 +1,7 @@ # https://pyinstaller.org/en/stable/advanced-topics.html#the-toc-and-tree-classes from collections.abc import Iterable, Sequence -from typing import ClassVar -from typing_extensions import Literal, LiteralString, Self, SupportsIndex, TypeAlias +from typing import ClassVar, Literal, SupportsIndex +from typing_extensions import LiteralString, Self, TypeAlias _TypeCode: TypeAlias = Literal["DEPENDENCY", "SYMLINK", "DATA", "BINARY", "EXECUTABLE", "EXTENSION", "OPTION"] _TOCTuple: TypeAlias = tuple[str, str | None, _TypeCode | None] diff --git a/stubs/pyinstaller/PyInstaller/compat.pyi b/stubs/pyinstaller/PyInstaller/compat.pyi index 092a5f02e4e5..4dd0a4f10ca0 100644 --- a/stubs/pyinstaller/PyInstaller/compat.pyi +++ b/stubs/pyinstaller/PyInstaller/compat.pyi @@ -2,8 +2,7 @@ from _typeshed import FileDescriptorOrPath, GenericPath from collections.abc import Iterable from types import ModuleType -from typing import AnyStr, overload -from typing_extensions import Final, Literal +from typing import AnyStr, Final, Literal, overload strict_collect_mode: bool is_64bits: Final[bool] diff --git a/stubs/pyinstaller/PyInstaller/depend/imphookapi.pyi b/stubs/pyinstaller/PyInstaller/depend/imphookapi.pyi index 38d1720fef82..545827bedb26 100644 --- a/stubs/pyinstaller/PyInstaller/depend/imphookapi.pyi +++ b/stubs/pyinstaller/PyInstaller/depend/imphookapi.pyi @@ -2,11 +2,11 @@ # Nothing in this module is meant to be initialized externally. # Instances are exposed through hooks during build. -from _typeshed import StrOrBytesPath from collections.abc import Generator, Iterable from types import CodeType -from typing_extensions import Literal +from typing import Literal +from _typeshed import StrOrBytesPath from PyInstaller.building.build_main import Analysis from PyInstaller.building.datastruct import TOC from PyInstaller.depend.analysis import PyiModuleGraph diff --git a/stubs/pyinstaller/PyInstaller/utils/hooks/__init__.pyi b/stubs/pyinstaller/PyInstaller/utils/hooks/__init__.pyi index b243635814a0..6d331d9140dd 100644 --- a/stubs/pyinstaller/PyInstaller/utils/hooks/__init__.pyi +++ b/stubs/pyinstaller/PyInstaller/utils/hooks/__init__.pyi @@ -2,8 +2,7 @@ from _typeshed import StrOrBytesPath, StrPath from collections.abc import Callable, Iterable -from typing import Any -from typing_extensions import Final, Literal +from typing import Any, Final, Literal from PyInstaller import HOMEPATH as HOMEPATH from PyInstaller.depend.imphookapi import PostGraphAPI diff --git a/stubs/pyinstaller/PyInstaller/utils/hooks/conda.pyi b/stubs/pyinstaller/PyInstaller/utils/hooks/conda.pyi index 97f4bff3306e..26878976bdaa 100644 --- a/stubs/pyinstaller/PyInstaller/utils/hooks/conda.pyi +++ b/stubs/pyinstaller/PyInstaller/utils/hooks/conda.pyi @@ -4,7 +4,7 @@ from _typeshed import StrOrBytesPath from collections.abc import Iterable from importlib.metadata import PackagePath as _PackagePath from pathlib import Path -from typing_extensions import Final, TypedDict +from typing import Final, TypedDict CONDA_ROOT: Final[Path] CONDA_META_DIR: Final[Path] diff --git a/stubs/pyinstaller/PyInstaller/utils/win32/versioninfo.pyi b/stubs/pyinstaller/PyInstaller/utils/win32/versioninfo.pyi index 9335887650d4..8a88f17fd14e 100644 --- a/stubs/pyinstaller/PyInstaller/utils/win32/versioninfo.pyi +++ b/stubs/pyinstaller/PyInstaller/utils/win32/versioninfo.pyi @@ -1,7 +1,7 @@ from _typeshed import SliceableBuffer from collections.abc import Sequence -from typing import Protocol -from typing_extensions import Literal, TypeAlias +from typing import Literal, Protocol +from typing_extensions import TypeAlias _FourIntSequence: TypeAlias = Sequence[int] _TwoIntSequence: TypeAlias = Sequence[int] diff --git a/stubs/pyinstaller/pyi_splash/__init__.pyi b/stubs/pyinstaller/pyi_splash/__init__.pyi index 18a31687e174..f2e324d4d7ed 100644 --- a/stubs/pyinstaller/pyi_splash/__init__.pyi +++ b/stubs/pyinstaller/pyi_splash/__init__.pyi @@ -1,6 +1,7 @@ # Referenced in: https://pyinstaller.org/en/stable/advanced-topics.html#module-pyi_splash # Source: https://github.com/pyinstaller/pyinstaller/blob/develop/PyInstaller/fake-modules/pyi_splash.py -from typing_extensions import Final + +from typing import Final __all__ = ["CLOSE_CONNECTION", "FLUSH_CHARACTER", "is_alive", "close", "update_text"] diff --git a/stubs/pyjks/jks/bks.pyi b/stubs/pyjks/jks/bks.pyi index 3d01f4a7bc2a..0e12e65376ef 100644 --- a/stubs/pyjks/jks/bks.pyi +++ b/stubs/pyjks/jks/bks.pyi @@ -1,5 +1,6 @@ from _typeshed import SupportsKeysAndGetItem, Unused -from typing_extensions import Final, Literal, Self, TypeAlias +from typing import Final, Literal +from typing_extensions import Self, TypeAlias from .jks import TrustedCertEntry from .util import AbstractKeystore, AbstractKeystoreEntry diff --git a/stubs/pyjks/jks/jks.pyi b/stubs/pyjks/jks/jks.pyi index 1275b7fa2c58..9c816cc7bf74 100644 --- a/stubs/pyjks/jks/jks.pyi +++ b/stubs/pyjks/jks/jks.pyi @@ -1,7 +1,7 @@ from _typeshed import SupportsKeysAndGetItem, Unused from collections.abc import Iterable -from typing import NoReturn, overload -from typing_extensions import Final, Literal, Self, TypeAlias +from typing import Final, Literal, NoReturn, overload +from typing_extensions import Self, TypeAlias from .util import AbstractKeystore, AbstractKeystoreEntry diff --git a/stubs/pyjks/jks/rfc7292.pyi b/stubs/pyjks/jks/rfc7292.pyi index a411e794e9c2..b57599fc38da 100644 --- a/stubs/pyjks/jks/rfc7292.pyi +++ b/stubs/pyjks/jks/rfc7292.pyi @@ -1,5 +1,6 @@ from hashlib import _Hash -from typing_extensions import Final, Literal, TypeAlias +from typing import Final, Literal +from typing_extensions import TypeAlias from pyasn1.type.namedtype import NamedTypes from pyasn1.type.univ import Sequence diff --git a/stubs/pyjks/jks/sun_crypto.pyi b/stubs/pyjks/jks/sun_crypto.pyi index 822892b551bb..94ae49d4b828 100644 --- a/stubs/pyjks/jks/sun_crypto.pyi +++ b/stubs/pyjks/jks/sun_crypto.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final SUN_JKS_ALGO_ID: Final[tuple[int, ...]] SUN_JCE_ALGO_ID: Final[tuple[int, ...]] diff --git a/stubs/pyjks/jks/util.pyi b/stubs/pyjks/jks/util.pyi index 2eff180d2c9f..84f576dce440 100644 --- a/stubs/pyjks/jks/util.pyi +++ b/stubs/pyjks/jks/util.pyi @@ -1,7 +1,8 @@ from _typeshed import FileDescriptorOrPath, SupportsKeysAndGetItem, Unused from collections.abc import Iterable from struct import Struct -from typing_extensions import Final, Literal, Self, TypeAlias +from typing import Final, Literal +from typing_extensions import Self, TypeAlias from .bks import BksKeyEntry from .jks import PrivateKeyEntry diff --git a/stubs/pynput/pynput/_util.pyi b/stubs/pynput/pynput/_util.pyi index 5d0e9d665dab..85ee71e92367 100644 --- a/stubs/pynput/pynput/_util.pyi +++ b/stubs/pynput/pynput/_util.pyi @@ -3,8 +3,8 @@ import threading from collections.abc import Callable from queue import Queue from types import ModuleType, TracebackType -from typing import Any, ClassVar, Generic, TypeVar -from typing_extensions import ParamSpec, Self, TypedDict +from typing import Any, ClassVar, Generic, TypedDict, TypeVar +from typing_extensions import ParamSpec, Self _T = TypeVar("_T") _AbstractListener_T = TypeVar("_AbstractListener_T", bound=AbstractListener) diff --git a/stubs/pyserial/serial/serialutil.pyi b/stubs/pyserial/serial/serialutil.pyi index c914c8e62303..381dbc178647 100644 --- a/stubs/pyserial/serial/serialutil.pyi +++ b/stubs/pyserial/serial/serialutil.pyi @@ -2,8 +2,7 @@ import io from _typeshed import ReadableBuffer, WriteableBuffer from abc import abstractmethod from collections.abc import Callable, Generator -from typing import Any -from typing_extensions import Final +from typing import Any, Final from serial.rs485 import RS485Settings diff --git a/stubs/pysftp/pysftp/__init__.pyi b/stubs/pysftp/pysftp/__init__.pyi index e4606f6f73bc..ec68da0741aa 100644 --- a/stubs/pysftp/pysftp/__init__.pyi +++ b/stubs/pysftp/pysftp/__init__.pyi @@ -2,8 +2,8 @@ from collections.abc import Callable, Sequence from contextlib import AbstractContextManager from stat import S_IMODE as S_IMODE from types import TracebackType -from typing import IO -from typing_extensions import Literal, Self, TypeAlias +from typing import IO, Literal +from typing_extensions import Self, TypeAlias import paramiko from paramiko import AuthenticationException as AuthenticationException diff --git a/stubs/python-crontab/crontab.pyi b/stubs/python-crontab/crontab.pyi index edf4ebf300ff..208bcfc89414 100644 --- a/stubs/python-crontab/crontab.pyi +++ b/stubs/python-crontab/crontab.pyi @@ -7,8 +7,8 @@ from collections.abc import Callable, Generator, Iterable, Iterator from datetime import datetime from logging import Logger from types import TracebackType -from typing import Any, overload -from typing_extensions import Self, SupportsIndex, TypeAlias +from typing import Any, SupportsIndex, overload +from typing_extensions import Self, TypeAlias from cronlog import CronLog diff --git a/stubs/python-dateutil/dateutil/easter.pyi b/stubs/python-dateutil/dateutil/easter.pyi index 1d041e9e4187..952d119142e5 100644 --- a/stubs/python-dateutil/dateutil/easter.pyi +++ b/stubs/python-dateutil/dateutil/easter.pyi @@ -1,5 +1,5 @@ from datetime import date -from typing_extensions import Literal +from typing import Literal EASTER_JULIAN: Literal[1] EASTER_ORTHODOX: Literal[2] diff --git a/stubs/python-dateutil/dateutil/tz/tz.pyi b/stubs/python-dateutil/dateutil/tz/tz.pyi index 89f55651c55d..054378b29677 100644 --- a/stubs/python-dateutil/dateutil/tz/tz.pyi +++ b/stubs/python-dateutil/dateutil/tz/tz.pyi @@ -1,7 +1,6 @@ import datetime from _typeshed import Incomplete -from typing import ClassVar, Protocol, TypeVar -from typing_extensions import Literal +from typing import ClassVar, Literal, Protocol, TypeVar from ..relativedelta import relativedelta from ._common import _tzinfo as _tzinfo, enfold as enfold, tzname_in_python2 as tzname_in_python2, tzrangebase as tzrangebase diff --git a/stubs/python-jose/jose/jwk.pyi b/stubs/python-jose/jose/jwk.pyi index 8aa0b0f02734..27df5ef42b9d 100644 --- a/stubs/python-jose/jose/jwk.pyi +++ b/stubs/python-jose/jose/jwk.pyi @@ -1,5 +1,4 @@ -from typing import Any -from typing_extensions import Literal +from typing import Any, Literal from .backends import AESKey as AESKey, ECKey as ECKey, HMACKey as HMACKey, RSAKey as RSAKey from .backends.base import DIRKey as DIRKey, Key diff --git a/stubs/python-nmap/nmap/nmap.pyi b/stubs/python-nmap/nmap/nmap.pyi index ff06de1b45b7..9e4eb4d04692 100644 --- a/stubs/python-nmap/nmap/nmap.pyi +++ b/stubs/python-nmap/nmap/nmap.pyi @@ -1,6 +1,6 @@ from collections.abc import Callable, Iterable, Iterator -from typing import Any, TypeVar -from typing_extensions import TypeAlias, TypedDict +from typing import Any, TypedDict, TypeVar +from typing_extensions import TypeAlias _T = TypeVar("_T") _Callback: TypeAlias = Callable[[str, _Result], object] diff --git a/stubs/python-xlib/Xlib/X.pyi b/stubs/python-xlib/Xlib/X.pyi index f05bd07f04ba..cef7a5cdfced 100644 --- a/stubs/python-xlib/Xlib/X.pyi +++ b/stubs/python-xlib/Xlib/X.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final NONE: Final = 0 ParentRelative: Final = 1 diff --git a/stubs/python-xlib/Xlib/Xatom.pyi b/stubs/python-xlib/Xlib/Xatom.pyi index c9315306e9dc..5f71b24f0d92 100644 --- a/stubs/python-xlib/Xlib/Xatom.pyi +++ b/stubs/python-xlib/Xlib/Xatom.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final PRIMARY: Final = 1 SECONDARY: Final = 2 diff --git a/stubs/python-xlib/Xlib/Xcursorfont.pyi b/stubs/python-xlib/Xlib/Xcursorfont.pyi index b8f77c8d6aae..a4d20b804d48 100644 --- a/stubs/python-xlib/Xlib/Xcursorfont.pyi +++ b/stubs/python-xlib/Xlib/Xcursorfont.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final num_glyphs: Final = 154 X_cursor: Final = 0 diff --git a/stubs/python-xlib/Xlib/Xutil.pyi b/stubs/python-xlib/Xlib/Xutil.pyi index 22c6e3d8fa49..71ee250b8ce3 100644 --- a/stubs/python-xlib/Xlib/Xutil.pyi +++ b/stubs/python-xlib/Xlib/Xutil.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final NoValue: Final = 0x0000 XValue: Final = 0x0001 diff --git a/stubs/python-xlib/Xlib/display.pyi b/stubs/python-xlib/Xlib/display.pyi index 573b101e32a3..263f6e869476 100644 --- a/stubs/python-xlib/Xlib/display.pyi +++ b/stubs/python-xlib/Xlib/display.pyi @@ -1,8 +1,8 @@ from collections.abc import Callable, Iterable, Sequence from re import Pattern from types import FunctionType, MethodType -from typing import Any, overload -from typing_extensions import Literal, TypeAlias, TypedDict +from typing import Any, Literal, TypedDict, overload +from typing_extensions import TypeAlias from Xlib import error from Xlib._typing import ErrorHandler diff --git a/stubs/python-xlib/Xlib/error.pyi b/stubs/python-xlib/Xlib/error.pyi index f8c331ee2f55..e78f9130f896 100644 --- a/stubs/python-xlib/Xlib/error.pyi +++ b/stubs/python-xlib/Xlib/error.pyi @@ -1,5 +1,5 @@ from _typeshed import SliceableBuffer -from typing_extensions import Final, Literal +from typing import Final, Literal from Xlib.protocol import display, rq diff --git a/stubs/python-xlib/Xlib/ext/composite.pyi b/stubs/python-xlib/Xlib/ext/composite.pyi index 19685daec028..b300955e5320 100644 --- a/stubs/python-xlib/Xlib/ext/composite.pyi +++ b/stubs/python-xlib/Xlib/ext/composite.pyi @@ -1,6 +1,6 @@ from collections.abc import Callable -from typing import Any -from typing_extensions import Final, TypeAlias +from typing import Any, Final +from typing_extensions import TypeAlias from Xlib._typing import ErrorHandler, Unused from Xlib.display import Display diff --git a/stubs/python-xlib/Xlib/ext/damage.pyi b/stubs/python-xlib/Xlib/ext/damage.pyi index 20aadc2e1c27..27320b17e444 100644 --- a/stubs/python-xlib/Xlib/ext/damage.pyi +++ b/stubs/python-xlib/Xlib/ext/damage.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final, Literal +from typing import Final, Literal from Xlib.display import Display from Xlib.error import XError diff --git a/stubs/python-xlib/Xlib/ext/dpms.pyi b/stubs/python-xlib/Xlib/ext/dpms.pyi index 5fa92d48db80..d6193dc1b62b 100644 --- a/stubs/python-xlib/Xlib/ext/dpms.pyi +++ b/stubs/python-xlib/Xlib/ext/dpms.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final, Literal +from typing import Final, Literal from Xlib._typing import Unused from Xlib.display import Display diff --git a/stubs/python-xlib/Xlib/ext/ge.pyi b/stubs/python-xlib/Xlib/ext/ge.pyi index d0add2edbd71..ced9463eda01 100644 --- a/stubs/python-xlib/Xlib/ext/ge.pyi +++ b/stubs/python-xlib/Xlib/ext/ge.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final from Xlib._typing import Unused from Xlib.display import Display diff --git a/stubs/python-xlib/Xlib/ext/nvcontrol.pyi b/stubs/python-xlib/Xlib/ext/nvcontrol.pyi index a0a8a88cec72..711a21c6eba8 100644 --- a/stubs/python-xlib/Xlib/ext/nvcontrol.pyi +++ b/stubs/python-xlib/Xlib/ext/nvcontrol.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final from Xlib._typing import Unused from Xlib.display import Display diff --git a/stubs/python-xlib/Xlib/ext/randr.pyi b/stubs/python-xlib/Xlib/ext/randr.pyi index eab8fc42c39b..0ff95176124f 100644 --- a/stubs/python-xlib/Xlib/ext/randr.pyi +++ b/stubs/python-xlib/Xlib/ext/randr.pyi @@ -1,5 +1,6 @@ from collections.abc import Sequence -from typing_extensions import Final, TypeAlias +from typing import Final +from typing_extensions import TypeAlias from Xlib.display import Display from Xlib.protocol import request, rq diff --git a/stubs/python-xlib/Xlib/ext/record.pyi b/stubs/python-xlib/Xlib/ext/record.pyi index b09bc0e4333d..51bcf5284411 100644 --- a/stubs/python-xlib/Xlib/ext/record.pyi +++ b/stubs/python-xlib/Xlib/ext/record.pyi @@ -1,6 +1,5 @@ from collections.abc import Callable, Sequence, Sized -from typing import Any, TypeVar -from typing_extensions import Final, Literal +from typing import Any, Final, Literal, TypeVar from Xlib._typing import Unused from Xlib.display import Display diff --git a/stubs/python-xlib/Xlib/ext/res.pyi b/stubs/python-xlib/Xlib/ext/res.pyi index 3289fa10a9eb..ba613b52445c 100644 --- a/stubs/python-xlib/Xlib/ext/res.pyi +++ b/stubs/python-xlib/Xlib/ext/res.pyi @@ -1,5 +1,5 @@ from collections.abc import Sequence -from typing_extensions import Final +from typing import Final from Xlib._typing import Unused from Xlib.display import Display diff --git a/stubs/python-xlib/Xlib/ext/screensaver.pyi b/stubs/python-xlib/Xlib/ext/screensaver.pyi index 2b406d338db4..24ac6750bb89 100644 --- a/stubs/python-xlib/Xlib/ext/screensaver.pyi +++ b/stubs/python-xlib/Xlib/ext/screensaver.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final from Xlib._typing import ErrorHandler from Xlib.display import Display diff --git a/stubs/python-xlib/Xlib/ext/security.pyi b/stubs/python-xlib/Xlib/ext/security.pyi index 661f151a7c78..21e336d7d824 100644 --- a/stubs/python-xlib/Xlib/ext/security.pyi +++ b/stubs/python-xlib/Xlib/ext/security.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final from Xlib._typing import Unused from Xlib.display import Display diff --git a/stubs/python-xlib/Xlib/ext/shape.pyi b/stubs/python-xlib/Xlib/ext/shape.pyi index 79236d0b9644..9a72b1f1736a 100644 --- a/stubs/python-xlib/Xlib/ext/shape.pyi +++ b/stubs/python-xlib/Xlib/ext/shape.pyi @@ -1,5 +1,5 @@ from collections.abc import Sequence -from typing_extensions import Final +from typing import Final from Xlib.display import Display from Xlib.protocol import request, rq diff --git a/stubs/python-xlib/Xlib/ext/xfixes.pyi b/stubs/python-xlib/Xlib/ext/xfixes.pyi index a4ccb20cfeb4..23afba7f5c43 100644 --- a/stubs/python-xlib/Xlib/ext/xfixes.pyi +++ b/stubs/python-xlib/Xlib/ext/xfixes.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final from Xlib._typing import Unused from Xlib.display import Display diff --git a/stubs/python-xlib/Xlib/ext/xinerama.pyi b/stubs/python-xlib/Xlib/ext/xinerama.pyi index 89c8e770af0e..86954f2ade1b 100644 --- a/stubs/python-xlib/Xlib/ext/xinerama.pyi +++ b/stubs/python-xlib/Xlib/ext/xinerama.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final from Xlib._typing import Unused from Xlib.display import Display diff --git a/stubs/python-xlib/Xlib/ext/xinput.pyi b/stubs/python-xlib/Xlib/ext/xinput.pyi index 69172396e559..d562359fd359 100644 --- a/stubs/python-xlib/Xlib/ext/xinput.pyi +++ b/stubs/python-xlib/Xlib/ext/xinput.pyi @@ -1,7 +1,6 @@ from _typeshed import ConvertibleToFloat, SliceableBuffer from collections.abc import Iterable, Sequence -from typing import TypeVar -from typing_extensions import Final +from typing import Final, TypeVar from Xlib._typing import Unused from Xlib.display import Display diff --git a/stubs/python-xlib/Xlib/ext/xtest.pyi b/stubs/python-xlib/Xlib/ext/xtest.pyi index 67a9ae47dc2b..4da281cddd58 100644 --- a/stubs/python-xlib/Xlib/ext/xtest.pyi +++ b/stubs/python-xlib/Xlib/ext/xtest.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final from Xlib._typing import Unused from Xlib.display import Display diff --git a/stubs/python-xlib/Xlib/keysymdef/apl.pyi b/stubs/python-xlib/Xlib/keysymdef/apl.pyi index 99810a3c54c4..869a0592657b 100644 --- a/stubs/python-xlib/Xlib/keysymdef/apl.pyi +++ b/stubs/python-xlib/Xlib/keysymdef/apl.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final XK_leftcaret: Final = 0xBA3 XK_rightcaret: Final = 0xBA6 diff --git a/stubs/python-xlib/Xlib/keysymdef/arabic.pyi b/stubs/python-xlib/Xlib/keysymdef/arabic.pyi index a710eeb8a7b4..6823007c72ec 100644 --- a/stubs/python-xlib/Xlib/keysymdef/arabic.pyi +++ b/stubs/python-xlib/Xlib/keysymdef/arabic.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final XK_Arabic_comma: Final = 0x5AC XK_Arabic_semicolon: Final = 0x5BB diff --git a/stubs/python-xlib/Xlib/keysymdef/cyrillic.pyi b/stubs/python-xlib/Xlib/keysymdef/cyrillic.pyi index f30cad4c1c5e..4ad19a16ea64 100644 --- a/stubs/python-xlib/Xlib/keysymdef/cyrillic.pyi +++ b/stubs/python-xlib/Xlib/keysymdef/cyrillic.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final XK_Serbian_dje: Final = 0x6A1 XK_Macedonia_gje: Final = 0x6A2 diff --git a/stubs/python-xlib/Xlib/keysymdef/greek.pyi b/stubs/python-xlib/Xlib/keysymdef/greek.pyi index 888e3eda1389..2da0ef6907e3 100644 --- a/stubs/python-xlib/Xlib/keysymdef/greek.pyi +++ b/stubs/python-xlib/Xlib/keysymdef/greek.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final XK_Greek_ALPHAaccent: Final = 0x7A1 XK_Greek_EPSILONaccent: Final = 0x7A2 diff --git a/stubs/python-xlib/Xlib/keysymdef/hebrew.pyi b/stubs/python-xlib/Xlib/keysymdef/hebrew.pyi index cfd97c72d13b..a5db68c6c317 100644 --- a/stubs/python-xlib/Xlib/keysymdef/hebrew.pyi +++ b/stubs/python-xlib/Xlib/keysymdef/hebrew.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final XK_hebrew_doublelowline: Final = 0xCDF XK_hebrew_aleph: Final = 0xCE0 diff --git a/stubs/python-xlib/Xlib/keysymdef/katakana.pyi b/stubs/python-xlib/Xlib/keysymdef/katakana.pyi index 449f3a27445e..bf83f8c053e6 100644 --- a/stubs/python-xlib/Xlib/keysymdef/katakana.pyi +++ b/stubs/python-xlib/Xlib/keysymdef/katakana.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final XK_overline: Final = 0x47E XK_kana_fullstop: Final = 0x4A1 diff --git a/stubs/python-xlib/Xlib/keysymdef/korean.pyi b/stubs/python-xlib/Xlib/keysymdef/korean.pyi index 5dabcd3289ea..492965233730 100644 --- a/stubs/python-xlib/Xlib/keysymdef/korean.pyi +++ b/stubs/python-xlib/Xlib/keysymdef/korean.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final XK_Hangul: Final = 0xFF31 XK_Hangul_Start: Final = 0xFF32 diff --git a/stubs/python-xlib/Xlib/keysymdef/latin1.pyi b/stubs/python-xlib/Xlib/keysymdef/latin1.pyi index bdc3a5d5cc05..2659a0a55b63 100644 --- a/stubs/python-xlib/Xlib/keysymdef/latin1.pyi +++ b/stubs/python-xlib/Xlib/keysymdef/latin1.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final XK_space: Final = 0x020 XK_exclam: Final = 0x021 diff --git a/stubs/python-xlib/Xlib/keysymdef/latin2.pyi b/stubs/python-xlib/Xlib/keysymdef/latin2.pyi index 406254b9e74a..f867732c6158 100644 --- a/stubs/python-xlib/Xlib/keysymdef/latin2.pyi +++ b/stubs/python-xlib/Xlib/keysymdef/latin2.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final XK_Aogonek: Final = 0x1A1 XK_breve: Final = 0x1A2 diff --git a/stubs/python-xlib/Xlib/keysymdef/latin3.pyi b/stubs/python-xlib/Xlib/keysymdef/latin3.pyi index df345c9a740e..acd840e78847 100644 --- a/stubs/python-xlib/Xlib/keysymdef/latin3.pyi +++ b/stubs/python-xlib/Xlib/keysymdef/latin3.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final XK_Hstroke: Final = 0x2A1 XK_Hcircumflex: Final = 0x2A6 diff --git a/stubs/python-xlib/Xlib/keysymdef/latin4.pyi b/stubs/python-xlib/Xlib/keysymdef/latin4.pyi index 8d2251b7c394..5b7a58c9f8d7 100644 --- a/stubs/python-xlib/Xlib/keysymdef/latin4.pyi +++ b/stubs/python-xlib/Xlib/keysymdef/latin4.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final XK_kra: Final = 0x3A2 XK_kappa: Final = 0x3A2 diff --git a/stubs/python-xlib/Xlib/keysymdef/miscellany.pyi b/stubs/python-xlib/Xlib/keysymdef/miscellany.pyi index f8e8b9db052e..70b11a05430d 100644 --- a/stubs/python-xlib/Xlib/keysymdef/miscellany.pyi +++ b/stubs/python-xlib/Xlib/keysymdef/miscellany.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final XK_BackSpace: Final = 0xFF08 XK_Tab: Final = 0xFF09 diff --git a/stubs/python-xlib/Xlib/keysymdef/publishing.pyi b/stubs/python-xlib/Xlib/keysymdef/publishing.pyi index 9525136a232c..3c7e8f8cdb5f 100644 --- a/stubs/python-xlib/Xlib/keysymdef/publishing.pyi +++ b/stubs/python-xlib/Xlib/keysymdef/publishing.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final XK_emspace: Final = 0xAA1 XK_enspace: Final = 0xAA2 diff --git a/stubs/python-xlib/Xlib/keysymdef/special.pyi b/stubs/python-xlib/Xlib/keysymdef/special.pyi index 6e0796a70934..7a3897ce4656 100644 --- a/stubs/python-xlib/Xlib/keysymdef/special.pyi +++ b/stubs/python-xlib/Xlib/keysymdef/special.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final XK_blank: Final = 0x9DF XK_soliddiamond: Final = 0x9E0 diff --git a/stubs/python-xlib/Xlib/keysymdef/technical.pyi b/stubs/python-xlib/Xlib/keysymdef/technical.pyi index 79abf5c37138..02038da50954 100644 --- a/stubs/python-xlib/Xlib/keysymdef/technical.pyi +++ b/stubs/python-xlib/Xlib/keysymdef/technical.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final XK_leftradical: Final = 0x8A1 XK_topleftradical: Final = 0x8A2 diff --git a/stubs/python-xlib/Xlib/keysymdef/thai.pyi b/stubs/python-xlib/Xlib/keysymdef/thai.pyi index d4c6b8cc1ce2..2d652844b333 100644 --- a/stubs/python-xlib/Xlib/keysymdef/thai.pyi +++ b/stubs/python-xlib/Xlib/keysymdef/thai.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final XK_Thai_kokai: Final = 0xDA1 XK_Thai_khokhai: Final = 0xDA2 diff --git a/stubs/python-xlib/Xlib/keysymdef/xf86.pyi b/stubs/python-xlib/Xlib/keysymdef/xf86.pyi index 0a46303d85a9..7f2d9d330880 100644 --- a/stubs/python-xlib/Xlib/keysymdef/xf86.pyi +++ b/stubs/python-xlib/Xlib/keysymdef/xf86.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final XK_XF86_ModeLock: Final = 0x1008FF01 XK_XF86_MonBrightnessUp: Final = 0x1008FF02 diff --git a/stubs/python-xlib/Xlib/keysymdef/xk3270.pyi b/stubs/python-xlib/Xlib/keysymdef/xk3270.pyi index a47fd8d247ad..92741d4b0563 100644 --- a/stubs/python-xlib/Xlib/keysymdef/xk3270.pyi +++ b/stubs/python-xlib/Xlib/keysymdef/xk3270.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final XK_3270_Duplicate: Final = 0xFD01 XK_3270_FieldMark: Final = 0xFD02 diff --git a/stubs/python-xlib/Xlib/keysymdef/xkb.pyi b/stubs/python-xlib/Xlib/keysymdef/xkb.pyi index 741439eb2b81..f72fa6704cd7 100644 --- a/stubs/python-xlib/Xlib/keysymdef/xkb.pyi +++ b/stubs/python-xlib/Xlib/keysymdef/xkb.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final XK_ISO_Lock: Final = 0xFE01 XK_ISO_Level2_Latch: Final = 0xFE02 diff --git a/stubs/python-xlib/Xlib/protocol/display.pyi b/stubs/python-xlib/Xlib/protocol/display.pyi index a9480b1c6a96..1808ea6002d8 100644 --- a/stubs/python-xlib/Xlib/protocol/display.pyi +++ b/stubs/python-xlib/Xlib/protocol/display.pyi @@ -1,7 +1,6 @@ from _typeshed import _BufferWithLen from socket import socket -from typing import TypeVar, overload -from typing_extensions import Literal +from typing import Literal, TypeVar, overload from Xlib import error from Xlib._typing import ErrorHandler diff --git a/stubs/python-xlib/Xlib/protocol/event.pyi b/stubs/python-xlib/Xlib/protocol/event.pyi index a1167dde9d1b..b4366c8a9c40 100644 --- a/stubs/python-xlib/Xlib/protocol/event.pyi +++ b/stubs/python-xlib/Xlib/protocol/event.pyi @@ -1,4 +1,5 @@ -from typing_extensions import Final, TypeAlias +from typing import Final +from typing_extensions import TypeAlias from Xlib.protocol import rq diff --git a/stubs/python-xlib/Xlib/protocol/request.pyi b/stubs/python-xlib/Xlib/protocol/request.pyi index 1ce5a4669e75..6cc1da72a1e8 100644 --- a/stubs/python-xlib/Xlib/protocol/request.pyi +++ b/stubs/python-xlib/Xlib/protocol/request.pyi @@ -1,5 +1,4 @@ -from typing import NoReturn -from typing_extensions import Final +from typing import Final, NoReturn from Xlib import display from Xlib.protocol import rq diff --git a/stubs/python-xlib/Xlib/protocol/rq.pyi b/stubs/python-xlib/Xlib/protocol/rq.pyi index 871afc9d4529..5eb2f09c446b 100644 --- a/stubs/python-xlib/Xlib/protocol/rq.pyi +++ b/stubs/python-xlib/Xlib/protocol/rq.pyi @@ -4,8 +4,8 @@ from array import array # Avoid name collision with List.type from builtins import type as Type from collections.abc import Callable, Iterable, Sequence -from typing import Any, TypeVar, overload, type_check_only -from typing_extensions import Final, Literal, LiteralString, SupportsIndex, TypeAlias +from typing import Any, Final, Literal, SupportsIndex, TypeVar, overload, type_check_only +from typing_extensions import LiteralString, TypeAlias from Xlib._typing import ErrorHandler, Unused from Xlib.display import _BaseDisplay, _ResourceBaseClass diff --git a/stubs/python-xlib/Xlib/rdb.pyi b/stubs/python-xlib/Xlib/rdb.pyi index 8b4af5b3dc56..a31cbff9c88f 100644 --- a/stubs/python-xlib/Xlib/rdb.pyi +++ b/stubs/python-xlib/Xlib/rdb.pyi @@ -1,8 +1,8 @@ from _typeshed import SupportsDunderGT, SupportsDunderLT, SupportsRead from collections.abc import Iterable, Mapping, Sequence from re import Pattern -from typing import Any, Protocol, TypeVar, overload -from typing_extensions import Final, TypeAlias +from typing import Any, Final, Protocol, TypeVar, overload +from typing_extensions import TypeAlias from Xlib.display import Display from Xlib.support.lock import _DummyLock diff --git a/stubs/python-xlib/Xlib/support/connect.pyi b/stubs/python-xlib/Xlib/support/connect.pyi index dbc38de9e0d5..3a9346fb0368 100644 --- a/stubs/python-xlib/Xlib/support/connect.pyi +++ b/stubs/python-xlib/Xlib/support/connect.pyi @@ -1,6 +1,8 @@ # Ignore OpenVMS in typeshed -from typing_extensions import Final +from typing import Final -from Xlib.support.unix_connect import get_auth as get_auth, get_display as get_display, get_socket as get_socket +from Xlib.support.unix_connect import get_auth as get_auth +from Xlib.support.unix_connect import get_display as get_display +from Xlib.support.unix_connect import get_socket as get_socket platform: Final[str] diff --git a/stubs/python-xlib/Xlib/support/unix_connect.pyi b/stubs/python-xlib/Xlib/support/unix_connect.pyi index cc298782b859..f9b91ab85dec 100644 --- a/stubs/python-xlib/Xlib/support/unix_connect.pyi +++ b/stubs/python-xlib/Xlib/support/unix_connect.pyi @@ -3,7 +3,8 @@ from _socket import _Address from platform import uname_result from re import Pattern from socket import socket -from typing_extensions import Final, Literal, TypeAlias +from typing import Final, Literal +from typing_extensions import TypeAlias from Xlib._typing import Unused diff --git a/stubs/python-xlib/Xlib/support/vms_connect.pyi b/stubs/python-xlib/Xlib/support/vms_connect.pyi index 842628fe399b..bbf5ea055e0b 100644 --- a/stubs/python-xlib/Xlib/support/vms_connect.pyi +++ b/stubs/python-xlib/Xlib/support/vms_connect.pyi @@ -1,8 +1,8 @@ -from _socket import _Address from re import Pattern from socket import socket -from typing_extensions import Final +from typing import Final +from _socket import _Address from Xlib._typing import Unused display_re: Final[Pattern[str]] diff --git a/stubs/python-xlib/Xlib/xauth.pyi b/stubs/python-xlib/Xlib/xauth.pyi index 2199dd41238a..e6490c569673 100644 --- a/stubs/python-xlib/Xlib/xauth.pyi +++ b/stubs/python-xlib/Xlib/xauth.pyi @@ -1,5 +1,5 @@ from _typeshed import FileDescriptorOrPath -from typing_extensions import Final +from typing import Final from Xlib.X import ( FamilyChaos as FamilyChaos, diff --git a/stubs/python-xlib/Xlib/xobject/colormap.pyi b/stubs/python-xlib/Xlib/xobject/colormap.pyi index 7a110bbb5510..a38c9b0dea36 100644 --- a/stubs/python-xlib/Xlib/xobject/colormap.pyi +++ b/stubs/python-xlib/Xlib/xobject/colormap.pyi @@ -1,6 +1,6 @@ from collections.abc import Sequence from re import Pattern -from typing_extensions import Final +from typing import Final from Xlib._typing import ErrorHandler from Xlib.protocol import request, rq diff --git a/stubs/pywin32/_win32typing.pyi b/stubs/pywin32/_win32typing.pyi index 4b7c80e00441..f0ca25b0751e 100644 --- a/stubs/pywin32/_win32typing.pyi +++ b/stubs/pywin32/_win32typing.pyi @@ -1,8 +1,8 @@ # Not available at runtime. Contains type definitions that are otherwise not exposed and not part of a specific module. from _typeshed import Incomplete, Unused from collections.abc import Iterable -from typing import overload -from typing_extensions import Literal, Self, final +from typing import Literal, final, overload +from typing_extensions import Self class ArgNotFound: ... class PyOleEmpty: ... diff --git a/stubs/pywin32/win32/lib/pywintypes.pyi b/stubs/pywin32/win32/lib/pywintypes.pyi index ac71380df99c..aa78179670aa 100644 --- a/stubs/pywin32/win32/lib/pywintypes.pyi +++ b/stubs/pywin32/win32/lib/pywintypes.pyi @@ -2,8 +2,7 @@ # "KeyError: 'pywintypes'" from _typeshed import Incomplete from datetime import datetime -from typing import NoReturn -from typing_extensions import Literal, Never +from typing import Literal, Never, NoReturn import _win32typing diff --git a/stubs/pywin32/win32/odbc.pyi b/stubs/pywin32/win32/odbc.pyi index 8ba629f38206..d66989e84f36 100644 --- a/stubs/pywin32/win32/odbc.pyi +++ b/stubs/pywin32/win32/odbc.pyi @@ -1,5 +1,6 @@ from _typeshed import Incomplete -from typing_extensions import Literal, TypeAlias +from typing import Literal +from typing_extensions import TypeAlias import _win32typing diff --git a/stubs/pywin32/win32/win32api.pyi b/stubs/pywin32/win32/win32api.pyi index 4588e8644d41..56300e173d31 100644 --- a/stubs/pywin32/win32/win32api.pyi +++ b/stubs/pywin32/win32/win32api.pyi @@ -1,6 +1,6 @@ from _typeshed import Incomplete, ReadableBuffer from collections.abc import Callable, Iterable -from typing_extensions import TypedDict +from typing import TypedDict import _win32typing from win32.lib.pywintypes import error as error diff --git a/stubs/pywin32/win32/win32gui.pyi b/stubs/pywin32/win32/win32gui.pyi index 738f61ed3b32..8afac52e3462 100644 --- a/stubs/pywin32/win32/win32gui.pyi +++ b/stubs/pywin32/win32/win32gui.pyi @@ -1,7 +1,6 @@ from _typeshed import Incomplete, ReadableBuffer, WriteableBuffer from collections.abc import Callable -from typing import TypeVar -from typing_extensions import Literal +from typing import Literal, TypeVar import _win32typing from win32.lib.pywintypes import error as error diff --git a/stubs/pywin32/win32/win32print.pyi b/stubs/pywin32/win32/win32print.pyi index 16a41b82af50..ce25e06b44d7 100644 --- a/stubs/pywin32/win32/win32print.pyi +++ b/stubs/pywin32/win32/win32print.pyi @@ -1,7 +1,7 @@ -from _typeshed import Incomplete -from typing_extensions import Literal +from typing import Literal import _win32typing +from _typeshed import Incomplete def OpenPrinter(printer: str, Defaults: Incomplete | None = ...) -> _win32typing.PyPrinterHANDLE: ... def GetPrinter(hPrinter: _win32typing.PyPrinterHANDLE, Level: int = ...): ... diff --git a/stubs/pywin32/win32com/client/__init__.pyi b/stubs/pywin32/win32com/client/__init__.pyi index feb41f060068..fc2753db68f0 100644 --- a/stubs/pywin32/win32com/client/__init__.pyi +++ b/stubs/pywin32/win32com/client/__init__.pyi @@ -1,5 +1,6 @@ from _typeshed import Incomplete -from typing_extensions import Final, TypeAlias +from typing import Final +from typing_extensions import TypeAlias import _win32typing from win32com.client import dynamic as dynamic, gencache as gencache diff --git a/stubs/pyxdg/xdg/DesktopEntry.pyi b/stubs/pyxdg/xdg/DesktopEntry.pyi index 750851fc66ee..bc63b306c495 100644 --- a/stubs/pyxdg/xdg/DesktopEntry.pyi +++ b/stubs/pyxdg/xdg/DesktopEntry.pyi @@ -1,7 +1,7 @@ import re -from _typeshed import StrPath -from typing_extensions import Literal +from typing import Literal +from _typeshed import StrPath from xdg.IniFile import IniFile class DesktopEntry(IniFile): diff --git a/stubs/pyxdg/xdg/IniFile.pyi b/stubs/pyxdg/xdg/IniFile.pyi index 86f8be93e1c8..f4488d1c7d41 100644 --- a/stubs/pyxdg/xdg/IniFile.pyi +++ b/stubs/pyxdg/xdg/IniFile.pyi @@ -1,7 +1,6 @@ import re from collections.abc import Iterable, KeysView -from typing import overload -from typing_extensions import Literal +from typing import Literal, overload def is_ascii(s: str) -> bool: ... diff --git a/stubs/pyxdg/xdg/Menu.pyi b/stubs/pyxdg/xdg/Menu.pyi index 4edabd090a19..cb9f48495d72 100644 --- a/stubs/pyxdg/xdg/Menu.pyi +++ b/stubs/pyxdg/xdg/Menu.pyi @@ -1,9 +1,10 @@ import ast import xml.dom -from _typeshed import Unused from collections.abc import Collection, Iterable, Iterator from types import CodeType -from typing_extensions import Literal +from typing import Literal + +from _typeshed import Unused from .DesktopEntry import DesktopEntry diff --git a/stubs/pyxdg/xdg/MenuEditor.pyi b/stubs/pyxdg/xdg/MenuEditor.pyi index bf0ec9220ed4..5e8c98136df4 100644 --- a/stubs/pyxdg/xdg/MenuEditor.pyi +++ b/stubs/pyxdg/xdg/MenuEditor.pyi @@ -1,6 +1,6 @@ from _typeshed import StrPath, Unused -from typing import overload -from typing_extensions import Literal, TypeAlias +from typing import Literal, overload +from typing_extensions import TypeAlias from xml.etree.ElementTree import ElementTree from .Menu import Menu, MenuEntry, Separator, XMLMenuBuilder diff --git a/stubs/pyxdg/xdg/Mime.pyi b/stubs/pyxdg/xdg/Mime.pyi index 31982370b70d..f31eec421531 100644 --- a/stubs/pyxdg/xdg/Mime.pyi +++ b/stubs/pyxdg/xdg/Mime.pyi @@ -3,7 +3,8 @@ from _typeshed import StrOrBytesPath, SupportsLenAndGetItem, Unused from collections import defaultdict from collections.abc import Collection, Iterable from io import BytesIO -from typing_extensions import Literal, Self, TypeAlias +from typing import Literal +from typing_extensions import Self, TypeAlias FREE_NS: str types: dict[str, MIMEtype] diff --git a/stubs/pyxdg/xdg/util.pyi b/stubs/pyxdg/xdg/util.pyi index fb58c8a3dcbe..15636e13529a 100644 --- a/stubs/pyxdg/xdg/util.pyi +++ b/stubs/pyxdg/xdg/util.pyi @@ -1,5 +1,5 @@ from shutil import which as which -from typing_extensions import Literal +from typing import Literal PY3: Literal[True] diff --git a/stubs/qrcode/qrcode/image/svg.pyi b/stubs/qrcode/qrcode/image/svg.pyi index f582783c934f..73f50127b1c3 100644 --- a/stubs/qrcode/qrcode/image/svg.pyi +++ b/stubs/qrcode/qrcode/image/svg.pyi @@ -1,8 +1,7 @@ import abc from _typeshed import Incomplete from decimal import Decimal -from typing import overload -from typing_extensions import Literal +from typing import Literal, overload from xml.etree.ElementTree import Element import qrcode.image.base diff --git a/stubs/redis/redis/asyncio/client.pyi b/stubs/redis/redis/asyncio/client.pyi index 11e7b95cc19e..2457d315f6f7 100644 --- a/stubs/redis/redis/asyncio/client.pyi +++ b/stubs/redis/redis/asyncio/client.pyi @@ -2,8 +2,8 @@ from _typeshed import Incomplete, Unused from collections.abc import AsyncIterator, Awaitable, Callable, Generator, Iterable, Mapping, MutableMapping, Sequence from datetime import datetime, timedelta from types import TracebackType -from typing import Any, ClassVar, NoReturn, Protocol, overload -from typing_extensions import Literal, Self, TypeAlias, TypedDict +from typing import Any, ClassVar, Literal, NoReturn, Protocol, TypedDict, overload +from typing_extensions import Self, TypeAlias from redis import RedisError from redis.asyncio.connection import ConnectCallbackT, Connection, ConnectionPool diff --git a/stubs/redis/redis/asyncio/connection.pyi b/stubs/redis/redis/asyncio/connection.pyi index d771ff093651..988cb36110da 100644 --- a/stubs/redis/redis/asyncio/connection.pyi +++ b/stubs/redis/redis/asyncio/connection.pyi @@ -3,8 +3,8 @@ import enum import ssl from _typeshed import Incomplete from collections.abc import Callable, Iterable, Mapping -from typing import Any, Protocol, overload -from typing_extensions import Literal, TypeAlias, TypedDict +from typing import Any, Literal, Protocol, TypedDict, overload +from typing_extensions import TypeAlias from redis import RedisError from redis.asyncio.retry import Retry diff --git a/stubs/redis/redis/client.pyi b/stubs/redis/redis/client.pyi index f01d8651f499..9368b8c597da 100644 --- a/stubs/redis/redis/client.pyi +++ b/stubs/redis/redis/client.pyi @@ -4,8 +4,8 @@ from collections.abc import Callable, Iterable, Iterator, Mapping, Sequence from datetime import datetime, timedelta from re import Pattern from types import TracebackType -from typing import Any, ClassVar, TypeVar, overload -from typing_extensions import Literal, Self, TypeAlias +from typing import Any, ClassVar, Literal, TypeVar, overload +from typing_extensions import Self, TypeAlias from redis import RedisError diff --git a/stubs/redis/redis/cluster.pyi b/stubs/redis/redis/cluster.pyi index dc1a6f4117ea..f43c1b3f405b 100644 --- a/stubs/redis/redis/cluster.pyi +++ b/stubs/redis/redis/cluster.pyi @@ -2,8 +2,8 @@ from _typeshed import Incomplete, Unused from collections.abc import Callable, Iterable, Sequence from threading import Lock from types import TracebackType -from typing import Any, ClassVar, NoReturn, Protocol -from typing_extensions import Literal, Self +from typing import Any, ClassVar, Literal, NoReturn, Protocol +from typing_extensions import Self from redis.client import CaseInsensitiveDict, PubSub, Redis, _ParseResponseOptions from redis.commands import CommandsParser, RedisClusterCommands diff --git a/stubs/redis/redis/commands/core.pyi b/stubs/redis/redis/commands/core.pyi index 9d72bf0a6a91..d4c8e25081a4 100644 --- a/stubs/redis/redis/commands/core.pyi +++ b/stubs/redis/redis/commands/core.pyi @@ -2,8 +2,7 @@ import builtins from _typeshed import Incomplete from collections.abc import AsyncIterator, Awaitable, Callable, Iterable, Iterator, Mapping, Sequence from datetime import datetime, timedelta -from typing import Any, Generic, TypeVar, overload -from typing_extensions import Literal +from typing import Any, Generic, Literal, TypeVar, overload from ..asyncio.client import Redis as AsyncRedis from ..client import _CommandOptions, _Key, _Value diff --git a/stubs/redis/redis/commands/graph/query_result.pyi b/stubs/redis/redis/commands/graph/query_result.pyi index 446d67196fe4..d9f8b51418a0 100644 --- a/stubs/redis/redis/commands/graph/query_result.pyi +++ b/stubs/redis/redis/commands/graph/query_result.pyi @@ -1,5 +1,4 @@ -from typing import Any, ClassVar -from typing_extensions import Literal +from typing import Any, ClassVar, Literal LABELS_ADDED: str NODES_CREATED: str diff --git a/stubs/redis/redis/commands/search/aggregation.pyi b/stubs/redis/redis/commands/search/aggregation.pyi index 854be852d3d4..48bac2185cf7 100644 --- a/stubs/redis/redis/commands/search/aggregation.pyi +++ b/stubs/redis/redis/commands/search/aggregation.pyi @@ -1,5 +1,4 @@ -from typing import Any, ClassVar -from typing_extensions import Literal +from typing import Any, ClassVar, Literal FIELDNAME: Any diff --git a/stubs/redis/redis/commands/search/commands.pyi b/stubs/redis/redis/commands/search/commands.pyi index 63995e758b1f..f8a2baf3732f 100644 --- a/stubs/redis/redis/commands/search/commands.pyi +++ b/stubs/redis/redis/commands/search/commands.pyi @@ -1,7 +1,7 @@ from _typeshed import Incomplete from collections.abc import Mapping -from typing import Any -from typing_extensions import Literal, TypeAlias +from typing import Any, Literal +from typing_extensions import TypeAlias from .aggregation import AggregateRequest, AggregateResult, Cursor from .query import Query diff --git a/stubs/redis/redis/commands/timeseries/commands.pyi b/stubs/redis/redis/commands/timeseries/commands.pyi index 989542c9c62e..ed70e575b971 100644 --- a/stubs/redis/redis/commands/timeseries/commands.pyi +++ b/stubs/redis/redis/commands/timeseries/commands.pyi @@ -1,4 +1,5 @@ -from typing_extensions import Literal, TypeAlias +from typing import Literal +from typing_extensions import TypeAlias _Key: TypeAlias = bytes | str | memoryview diff --git a/stubs/redis/redis/ocsp.pyi b/stubs/redis/redis/ocsp.pyi index 0416a2319332..0d3e25e77da6 100644 --- a/stubs/redis/redis/ocsp.pyi +++ b/stubs/redis/redis/ocsp.pyi @@ -1,7 +1,7 @@ -from _typeshed import Incomplete from ssl import SSLObject, SSLSocket -from typing_extensions import Literal +from typing import Literal +from _typeshed import Incomplete from cryptography.x509.base import Certificate from OpenSSL.SSL import Connection diff --git a/stubs/redis/redis/sentinel.pyi b/stubs/redis/redis/sentinel.pyi index 3b51430ce8c8..843c2fa181ac 100644 --- a/stubs/redis/redis/sentinel.pyi +++ b/stubs/redis/redis/sentinel.pyi @@ -1,6 +1,6 @@ from collections.abc import Iterable, Iterator -from typing import Any, TypeVar, overload -from typing_extensions import Literal, TypeAlias +from typing import Any, Literal, TypeVar, overload +from typing_extensions import TypeAlias from redis.client import Redis from redis.commands.sentinel import SentinelCommands diff --git a/stubs/redis/redis/utils.pyi b/stubs/redis/redis/utils.pyi index 32de59413a33..87194a8427bb 100644 --- a/stubs/redis/redis/utils.pyi +++ b/stubs/redis/redis/utils.pyi @@ -1,8 +1,7 @@ from _typeshed import Unused from collections.abc import Iterable, Mapping from contextlib import AbstractContextManager -from typing import Any, TypeVar, overload -from typing_extensions import Literal +from typing import Any, Literal, TypeVar, overload from .client import Pipeline, Redis, _StrType diff --git a/stubs/regex/regex/_regex.pyi b/stubs/regex/regex/_regex.pyi index a8744d0d9049..d9515249b49f 100644 --- a/stubs/regex/regex/_regex.pyi +++ b/stubs/regex/regex/_regex.pyi @@ -3,8 +3,8 @@ # For example: `Pattern` and `Match` are not exported # and are redefined in `regex.regex module. -from typing import Any, AnyStr, Generic -from typing_extensions import Self, final +from typing import Any, AnyStr, Generic, final +from typing_extensions import Self from .regex import Match, Pattern diff --git a/stubs/regex/regex/regex.pyi b/stubs/regex/regex/regex.pyi index 0d37d0c9fc32..79778ce30dfc 100644 --- a/stubs/regex/regex/regex.pyi +++ b/stubs/regex/regex/regex.pyi @@ -1,8 +1,8 @@ import sys from _typeshed import ReadableBuffer from collections.abc import Callable, Mapping -from typing import Any, AnyStr, Generic, TypeVar, overload -from typing_extensions import Literal, Self, final +from typing import Any, AnyStr, Generic, Literal, TypeVar, final, overload +from typing_extensions import Self from . import _regex from ._regex_core import * diff --git a/stubs/requests-oauthlib/requests_oauthlib/oauth1_session.pyi b/stubs/requests-oauthlib/requests_oauthlib/oauth1_session.pyi index e6b1324ae081..2c48e0a1a859 100644 --- a/stubs/requests-oauthlib/requests_oauthlib/oauth1_session.pyi +++ b/stubs/requests-oauthlib/requests_oauthlib/oauth1_session.pyi @@ -1,6 +1,7 @@ from _typeshed import Incomplete from logging import Logger -from typing_extensions import TypeAlias, TypedDict +from typing import TypedDict +from typing_extensions import TypeAlias import requests from oauthlib.oauth1 import Client diff --git a/stubs/requests-oauthlib/requests_oauthlib/oauth2_session.pyi b/stubs/requests-oauthlib/requests_oauthlib/oauth2_session.pyi index c170c9f06675..fffca17c12f4 100644 --- a/stubs/requests-oauthlib/requests_oauthlib/oauth2_session.pyi +++ b/stubs/requests-oauthlib/requests_oauthlib/oauth2_session.pyi @@ -1,7 +1,7 @@ from _typeshed import Incomplete from logging import Logger -from typing import Any, Protocol, overload -from typing_extensions import Literal, TypeAlias, TypedDict +from typing import Any, Literal, Protocol, TypedDict, overload +from typing_extensions import TypeAlias import requests from oauthlib.oauth2 import Client diff --git a/stubs/requests/requests/compat.pyi b/stubs/requests/requests/compat.pyi index bf90bf09fc04..2494dde80160 100644 --- a/stubs/requests/requests/compat.pyi +++ b/stubs/requests/requests/compat.pyi @@ -1,6 +1,7 @@ from builtins import bytes as bytes, str as str from collections import OrderedDict as OrderedDict -from typing_extensions import Literal, TypeAlias +from typing import Literal +from typing_extensions import TypeAlias from urllib.parse import ( quote as quote, quote_plus as quote_plus, diff --git a/stubs/requests/requests/help.pyi b/stubs/requests/requests/help.pyi index e58cb3a8cd6d..f36d62ff20dd 100644 --- a/stubs/requests/requests/help.pyi +++ b/stubs/requests/requests/help.pyi @@ -1,4 +1,4 @@ -from typing_extensions import TypedDict +from typing import TypedDict class _VersionDict(TypedDict): version: str diff --git a/stubs/requests/requests/sessions.pyi b/stubs/requests/requests/sessions.pyi index 2d5dec234d14..21fb98698817 100644 --- a/stubs/requests/requests/sessions.pyi +++ b/stubs/requests/requests/sessions.pyi @@ -1,7 +1,7 @@ from _typeshed import Incomplete, SupportsItems, SupportsRead, Unused from collections.abc import Callable, Iterable, Mapping, MutableMapping -from typing import Any -from typing_extensions import Self, TypeAlias, TypedDict +from typing import Any, TypedDict +from typing_extensions import Self, TypeAlias from urllib3._collections import RecentlyUsedContainer diff --git a/stubs/seaborn/seaborn/_core/plot.pyi b/stubs/seaborn/seaborn/_core/plot.pyi index e31f8faaa040..937814221197 100644 --- a/stubs/seaborn/seaborn/_core/plot.pyi +++ b/stubs/seaborn/seaborn/_core/plot.pyi @@ -3,8 +3,8 @@ import os from _typeshed import Incomplete, SupportsKeysAndGetItem from collections.abc import Callable, Generator from contextlib import contextmanager -from typing import IO, Any, NoReturn, TypeVar -from typing_extensions import Literal, Never, Self, TypedDict +from typing import IO, Any, Literal, NoReturn, TypedDict, TypeVar +from typing_extensions import Never, Self import matplotlib as mpl from matplotlib.artist import Artist diff --git a/stubs/seaborn/seaborn/_core/rules.pyi b/stubs/seaborn/seaborn/_core/rules.pyi index 69512abb0787..8f07c919295a 100644 --- a/stubs/seaborn/seaborn/_core/rules.pyi +++ b/stubs/seaborn/seaborn/_core/rules.pyi @@ -1,6 +1,5 @@ from collections import UserString -from typing import Any -from typing_extensions import Literal +from typing import Any, Literal from pandas import Series diff --git a/stubs/seaborn/seaborn/axisgrid.pyi b/stubs/seaborn/seaborn/axisgrid.pyi index a87e432224c0..fb80ef7f768a 100644 --- a/stubs/seaborn/seaborn/axisgrid.pyi +++ b/stubs/seaborn/seaborn/axisgrid.pyi @@ -1,8 +1,8 @@ import os from _typeshed import Incomplete from collections.abc import Callable, Generator, Iterable, Mapping -from typing import IO, Any, TypeVar -from typing_extensions import Concatenate, Literal, ParamSpec, Self, TypeAlias, deprecated +from typing import IO, Any, Literal, TypeVar +from typing_extensions import Concatenate, ParamSpec, Self, TypeAlias, deprecated import numpy as np from matplotlib.artist import Artist diff --git a/stubs/seaborn/seaborn/categorical.pyi b/stubs/seaborn/seaborn/categorical.pyi index b91ee47e790b..806ab5b57e5f 100644 --- a/stubs/seaborn/seaborn/categorical.pyi +++ b/stubs/seaborn/seaborn/categorical.pyi @@ -1,7 +1,6 @@ from _typeshed import Incomplete from collections.abc import Callable, Iterable -from typing import Any -from typing_extensions import Literal +from typing import Any, Literal from matplotlib.axes import Axes from matplotlib.colors import Normalize diff --git a/stubs/seaborn/seaborn/distributions.pyi b/stubs/seaborn/seaborn/distributions.pyi index 0f849f2c182c..e00f4df74baa 100644 --- a/stubs/seaborn/seaborn/distributions.pyi +++ b/stubs/seaborn/seaborn/distributions.pyi @@ -1,6 +1,6 @@ from collections.abc import Iterable -from typing import Any, Protocol, TypeVar -from typing_extensions import Literal, TypeAlias, deprecated +from typing import Any, Literal, Protocol, TypeVar +from typing_extensions import TypeAlias, deprecated from matplotlib.axes import Axes from matplotlib.colors import Colormap, Normalize diff --git a/stubs/seaborn/seaborn/external/appdirs.pyi b/stubs/seaborn/seaborn/external/appdirs.pyi index 982d29189197..d9291bbb8d1e 100644 --- a/stubs/seaborn/seaborn/external/appdirs.pyi +++ b/stubs/seaborn/seaborn/external/appdirs.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Literal +from typing import Literal __version__: str __version_info__: tuple[int, int, int] diff --git a/stubs/seaborn/seaborn/external/docscrape.pyi b/stubs/seaborn/seaborn/external/docscrape.pyi index 7c2c73f0533c..b769253eb59e 100644 --- a/stubs/seaborn/seaborn/external/docscrape.pyi +++ b/stubs/seaborn/seaborn/external/docscrape.pyi @@ -1,7 +1,6 @@ from _typeshed import Incomplete, Unused from collections.abc import Callable, Iterable, Iterator, Mapping, MutableSequence -from typing import Any, ClassVar, NamedTuple, TypeVar, overload -from typing_extensions import SupportsIndex +from typing import Any, ClassVar, NamedTuple, SupportsIndex, TypeVar, overload _S = TypeVar("_S", bound=MutableSequence[str]) diff --git a/stubs/seaborn/seaborn/external/kde.pyi b/stubs/seaborn/seaborn/external/kde.pyi index 81b7573046f0..96b36651eb33 100644 --- a/stubs/seaborn/seaborn/external/kde.pyi +++ b/stubs/seaborn/seaborn/external/kde.pyi @@ -1,6 +1,6 @@ from collections.abc import Callable -from typing import Any, Protocol -from typing_extensions import Literal, TypeAlias +from typing import Any, Literal, Protocol +from typing_extensions import TypeAlias import numpy as np from numpy.typing import ArrayLike, NDArray diff --git a/stubs/seaborn/seaborn/matrix.pyi b/stubs/seaborn/seaborn/matrix.pyi index db5d8d4d0638..7828fb6b3dbb 100644 --- a/stubs/seaborn/seaborn/matrix.pyi +++ b/stubs/seaborn/seaborn/matrix.pyi @@ -1,6 +1,7 @@ from _typeshed import Incomplete from collections.abc import Hashable, Iterable, Mapping, Sequence -from typing_extensions import Literal, Self, TypeAlias +from typing import Literal +from typing_extensions import Self, TypeAlias import numpy as np from matplotlib.axes import Axes diff --git a/stubs/seaborn/seaborn/palettes.pyi b/stubs/seaborn/seaborn/palettes.pyi index 480380b2b5ef..64ea321d28e5 100644 --- a/stubs/seaborn/seaborn/palettes.pyi +++ b/stubs/seaborn/seaborn/palettes.pyi @@ -1,6 +1,6 @@ from collections.abc import Iterable, Sequence -from typing import TypeVar, overload -from typing_extensions import Literal, Self, TypeAlias +from typing import Literal, TypeVar, overload +from typing_extensions import Self, TypeAlias from matplotlib.colors import Colormap, LinearSegmentedColormap, ListedColormap from matplotlib.typing import ColorType diff --git a/stubs/seaborn/seaborn/rcmod.pyi b/stubs/seaborn/seaborn/rcmod.pyi index a603fd1297ec..04c669d74f0e 100644 --- a/stubs/seaborn/seaborn/rcmod.pyi +++ b/stubs/seaborn/seaborn/rcmod.pyi @@ -1,7 +1,7 @@ from _typeshed import Unused from collections.abc import Callable, Sequence -from typing import Any, TypeVar -from typing_extensions import Literal, deprecated +from typing import Any, Literal, TypeVar +from typing_extensions import deprecated from matplotlib.typing import ColorType diff --git a/stubs/seaborn/seaborn/regression.pyi b/stubs/seaborn/seaborn/regression.pyi index dc7586176246..b3e79b0e7aa5 100644 --- a/stubs/seaborn/seaborn/regression.pyi +++ b/stubs/seaborn/seaborn/regression.pyi @@ -1,7 +1,7 @@ from _typeshed import Incomplete from collections.abc import Callable, Iterable -from typing import Any, overload -from typing_extensions import Literal, TypeAlias +from typing import Any, Literal, overload +from typing_extensions import TypeAlias import pandas as pd from matplotlib.axes import Axes diff --git a/stubs/seaborn/seaborn/relational.pyi b/stubs/seaborn/seaborn/relational.pyi index 4cb846eb2a38..b9278199b324 100644 --- a/stubs/seaborn/seaborn/relational.pyi +++ b/stubs/seaborn/seaborn/relational.pyi @@ -1,7 +1,7 @@ from _typeshed import Incomplete from collections.abc import Iterable -from typing import Any -from typing_extensions import Literal, TypeAlias +from typing import Any, Literal +from typing_extensions import TypeAlias from matplotlib.axes import Axes from matplotlib.colors import Colormap diff --git a/stubs/seaborn/seaborn/utils.pyi b/stubs/seaborn/seaborn/utils.pyi index ca5219974728..008e27bbfbac 100644 --- a/stubs/seaborn/seaborn/utils.pyi +++ b/stubs/seaborn/seaborn/utils.pyi @@ -1,8 +1,8 @@ import datetime as dt from _typeshed import Incomplete, SupportsGetItem from collections.abc import Callable, Iterable, Mapping, Sequence -from typing import Any, TypeVar, overload -from typing_extensions import Literal, SupportsIndex, TypeAlias, deprecated +from typing import Any, Literal, SupportsIndex, TypeVar, overload +from typing_extensions import TypeAlias, deprecated import numpy as np import pandas as pd diff --git a/stubs/seaborn/seaborn/widgets.pyi b/stubs/seaborn/seaborn/widgets.pyi index d9e1214e08da..dd2f9702fff1 100644 --- a/stubs/seaborn/seaborn/widgets.pyi +++ b/stubs/seaborn/seaborn/widgets.pyi @@ -1,5 +1,4 @@ -from typing import overload -from typing_extensions import Literal +from typing import Literal, overload from matplotlib.colors import LinearSegmentedColormap diff --git a/stubs/setuptools/pkg_resources/__init__.pyi b/stubs/setuptools/pkg_resources/__init__.pyi index 43c21b8a7eb5..e26bd8142d6e 100644 --- a/stubs/setuptools/pkg_resources/__init__.pyi +++ b/stubs/setuptools/pkg_resources/__init__.pyi @@ -6,8 +6,8 @@ from abc import ABCMeta from collections.abc import Callable, Generator, Iterable, Iterator, Sequence from io import BytesIO from re import Pattern -from typing import IO, Any, ClassVar, Protocol, TypeVar, overload, type_check_only -from typing_extensions import Literal, Self, TypeAlias +from typing import IO, Any, ClassVar, Literal, Protocol, TypeVar, overload, type_check_only +from typing_extensions import Self, TypeAlias from ._vendored_packaging import requirements as packaging_requirements, version as packaging_version diff --git a/stubs/setuptools/pkg_resources/_vendored_packaging/version.pyi b/stubs/setuptools/pkg_resources/_vendored_packaging/version.pyi index e05866730dbe..05e45eea17c7 100644 --- a/stubs/setuptools/pkg_resources/_vendored_packaging/version.pyi +++ b/stubs/setuptools/pkg_resources/_vendored_packaging/version.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final __all__ = ["VERSION_PATTERN", "parse", "Version", "InvalidVersion"] diff --git a/stubs/setuptools/setuptools/_distutils/_modified.pyi b/stubs/setuptools/setuptools/_distutils/_modified.pyi index 39b853256ed4..b598c97ccaf0 100644 --- a/stubs/setuptools/setuptools/_distutils/_modified.pyi +++ b/stubs/setuptools/setuptools/_distutils/_modified.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Literal +from typing import Literal def newer(source, target): ... def newer_pairwise(sources, targets, newer=...): ... diff --git a/stubs/setuptools/setuptools/_distutils/filelist.pyi b/stubs/setuptools/setuptools/_distutils/filelist.pyi index d242be1c3e58..f46703d6d2b2 100644 --- a/stubs/setuptools/setuptools/_distutils/filelist.pyi +++ b/stubs/setuptools/setuptools/_distutils/filelist.pyi @@ -1,7 +1,6 @@ from collections.abc import Iterable from re import Pattern -from typing import overload -from typing_extensions import Literal +from typing import Literal, overload # class is entirely undocumented class FileList: diff --git a/stubs/setuptools/setuptools/_distutils/util.pyi b/stubs/setuptools/setuptools/_distutils/util.pyi index 6790712ffe25..690571438983 100644 --- a/stubs/setuptools/setuptools/_distutils/util.pyi +++ b/stubs/setuptools/setuptools/_distutils/util.pyi @@ -1,6 +1,5 @@ from collections.abc import Callable, Mapping -from typing import Any -from typing_extensions import Literal +from typing import Any, Literal def get_host_platform() -> str: ... def get_platform() -> str: ... diff --git a/stubs/setuptools/setuptools/command/easy_install.pyi b/stubs/setuptools/setuptools/command/easy_install.pyi index b5a455a8b80f..4960cd495a25 100644 --- a/stubs/setuptools/setuptools/command/easy_install.pyi +++ b/stubs/setuptools/setuptools/command/easy_install.pyi @@ -1,7 +1,7 @@ from _typeshed import Incomplete from collections.abc import Iterable, Iterator -from typing import ClassVar -from typing_extensions import Self, TypedDict +from typing import ClassVar, TypedDict +from typing_extensions import Self from pkg_resources import Environment diff --git a/stubs/setuptools/setuptools/command/egg_info.pyi b/stubs/setuptools/setuptools/command/egg_info.pyi index 39d7499abfcb..71c70568cc57 100644 --- a/stubs/setuptools/setuptools/command/egg_info.pyi +++ b/stubs/setuptools/setuptools/command/egg_info.pyi @@ -1,5 +1,6 @@ +from typing import Final + from _typeshed import Incomplete -from typing_extensions import Final from .. import Command, SetuptoolsDeprecationWarning from .._distutils.filelist import FileList as _FileList diff --git a/stubs/setuptools/setuptools/depends.pyi b/stubs/setuptools/setuptools/depends.pyi index 34c877298c96..c6376a641247 100644 --- a/stubs/setuptools/setuptools/depends.pyi +++ b/stubs/setuptools/setuptools/depends.pyi @@ -1,6 +1,5 @@ from _typeshed import Incomplete -from typing import IO, Any -from typing_extensions import Literal +from typing import IO, Any, Literal __all__ = ["Require", "find_module", "get_module_constant", "extract_constant"] diff --git a/stubs/setuptools/setuptools/sandbox.pyi b/stubs/setuptools/setuptools/sandbox.pyi index acae6699779f..9a7611d1dd71 100644 --- a/stubs/setuptools/setuptools/sandbox.pyi +++ b/stubs/setuptools/setuptools/sandbox.pyi @@ -1,7 +1,7 @@ import sys from types import TracebackType -from typing import Any -from typing_extensions import Literal, Self +from typing import Any, Literal +from typing_extensions import Self from ._distutils.errors import DistutilsError diff --git a/stubs/six/six/__init__.pyi b/stubs/six/six/__init__.pyi index d3de453e0c3b..6d1b6478543c 100644 --- a/stubs/six/six/__init__.pyi +++ b/stubs/six/six/__init__.pyi @@ -9,8 +9,7 @@ from functools import wraps as wraps from importlib.util import spec_from_loader as spec_from_loader from io import BytesIO as BytesIO, StringIO as StringIO from re import Pattern -from typing import Any, AnyStr, NoReturn, Protocol, TypeVar, overload -from typing_extensions import Literal +from typing import Any, AnyStr, Literal, NoReturn, Protocol, TypeVar, overload from six import moves as moves diff --git a/stubs/stripe/stripe/api_resources/search_result_object.pyi b/stubs/stripe/stripe/api_resources/search_result_object.pyi index 896a4e73da9b..1b163caf5b28 100644 --- a/stubs/stripe/stripe/api_resources/search_result_object.pyi +++ b/stubs/stripe/stripe/api_resources/search_result_object.pyi @@ -1,6 +1,6 @@ from collections.abc import Iterator -from typing import Any, ClassVar, Generic, TypeVar -from typing_extensions import Literal, Self +from typing import Any, ClassVar, Generic, Literal, TypeVar +from typing_extensions import Self from stripe.stripe_object import StripeObject diff --git a/stubs/stripe/stripe/api_resources/test_helpers/test_clock.pyi b/stubs/stripe/stripe/api_resources/test_helpers/test_clock.pyi index 4490704e74fa..bfdc53be1ef9 100644 --- a/stubs/stripe/stripe/api_resources/test_helpers/test_clock.pyi +++ b/stubs/stripe/stripe/api_resources/test_helpers/test_clock.pyi @@ -1,5 +1,5 @@ -from typing import Any -from typing_extensions import Literal, Self +from typing import Any, Literal +from typing_extensions import Self from stripe.api_resources.abstract import CreateableAPIResource, DeletableAPIResource, ListableAPIResource diff --git a/stubs/stripe/stripe/webhook.pyi b/stubs/stripe/stripe/webhook.pyi index 8374e9479d53..66907b35a647 100644 --- a/stubs/stripe/stripe/webhook.pyi +++ b/stubs/stripe/stripe/webhook.pyi @@ -1,6 +1,7 @@ -from typing_extensions import Literal +from typing import Literal -from stripe import Event, error as error +from stripe import Event +from stripe import error as error class Webhook: DEFAULT_TOLERANCE: int diff --git a/stubs/tabulate/tabulate/__init__.pyi b/stubs/tabulate/tabulate/__init__.pyi index 04089b683678..383c29242ea6 100644 --- a/stubs/tabulate/tabulate/__init__.pyi +++ b/stubs/tabulate/tabulate/__init__.pyi @@ -1,6 +1,6 @@ from collections.abc import Callable, Container, Iterable, Mapping, Sequence -from typing import Any, NamedTuple -from typing_extensions import Final, Self, TypeAlias +from typing import Any, Final, NamedTuple +from typing_extensions import Self, TypeAlias from .version import __version__ as __version__ diff --git a/stubs/tabulate/tabulate/version.pyi b/stubs/tabulate/tabulate/version.pyi index e77997710330..08615ffb79e6 100644 --- a/stubs/tabulate/tabulate/version.pyi +++ b/stubs/tabulate/tabulate/version.pyi @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final version: Final[str] __version__: Final[str] diff --git a/stubs/tensorflow/tensorflow/data/experimental.pyi b/stubs/tensorflow/tensorflow/data/experimental.pyi index 309d152aa731..2c921ba782df 100644 --- a/stubs/tensorflow/tensorflow/data/experimental.pyi +++ b/stubs/tensorflow/tensorflow/data/experimental.pyi @@ -1,7 +1,6 @@ from _typeshed import Incomplete from collections.abc import Callable, Sequence -from typing import TypeVar -from typing_extensions import Final +from typing import Final, TypeVar from tensorflow import Tensor, _TensorCompatible from tensorflow.data import Dataset diff --git a/stubs/tensorflow/tensorflow/io/__init__.pyi b/stubs/tensorflow/tensorflow/io/__init__.pyi index 74a67efd9ab5..172c79752ecd 100644 --- a/stubs/tensorflow/tensorflow/io/__init__.pyi +++ b/stubs/tensorflow/tensorflow/io/__init__.pyi @@ -1,8 +1,8 @@ from _typeshed import Incomplete from collections.abc import Iterable, Mapping from types import TracebackType -from typing import NamedTuple -from typing_extensions import Literal, Self, TypeAlias +from typing import Literal, NamedTuple +from typing_extensions import Self, TypeAlias from tensorflow import _DTypeLike, _ShapeLike, _TensorCompatible from tensorflow._aliases import TensorLike diff --git a/stubs/tensorflow/tensorflow/keras/losses.pyi b/stubs/tensorflow/tensorflow/keras/losses.pyi index 2e6e5675c9a5..e386709c9a55 100644 --- a/stubs/tensorflow/tensorflow/keras/losses.pyi +++ b/stubs/tensorflow/tensorflow/keras/losses.pyi @@ -1,8 +1,8 @@ from _typeshed import Incomplete from abc import ABC, abstractmethod from collections.abc import Callable -from typing import Any, TypeVar, overload -from typing_extensions import Final, Literal, Self, TypeAlias, TypeGuard +from typing import Any, Final, Literal, TypeVar, overload +from typing_extensions import Self, TypeAlias, TypeGuard from tensorflow import Tensor, _TensorCompatible from tensorflow._aliases import KerasSerializable diff --git a/stubs/tensorflow/tensorflow/python/feature_column/feature_column_v2.pyi b/stubs/tensorflow/tensorflow/python/feature_column/feature_column_v2.pyi index add916271c68..da690f0711d2 100644 --- a/stubs/tensorflow/tensorflow/python/feature_column/feature_column_v2.pyi +++ b/stubs/tensorflow/tensorflow/python/feature_column/feature_column_v2.pyi @@ -1,10 +1,12 @@ # The types here are all undocumented, but all feature columns are return types of the # public functions in tf.feature_column. As they are undocumented internals while some # common methods are included, they are incomplete and do not have getattr Incomplete fallback. + from _typeshed import Incomplete from abc import ABC, ABCMeta, abstractmethod from collections.abc import Callable, Sequence -from typing_extensions import Literal, Self, TypeAlias +from typing import Literal +from typing_extensions import Self, TypeAlias import tensorflow as tf from tensorflow import _ShapeLike diff --git a/stubs/tqdm/tqdm/std.pyi b/stubs/tqdm/tqdm/std.pyi index 87301daa5b5e..297b01784d10 100644 --- a/stubs/tqdm/tqdm/std.pyi +++ b/stubs/tqdm/tqdm/std.pyi @@ -2,8 +2,8 @@ import contextlib from _typeshed import Incomplete, SupportsWrite from collections.abc import Callable, Iterable, Iterator, Mapping, MutableMapping from types import TracebackType -from typing import Any, ClassVar, Generic, NoReturn, TypeVar, overload -from typing_extensions import Literal, Self +from typing import Any, ClassVar, Generic, Literal, NoReturn, TypeVar, overload +from typing_extensions import Self from ._monitor import TMonitor from .utils import Comparable diff --git a/stubs/tree-sitter/tree_sitter/binding.pyi b/stubs/tree-sitter/tree_sitter/binding.pyi index f1c713e98be3..f3b72c5471d0 100644 --- a/stubs/tree-sitter/tree_sitter/binding.pyi +++ b/stubs/tree-sitter/tree_sitter/binding.pyi @@ -1,5 +1,4 @@ -from typing import Any, ClassVar -from typing_extensions import final +from typing import Any, ClassVar, Final from tree_sitter import Language diff --git a/stubs/uWSGI/uwsgi.pyi b/stubs/uWSGI/uwsgi.pyi index 605ca56f24cb..1b9380e778d4 100644 --- a/stubs/uWSGI/uwsgi.pyi +++ b/stubs/uWSGI/uwsgi.pyi @@ -2,8 +2,8 @@ from _typeshed import HasFileno, OptExcInfo, ReadOnlyBuffer from _typeshed.wsgi import WSGIApplication from collections.abc import Callable from types import ModuleType -from typing import Any, Protocol, overload -from typing_extensions import Literal, Self, TypeAlias, final +from typing import Any, Literal, Protocol, final, overload +from typing_extensions import Self, TypeAlias import uwsgidecorators diff --git a/stubs/uWSGI/uwsgidecorators.pyi b/stubs/uWSGI/uwsgidecorators.pyi index 4936f57e0d09..85767b979460 100644 --- a/stubs/uWSGI/uwsgidecorators.pyi +++ b/stubs/uWSGI/uwsgidecorators.pyi @@ -1,6 +1,6 @@ from collections.abc import Callable -from typing import Any, Generic, TypeVar, overload -from typing_extensions import Literal, ParamSpec +from typing import Any, Generic, Literal, TypeVar, overload +from typing_extensions import ParamSpec from uwsgi import _RPCCallable diff --git a/stubs/vobject/vobject/base.pyi b/stubs/vobject/vobject/base.pyi index 556f5e727cfb..351f093ab589 100644 --- a/stubs/vobject/vobject/base.pyi +++ b/stubs/vobject/vobject/base.pyi @@ -1,8 +1,7 @@ import logging from _typeshed import Incomplete, SupportsWrite from collections.abc import Iterable, Iterator -from typing import Any, TypeVar, overload -from typing_extensions import Literal +from typing import Any, Literal, TypeVar, overload logger: logging.Logger DEBUG: bool diff --git a/stubs/waitress/waitress/buffers.pyi b/stubs/waitress/waitress/buffers.pyi index 1c808d75a007..940c013e853e 100644 --- a/stubs/waitress/waitress/buffers.pyi +++ b/stubs/waitress/waitress/buffers.pyi @@ -1,6 +1,5 @@ from io import BufferedIOBase, BufferedRandom, BytesIO -from typing import Any -from typing_extensions import Literal +from typing import Any, Literal COPY_BYTES: int STRBUF_LIMIT: int diff --git a/stubs/waitress/waitress/compat.pyi b/stubs/waitress/waitress/compat.pyi index e0bb2a304c34..30e994ad81fb 100644 --- a/stubs/waitress/waitress/compat.pyi +++ b/stubs/waitress/waitress/compat.pyi @@ -1,6 +1,5 @@ from io import TextIOWrapper -from typing import Any -from typing_extensions import Literal +from typing import Any, Literal PY2: Literal[False] PY3: Literal[True] diff --git a/stubs/waitress/waitress/trigger.pyi b/stubs/waitress/waitress/trigger.pyi index ae7f82229073..eae488ef6f91 100644 --- a/stubs/waitress/waitress/trigger.pyi +++ b/stubs/waitress/waitress/trigger.pyi @@ -2,7 +2,7 @@ import sys from collections.abc import Callable, Mapping from socket import socket from threading import Lock -from typing_extensions import Literal +from typing import Literal from waitress import wasyncore as wasyncore diff --git a/stubs/zxcvbn/zxcvbn/__init__.pyi b/stubs/zxcvbn/zxcvbn/__init__.pyi index e2872e1f94c6..6bb51518865f 100644 --- a/stubs/zxcvbn/zxcvbn/__init__.pyi +++ b/stubs/zxcvbn/zxcvbn/__init__.pyi @@ -1,7 +1,7 @@ import datetime from collections.abc import Iterable from decimal import Decimal -from typing_extensions import TypedDict +from typing import TypedDict from .feedback import _Feedback from .matching import _Match diff --git a/stubs/zxcvbn/zxcvbn/feedback.pyi b/stubs/zxcvbn/zxcvbn/feedback.pyi index 31b8e63b9837..1258af31330c 100644 --- a/stubs/zxcvbn/zxcvbn/feedback.pyi +++ b/stubs/zxcvbn/zxcvbn/feedback.pyi @@ -1,5 +1,5 @@ from collections.abc import Sequence -from typing_extensions import Literal, TypedDict +from typing import Literal, TypedDict from .matching import _Match diff --git a/stubs/zxcvbn/zxcvbn/matching.pyi b/stubs/zxcvbn/zxcvbn/matching.pyi index 8d7871346b1e..7aba63bad5d5 100644 --- a/stubs/zxcvbn/zxcvbn/matching.pyi +++ b/stubs/zxcvbn/zxcvbn/matching.pyi @@ -1,8 +1,8 @@ from collections.abc import Iterable, Mapping from decimal import Decimal from re import Pattern -from typing import Any -from typing_extensions import Literal, NotRequired, TypedDict +from typing import Any, Literal, TypedDict +from typing_extensions import NotRequired from .adjacency_graphs import _Graph diff --git a/stubs/zxcvbn/zxcvbn/scoring.pyi b/stubs/zxcvbn/zxcvbn/scoring.pyi index fff6a6a5666c..9aafe968a3b1 100644 --- a/stubs/zxcvbn/zxcvbn/scoring.pyi +++ b/stubs/zxcvbn/zxcvbn/scoring.pyi @@ -1,7 +1,7 @@ from collections.abc import Iterable from decimal import Decimal from re import Pattern -from typing_extensions import TypedDict +from typing import TypedDict from .adjacency_graphs import _Graph from .matching import _Match diff --git a/stubs/zxcvbn/zxcvbn/time_estimates.pyi b/stubs/zxcvbn/zxcvbn/time_estimates.pyi index deafec4678a7..71e2b3671850 100644 --- a/stubs/zxcvbn/zxcvbn/time_estimates.pyi +++ b/stubs/zxcvbn/zxcvbn/time_estimates.pyi @@ -1,5 +1,5 @@ from decimal import Decimal -from typing_extensions import Literal, TypedDict +from typing import Literal, TypedDict class _TimeEstimate(TypedDict): crack_times_seconds: _CrackTimeSeconds From bffcd436e00bd7858cd333f5e823695f26b0937e Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 5 Jan 2024 12:24:48 +0000 Subject: [PATCH 2/5] [pre-commit.ci] auto fixes from pre-commit.com hooks --- stubs/fpdf2/fpdf/table.pyi | 2 +- stubs/gevent/gevent/os.pyi | 3 +-- stubs/keyboard/keyboard/_keyboard_event.pyi | 3 +-- stubs/netaddr/netaddr/strategy/ipv4.pyi | 5 ++--- stubs/psutil/psutil/_compat.pyi | 21 ++++++++++--------- .../PyInstaller/depend/imphookapi.pyi | 2 +- stubs/python-xlib/Xlib/support/connect.pyi | 4 +--- .../python-xlib/Xlib/support/vms_connect.pyi | 2 +- stubs/pywin32/win32/win32print.pyi | 2 +- stubs/pyxdg/xdg/DesktopEntry.pyi | 2 +- stubs/pyxdg/xdg/Menu.pyi | 3 +-- stubs/redis/redis/ocsp.pyi | 2 +- .../setuptools/command/egg_info.pyi | 3 +-- stubs/stripe/stripe/webhook.pyi | 3 +-- stubs/tree-sitter/tree_sitter/binding.pyi | 2 +- 15 files changed, 26 insertions(+), 33 deletions(-) diff --git a/stubs/fpdf2/fpdf/table.pyi b/stubs/fpdf2/fpdf/table.pyi index 68aac2d6843a..563c18a3774c 100644 --- a/stubs/fpdf2/fpdf/table.pyi +++ b/stubs/fpdf2/fpdf/table.pyi @@ -1,9 +1,9 @@ +from _typeshed import Incomplete from collections.abc import Iterable from dataclasses import dataclass from io import BytesIO from typing import Literal -from _typeshed import Incomplete from PIL import Image from .drawing import DeviceGray, DeviceRGB diff --git a/stubs/gevent/gevent/os.pyi b/stubs/gevent/gevent/os.pyi index 915f1e3fcf86..b2c6c4145702 100644 --- a/stubs/gevent/gevent/os.pyi +++ b/stubs/gevent/gevent/os.pyi @@ -1,10 +1,9 @@ import os import sys +from _typeshed import FileDescriptor, Incomplete, ReadableBuffer from collections.abc import Callable from typing import Literal -from _typeshed import FileDescriptor, Incomplete, ReadableBuffer - def tp_read(fd: FileDescriptor, n: int) -> bytes: ... def tp_write(fd: FileDescriptor, buf: ReadableBuffer) -> int: ... diff --git a/stubs/keyboard/keyboard/_keyboard_event.pyi b/stubs/keyboard/keyboard/_keyboard_event.pyi index e8614c816667..94746c56abba 100644 --- a/stubs/keyboard/keyboard/_keyboard_event.pyi +++ b/stubs/keyboard/keyboard/_keyboard_event.pyi @@ -1,7 +1,6 @@ from typing import Literal -from ._canonical_names import canonical_names as canonical_names -from ._canonical_names import normalize_name as normalize_name +from ._canonical_names import canonical_names as canonical_names, normalize_name as normalize_name KEY_DOWN: Literal["down"] KEY_UP: Literal["up"] diff --git a/stubs/netaddr/netaddr/strategy/ipv4.pyi b/stubs/netaddr/netaddr/strategy/ipv4.pyi index 335800c2f00b..b9510c4ed763 100644 --- a/stubs/netaddr/netaddr/strategy/ipv4.pyi +++ b/stubs/netaddr/netaddr/strategy/ipv4.pyi @@ -1,10 +1,9 @@ +from _typeshed import Unused from collections.abc import Iterable, Sequence from socket import AddressFamily from typing import Literal -from _typeshed import Unused -from netaddr.core import INET_PTON as INET_PTON -from netaddr.core import ZEROFILL as ZEROFILL +from netaddr.core import INET_PTON as INET_PTON, ZEROFILL as ZEROFILL width: Literal[32] word_size: Literal[8] diff --git a/stubs/psutil/psutil/_compat.pyi b/stubs/psutil/psutil/_compat.pyi index c1adc4c40b2d..49fd9562162e 100644 --- a/stubs/psutil/psutil/_compat.pyi +++ b/stubs/psutil/psutil/_compat.pyi @@ -1,15 +1,16 @@ -from builtins import ChildProcessError as ChildProcessError -from builtins import FileExistsError as FileExistsError -from builtins import FileNotFoundError as FileNotFoundError -from builtins import InterruptedError as InterruptedError -from builtins import PermissionError as PermissionError -from builtins import ProcessLookupError as ProcessLookupError -from builtins import range as range -from builtins import super as super +from builtins import ( + ChildProcessError as ChildProcessError, + FileExistsError as FileExistsError, + FileNotFoundError as FileNotFoundError, + InterruptedError as InterruptedError, + PermissionError as PermissionError, + ProcessLookupError as ProcessLookupError, + range as range, + super as super, +) from contextlib import redirect_stderr as redirect_stderr from functools import lru_cache as lru_cache -from shutil import get_terminal_size as get_terminal_size -from shutil import which as which +from shutil import get_terminal_size as get_terminal_size, which as which from subprocess import TimeoutExpired from typing import Literal diff --git a/stubs/pyinstaller/PyInstaller/depend/imphookapi.pyi b/stubs/pyinstaller/PyInstaller/depend/imphookapi.pyi index 545827bedb26..9406c2dfdb07 100644 --- a/stubs/pyinstaller/PyInstaller/depend/imphookapi.pyi +++ b/stubs/pyinstaller/PyInstaller/depend/imphookapi.pyi @@ -2,11 +2,11 @@ # Nothing in this module is meant to be initialized externally. # Instances are exposed through hooks during build. +from _typeshed import StrOrBytesPath from collections.abc import Generator, Iterable from types import CodeType from typing import Literal -from _typeshed import StrOrBytesPath from PyInstaller.building.build_main import Analysis from PyInstaller.building.datastruct import TOC from PyInstaller.depend.analysis import PyiModuleGraph diff --git a/stubs/python-xlib/Xlib/support/connect.pyi b/stubs/python-xlib/Xlib/support/connect.pyi index 3a9346fb0368..7aa8e41c5baf 100644 --- a/stubs/python-xlib/Xlib/support/connect.pyi +++ b/stubs/python-xlib/Xlib/support/connect.pyi @@ -1,8 +1,6 @@ # Ignore OpenVMS in typeshed from typing import Final -from Xlib.support.unix_connect import get_auth as get_auth -from Xlib.support.unix_connect import get_display as get_display -from Xlib.support.unix_connect import get_socket as get_socket +from Xlib.support.unix_connect import get_auth as get_auth, get_display as get_display, get_socket as get_socket platform: Final[str] diff --git a/stubs/python-xlib/Xlib/support/vms_connect.pyi b/stubs/python-xlib/Xlib/support/vms_connect.pyi index bbf5ea055e0b..adbb6f4840c4 100644 --- a/stubs/python-xlib/Xlib/support/vms_connect.pyi +++ b/stubs/python-xlib/Xlib/support/vms_connect.pyi @@ -1,8 +1,8 @@ +from _socket import _Address from re import Pattern from socket import socket from typing import Final -from _socket import _Address from Xlib._typing import Unused display_re: Final[Pattern[str]] diff --git a/stubs/pywin32/win32/win32print.pyi b/stubs/pywin32/win32/win32print.pyi index ce25e06b44d7..9655e4b97714 100644 --- a/stubs/pywin32/win32/win32print.pyi +++ b/stubs/pywin32/win32/win32print.pyi @@ -1,7 +1,7 @@ +from _typeshed import Incomplete from typing import Literal import _win32typing -from _typeshed import Incomplete def OpenPrinter(printer: str, Defaults: Incomplete | None = ...) -> _win32typing.PyPrinterHANDLE: ... def GetPrinter(hPrinter: _win32typing.PyPrinterHANDLE, Level: int = ...): ... diff --git a/stubs/pyxdg/xdg/DesktopEntry.pyi b/stubs/pyxdg/xdg/DesktopEntry.pyi index bc63b306c495..251066b67c46 100644 --- a/stubs/pyxdg/xdg/DesktopEntry.pyi +++ b/stubs/pyxdg/xdg/DesktopEntry.pyi @@ -1,7 +1,7 @@ import re +from _typeshed import StrPath from typing import Literal -from _typeshed import StrPath from xdg.IniFile import IniFile class DesktopEntry(IniFile): diff --git a/stubs/pyxdg/xdg/Menu.pyi b/stubs/pyxdg/xdg/Menu.pyi index cb9f48495d72..77738a4615a7 100644 --- a/stubs/pyxdg/xdg/Menu.pyi +++ b/stubs/pyxdg/xdg/Menu.pyi @@ -1,11 +1,10 @@ import ast import xml.dom +from _typeshed import Unused from collections.abc import Collection, Iterable, Iterator from types import CodeType from typing import Literal -from _typeshed import Unused - from .DesktopEntry import DesktopEntry DELETED: Literal["Deleted"] = "Deleted" diff --git a/stubs/redis/redis/ocsp.pyi b/stubs/redis/redis/ocsp.pyi index 0d3e25e77da6..5fc72e08e073 100644 --- a/stubs/redis/redis/ocsp.pyi +++ b/stubs/redis/redis/ocsp.pyi @@ -1,7 +1,7 @@ +from _typeshed import Incomplete from ssl import SSLObject, SSLSocket from typing import Literal -from _typeshed import Incomplete from cryptography.x509.base import Certificate from OpenSSL.SSL import Connection diff --git a/stubs/setuptools/setuptools/command/egg_info.pyi b/stubs/setuptools/setuptools/command/egg_info.pyi index 71c70568cc57..594159d8dc66 100644 --- a/stubs/setuptools/setuptools/command/egg_info.pyi +++ b/stubs/setuptools/setuptools/command/egg_info.pyi @@ -1,6 +1,5 @@ -from typing import Final - from _typeshed import Incomplete +from typing import Final from .. import Command, SetuptoolsDeprecationWarning from .._distutils.filelist import FileList as _FileList diff --git a/stubs/stripe/stripe/webhook.pyi b/stubs/stripe/stripe/webhook.pyi index 66907b35a647..a66cf293f6f9 100644 --- a/stubs/stripe/stripe/webhook.pyi +++ b/stubs/stripe/stripe/webhook.pyi @@ -1,7 +1,6 @@ from typing import Literal -from stripe import Event -from stripe import error as error +from stripe import Event, error as error class Webhook: DEFAULT_TOLERANCE: int diff --git a/stubs/tree-sitter/tree_sitter/binding.pyi b/stubs/tree-sitter/tree_sitter/binding.pyi index f3b72c5471d0..7f0b55af37d8 100644 --- a/stubs/tree-sitter/tree_sitter/binding.pyi +++ b/stubs/tree-sitter/tree_sitter/binding.pyi @@ -1,4 +1,4 @@ -from typing import Any, ClassVar, Final +from typing import Any, ClassVar from tree_sitter import Language From 6f20d1a4c88dadb97e05148f78740c55887c93f3 Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Fri, 5 Jan 2024 13:39:09 +0100 Subject: [PATCH 3/5] Fix Never import --- stubs/pywin32/win32/lib/pywintypes.pyi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stubs/pywin32/win32/lib/pywintypes.pyi b/stubs/pywin32/win32/lib/pywintypes.pyi index aa78179670aa..09e83221152b 100644 --- a/stubs/pywin32/win32/lib/pywintypes.pyi +++ b/stubs/pywin32/win32/lib/pywintypes.pyi @@ -2,7 +2,8 @@ # "KeyError: 'pywintypes'" from _typeshed import Incomplete from datetime import datetime -from typing import Literal, Never, NoReturn +from typing import Literal, NoReturn +from typing_extensions import Never import _win32typing From 6ea0b6f1773baadac9d049a69a30ec4fab63a650 Mon Sep 17 00:00:00 2001 From: Alex Waygood Date: Fri, 5 Jan 2024 13:33:38 +0000 Subject: [PATCH 4/5] fix tree-sitter --- stubs/tree-sitter/tree_sitter/binding.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/tree-sitter/tree_sitter/binding.pyi b/stubs/tree-sitter/tree_sitter/binding.pyi index 7f0b55af37d8..30e988f8683c 100644 --- a/stubs/tree-sitter/tree_sitter/binding.pyi +++ b/stubs/tree-sitter/tree_sitter/binding.pyi @@ -1,4 +1,4 @@ -from typing import Any, ClassVar +from typing import Any, ClassVar, final from tree_sitter import Language From daa0270477a77547c2eadd3051d03969f3532ab6 Mon Sep 17 00:00:00 2001 From: Alex Waygood Date: Fri, 5 Jan 2024 13:50:02 +0000 Subject: [PATCH 5/5] don't import `assert_type` from typing --- stubs/openpyxl/@tests/test_cases/check_base_descriptors.py | 3 ++- stubs/openpyxl/@tests/test_cases/check_nested_descriptors.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/stubs/openpyxl/@tests/test_cases/check_base_descriptors.py b/stubs/openpyxl/@tests/test_cases/check_base_descriptors.py index 0bbbb9877155..e70bb149ce2e 100644 --- a/stubs/openpyxl/@tests/test_cases/check_base_descriptors.py +++ b/stubs/openpyxl/@tests/test_cases/check_base_descriptors.py @@ -4,7 +4,8 @@ from _typeshed import ReadableBuffer from datetime import date, datetime, time -from typing import Any, List, Literal, Tuple, Union, assert_type +from typing import Any, List, Literal, Tuple, Union +from typing_extensions import assert_type from openpyxl.descriptors import Strict from openpyxl.descriptors.base import ( diff --git a/stubs/openpyxl/@tests/test_cases/check_nested_descriptors.py b/stubs/openpyxl/@tests/test_cases/check_nested_descriptors.py index a439d2665ffb..89f88fda27c9 100644 --- a/stubs/openpyxl/@tests/test_cases/check_nested_descriptors.py +++ b/stubs/openpyxl/@tests/test_cases/check_nested_descriptors.py @@ -4,7 +4,8 @@ # These tests are essentially a mirror of check_base_descriptors from __future__ import annotations -from typing import Literal, Union, assert_type, cast +from typing import Literal, Union, cast +from typing_extensions import assert_type from openpyxl.descriptors import Strict from openpyxl.descriptors.nested import (