From f632045b575330b735656a4369f9cd77768c6211 Mon Sep 17 00:00:00 2001 From: Ali Hamdan Date: Sat, 18 May 2024 19:21:51 +0200 Subject: [PATCH 1/3] Use assignments for enums in pillow and pygit2 --- stubs/Pillow/PIL/DdsImagePlugin.pyi | 35 +- stubs/Pillow/PIL/Image.pyi | 58 +-- stubs/Pillow/PIL/_binary.pyi | 26 +- stubs/pygit2/pygit2/enums.pyi | 628 ++++++++++++++-------------- 4 files changed, 374 insertions(+), 373 deletions(-) diff --git a/stubs/Pillow/PIL/DdsImagePlugin.pyi b/stubs/Pillow/PIL/DdsImagePlugin.pyi index c5e981e58059..cce330742983 100644 --- a/stubs/Pillow/PIL/DdsImagePlugin.pyi +++ b/stubs/Pillow/PIL/DdsImagePlugin.pyi @@ -1,6 +1,7 @@ from enum import IntEnum, IntFlag from typing import ClassVar, Final, Literal +from ._binary import i32le as i32 from .ImageFile import ImageFile, PyDecoder DDS_MAGIC: Final = 0x20534444 @@ -218,23 +219,23 @@ class D3DFMT(IntEnum): A2B10G10R10_XR_BIAS = 119 BINARYBUFFER = 199 - UYVY: int - R8G8_B8G8: int - YUY2: int - G8R8_G8B8: int - DXT1: int - DXT2: int - DXT3: int - DXT4: int - DXT5: int - DX10: int - BC4S: int - BC4U: int - BC5S: int - BC5U: int - ATI1: int - ATI2: int - MULTI2_ARGB8: int + UYVY = i32(b"UYVY") + R8G8_B8G8 = i32(b"RGBG") + YUY2 = i32(b"YUY2") + G8R8_G8B8 = i32(b"GRGB") + DXT1 = i32(b"DXT1") + DXT2 = i32(b"DXT2") + DXT3 = i32(b"DXT3") + DXT4 = i32(b"DXT4") + DXT5 = i32(b"DXT5") + DX10 = i32(b"DX10") + BC4S = i32(b"BC4S") + BC4U = i32(b"BC4U") + BC5S = i32(b"BC5S") + BC5U = i32(b"BC5U") + ATI1 = i32(b"ATI1") + ATI2 = i32(b"ATI2") + MULTI2_ARGB8 = i32(b"MET1") DDSD_CAPS: Final = 0x1 DDSD_HEIGHT: Final = 0x2 diff --git a/stubs/Pillow/PIL/Image.pyi b/stubs/Pillow/PIL/Image.pyi index 3fabab0b6475..3e9a2cc4e871 100644 --- a/stubs/Pillow/PIL/Image.pyi +++ b/stubs/Pillow/PIL/Image.pyi @@ -2,7 +2,7 @@ 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, Literal, Protocol, SupportsBytes +from typing import Any, ClassVar, Final, Literal, Protocol, SupportsBytes from typing_extensions import Self, TypeAlias, TypeGuard from PIL.PyAccess import PyAccess @@ -65,13 +65,13 @@ class Transpose(IntEnum): TRANSVERSE = 6 # All Transpose items -FLIP_LEFT_RIGHT: Literal[0] -FLIP_TOP_BOTTOM: Literal[1] -ROTATE_90: Literal[2] -ROTATE_180: Literal[3] -ROTATE_270: Literal[4] -TRANSPOSE: Literal[5] -TRANSVERSE: Literal[6] +FLIP_LEFT_RIGHT: Final = 0 +FLIP_TOP_BOTTOM: Final = 1 +ROTATE_90: Final = 2 +ROTATE_180: Final = 3 +ROTATE_270: Final = 4 +TRANSPOSE: Final = 5 +TRANSVERSE: Final = 6 class Transform(IntEnum): AFFINE = 0 @@ -81,11 +81,11 @@ class Transform(IntEnum): MESH = 4 # All Transform items -AFFINE: Literal[0] -EXTENT: Literal[1] -PERSPECTIVE: Literal[2] -QUAD: Literal[3] -MESH: Literal[4] +AFFINE: Final = 0 +EXTENT: Final = 1 +PERSPECTIVE: Final = 2 +QUAD: Final = 3 +MESH: Final = 4 class Resampling(IntEnum): NEAREST = 0 @@ -96,12 +96,12 @@ class Resampling(IntEnum): HAMMING = 5 # All Resampling items -NEAREST: Literal[0] -LANCZOS: Literal[1] -BILINEAR: Literal[2] -BICUBIC: Literal[3] -BOX: Literal[4] -HAMMING: Literal[5] +NEAREST: Final = 0 +LANCZOS: Final = 1 +BILINEAR: Final = 2 +BICUBIC: Final = 3 +BOX: Final = 4 +HAMMING: Final = 5 class Dither(IntEnum): NONE = 0 @@ -110,18 +110,18 @@ class Dither(IntEnum): FLOYDSTEINBERG = 3 # All Dither items -NONE: Literal[0] -ORDERED: Literal[1] -RASTERIZE: Literal[2] -FLOYDSTEINBERG: Literal[3] +NONE: Final = 0 +ORDERED: Final = 1 +RASTERIZE: Final = 2 +FLOYDSTEINBERG: Final = 3 class Palette(IntEnum): WEB = 0 ADAPTIVE = 1 # All Palette items -WEB: Literal[0] -ADAPTIVE: Literal[1] +WEB: Final = 0 +ADAPTIVE: Final = 1 class Quantize(IntEnum): MEDIANCUT = 0 @@ -130,10 +130,10 @@ class Quantize(IntEnum): LIBIMAGEQUANT = 3 # All Quantize items -MEDIANCUT: Literal[0] -MAXCOVERAGE: Literal[1] -FASTOCTREE: Literal[2] -LIBIMAGEQUANT: Literal[3] +MEDIANCUT: Final = 0 +MAXCOVERAGE: Final = 1 +FASTOCTREE: Final = 2 +LIBIMAGEQUANT: Final = 3 ID: list[str] OPEN: dict[str, Any] diff --git a/stubs/Pillow/PIL/_binary.pyi b/stubs/Pillow/PIL/_binary.pyi index 0dc99fc488da..f2808e982e45 100644 --- a/stubs/Pillow/PIL/_binary.pyi +++ b/stubs/Pillow/PIL/_binary.pyi @@ -1,13 +1,13 @@ -def i8(c): ... -def o8(i): ... -def i16le(c, o: int = 0): ... -def si16le(c, o: int = 0): ... -def si16be(c, o: int = 0): ... -def i32le(c, o: int = 0): ... -def si32le(c, o: int = 0): ... -def i16be(c, o: int = 0): ... -def i32be(c, o: int = 0): ... -def o16le(i): ... -def o32le(i): ... -def o16be(i): ... -def o32be(i): ... +def i8(c: bytes) -> int: ... +def o8(i: int) -> bytes: ... +def i16le(c: bytes, o: int = 0) -> int: ... +def si16le(c: bytes, o: int = 0) -> int: ... +def si16be(c: bytes, o: int = 0) -> int: ... +def i32le(c: bytes, o: int = 0) -> int: ... +def si32le(c: bytes, o: int = 0) -> int: ... +def i16be(c: bytes, o: int = 0) -> int: ... +def i32be(c: bytes, o: int = 0) -> int: ... +def o16le(i: int) -> bytes: ... +def o32le(i: int) -> bytes: ... +def o16be(i: int) -> bytes: ... +def o32be(i: int) -> bytes: ... diff --git a/stubs/pygit2/pygit2/enums.pyi b/stubs/pygit2/pygit2/enums.pyi index 5d74ba900cbc..021ecc433ec0 100644 --- a/stubs/pygit2/pygit2/enums.pyi +++ b/stubs/pygit2/pygit2/enums.pyi @@ -1,395 +1,395 @@ from enum import IntEnum, IntFlag class ApplyLocation(IntEnum): - WORKDIR: int - INDEX: int - BOTH: int + WORKDIR = 0 + INDEX = 1 + BOTH = 2 class AttrCheck(IntFlag): - FILE_THEN_INDEX: int - INDEX_THEN_FILE: int - INDEX_ONLY: int - NO_SYSTEM: int - INCLUDE_HEAD: int - INCLUDE_COMMIT: int + FILE_THEN_INDEX = 0x0 + INDEX_THEN_FILE = 0x1 + INDEX_ONLY = 0x2 + NO_SYSTEM = 0x4 + INCLUDE_HEAD = 0x8 + INCLUDE_COMMIT = 0x10 class BlameFlag(IntFlag): - NORMAL: int - TRACK_COPIES_SAME_FILE: int - TRACK_COPIES_SAME_COMMIT_MOVES: int - TRACK_COPIES_SAME_COMMIT_COPIES: int - TRACK_COPIES_ANY_COMMIT_COPIES: int - FIRST_PARENT: int - USE_MAILMAP: int - IGNORE_WHITESPACE: int + NORMAL = 0x0 + TRACK_COPIES_SAME_FILE = 0x1 + TRACK_COPIES_SAME_COMMIT_MOVES = 0x2 + TRACK_COPIES_SAME_COMMIT_COPIES = 0x4 + TRACK_COPIES_ANY_COMMIT_COPIES = 0x8 + FIRST_PARENT = 0x10 + USE_MAILMAP = 0x20 + IGNORE_WHITESPACE = 0x40 class BlobFilter(IntFlag): - CHECK_FOR_BINARY: int - NO_SYSTEM_ATTRIBUTES: int - ATTRIBUTES_FROM_HEAD: int - ATTRIBUTES_FROM_COMMIT: int + CHECK_FOR_BINARY = 0x1 + NO_SYSTEM_ATTRIBUTES = 0x2 + ATTRIBUTES_FROM_HEAD = 0x4 + ATTRIBUTES_FROM_COMMIT = 0x8 class BranchType(IntFlag): - LOCAL: int - REMOTE: int - ALL: int + LOCAL = 0x1 + REMOTE = 0x2 + ALL = 0x3 class CheckoutNotify(IntFlag): - NONE: int - CONFLICT: int - DIRTY: int - UPDATED: int - UNTRACKED: int - IGNORED: int - ALL: int + NONE = 0x0 + CONFLICT = 0x1 + DIRTY = 0x2 + UPDATED = 0x4 + UNTRACKED = 0x8 + IGNORED = 0x8 + ALL = 0xFFFF class CheckoutStrategy(IntFlag): - NONE: int - SAFE: int - FORCE: int - RECREATE_MISSING: int - ALLOW_CONFLICTS: int - REMOVE_UNTRACKED: int - REMOVE_IGNORED: int - UPDATE_ONLY: int - DONT_UPDATE_INDEX: int - NO_REFRESH: int - SKIP_UNMERGED: int - USE_OURS: int - USE_THEIRS: int - DISABLE_PATHSPEC_MATCH: int - SKIP_LOCKED_DIRECTORIES: int - DONT_OVERWRITE_IGNORED: int - CONFLICT_STYLE_MERGE: int - CONFLICT_STYLE_DIFF3: int - DONT_REMOVE_EXISTING: int - DONT_WRITE_INDEX: int - DRY_RUN: int - CONFLICT_STYLE_ZDIFF3: int + NONE = 0x0 + SAFE = 0x1 + FORCE = 0x2 + RECREATE_MISSING = 0x4 + ALLOW_CONFLICTS = 0x10 + REMOVE_UNTRACKED = 0x20 + REMOVE_IGNORED = 0x40 + UPDATE_ONLY = 0x80 + DONT_UPDATE_INDEX = 0x100 + NO_REFRESH = 0x200 + SKIP_UNMERGED = 0x400 + USE_OURS = 0x800 + USE_THEIRS = 0x1000 + DISABLE_PATHSPEC_MATCH = 0x2000 + SKIP_LOCKED_DIRECTORIES = 0x40000 + DONT_OVERWRITE_IGNORED = 0x80000 + CONFLICT_STYLE_MERGE = 0x100000 + CONFLICT_STYLE_DIFF3 = 0x200000 + DONT_REMOVE_EXISTING = 0x400000 + DONT_WRITE_INDEX = 0x800000 + DRY_RUN = 0x1000000 + CONFLICT_STYLE_ZDIFF3 = 0x200000 class ConfigLevel(IntEnum): - PROGRAMDATA: int - SYSTEM: int - XDG: int - GLOBAL: int - LOCAL: int - APP: int - HIGHEST_LEVEL: int + PROGRAMDATA = 1 + SYSTEM = 2 + XDG = 3 + GLOBAL = 4 + LOCAL = 5 + APP = 6 + HIGHEST_LEVEL = -1 class CredentialType(IntFlag): - USERPASS_PLAINTEXT: int - SSH_KEY: int - SSH_CUSTOM: int - DEFAULT: int - SSH_INTERACTIVE: int - USERNAME: int - SSH_MEMORY: int + USERPASS_PLAINTEXT = 0x1 + SSH_KEY = 0x2 + SSH_CUSTOM = 0x4 + DEFAULT = 0x8 + SSH_INTERACTIVE = 0x10 + USERNAME = 0x20 + SSH_MEMORY = 0x40 class DeltaStatus(IntEnum): - UNMODIFIED: int - ADDED: int - DELETED: int - MODIFIED: int - RENAMED: int - COPIED: int - IGNORED: int - UNTRACKED: int - TYPECHANGE: int - UNREADABLE: int - CONFLICTED: int + UNMODIFIED = 0 + ADDED = 1 + DELETED = 2 + MODIFIED = 3 + RENAMED = 4 + COPIED = 5 + IGNORED = 6 + UNTRACKED = 7 + TYPECHANGE = 8 + UNREADABLE = 9 + CONFLICTED = 10 class DescribeStrategy(IntEnum): - DEFAULT: int - TAGS: int - ALL: int + DEFAULT = 0 + TAGS = 1 + ALL = 2 class DiffFind(IntFlag): - FIND_BY_CONFIG: int - FIND_RENAMES: int - FIND_RENAMES_FROM_REWRITES: int - FIND_COPIES: int - FIND_COPIES_FROM_UNMODIFIED: int - FIND_REWRITES: int - BREAK_REWRITES: int - FIND_AND_BREAK_REWRITES: int - FIND_FOR_UNTRACKED: int - FIND_ALL: int - FIND_IGNORE_LEADING_WHITESPACE: int - FIND_IGNORE_WHITESPACE: int - FIND_DONT_IGNORE_WHITESPACE: int - FIND_EXACT_MATCH_ONLY: int - BREAK_REWRITES_FOR_RENAMES_ONLY: int - FIND_REMOVE_UNMODIFIED: int + FIND_BY_CONFIG = 0x0 + FIND_RENAMES = 0x1 + FIND_RENAMES_FROM_REWRITES = 0x2 + FIND_COPIES = 0x4 + FIND_COPIES_FROM_UNMODIFIED = 0x8 + FIND_REWRITES = 0x10 + BREAK_REWRITES = 0x20 + FIND_AND_BREAK_REWRITES = 0x30 + FIND_FOR_UNTRACKED = 0x40 + FIND_ALL = 0xFF + FIND_IGNORE_LEADING_WHITESPACE = 0x0 + FIND_IGNORE_WHITESPACE = 0x1000 + FIND_DONT_IGNORE_WHITESPACE = 0x2000 + FIND_EXACT_MATCH_ONLY = 0x4000 + BREAK_REWRITES_FOR_RENAMES_ONLY = 0x8000 + FIND_REMOVE_UNMODIFIED = 0x10000 class DiffFlag(IntFlag): - BINARY: int - NOT_BINARY: int - VALID_ID: int - EXISTS: int - VALID_SIZE: int + BINARY = 0x1 + NOT_BINARY = 0x2 + VALID_ID = 0x4 + EXISTS = 0x8 + VALID_SIZE = 0x10 class DiffOption(IntFlag): - NORMAL: int - REVERSE: int - INCLUDE_IGNORED: int - RECURSE_IGNORED_DIRS: int - INCLUDE_UNTRACKED: int - RECURSE_UNTRACKED_DIRS: int - INCLUDE_UNMODIFIED: int - INCLUDE_TYPECHANGE: int - INCLUDE_TYPECHANGE_TREES: int - IGNORE_FILEMODE: int - IGNORE_SUBMODULES: int - IGNORE_CASE: int - INCLUDE_CASECHANGE: int - DISABLE_PATHSPEC_MATCH: int - SKIP_BINARY_CHECK: int - ENABLE_FAST_UNTRACKED_DIRS: int - UPDATE_INDEX: int - INCLUDE_UNREADABLE: int - INCLUDE_UNREADABLE_AS_UNTRACKED: int - INDENT_HEURISTIC: int - IGNORE_BLANK_LINES: int - FORCE_TEXT: int - FORCE_BINARY: int - IGNORE_WHITESPACE: int - IGNORE_WHITESPACE_CHANGE: int - IGNORE_WHITESPACE_EOL: int - SHOW_UNTRACKED_CONTENT: int - SHOW_UNMODIFIED: int - PATIENCE: int - MINIMAL: int - SHOW_BINARY: int + NORMAL = 0x0 + REVERSE = 0x1 + INCLUDE_IGNORED = 0x2 + RECURSE_IGNORED_DIRS = 0x4 + INCLUDE_UNTRACKED = 0x8 + RECURSE_UNTRACKED_DIRS = 0x10 + INCLUDE_UNMODIFIED = 0x20 + INCLUDE_TYPECHANGE = 0x40 + INCLUDE_TYPECHANGE_TREES = 0x80 + IGNORE_FILEMODE = 0x100 + IGNORE_SUBMODULES = 0x200 + IGNORE_CASE = 0x400 + INCLUDE_CASECHANGE = 0x800 + DISABLE_PATHSPEC_MATCH = 0x1000 + SKIP_BINARY_CHECK = 0x2000 + ENABLE_FAST_UNTRACKED_DIRS = 0x4000 + UPDATE_INDEX = 0x8000 + INCLUDE_UNREADABLE = 0x10000 + INCLUDE_UNREADABLE_AS_UNTRACKED = 0x20000 + INDENT_HEURISTIC = 0x40000 + IGNORE_BLANK_LINES = 0x80000 + FORCE_TEXT = 0x100000 + FORCE_BINARY = 0x200000 + IGNORE_WHITESPACE = 0x400000 + IGNORE_WHITESPACE_CHANGE = 0x800000 + IGNORE_WHITESPACE_EOL = 0x1000000 + SHOW_UNTRACKED_CONTENT = 0x2000000 + SHOW_UNMODIFIED = 0x4000000 + PATIENCE = 0x10000000 + MINIMAL = 0x20000000 + SHOW_BINARY = 0x40000000 class DiffStatsFormat(IntFlag): - NONE: int - FULL: int - SHORT: int - NUMBER: int - INCLUDE_SUMMARY: int + NONE = 0x0 + FULL = 0x1 + SHORT = 0x2 + NUMBER = 0x4 + INCLUDE_SUMMARY = 0x8 class Feature(IntFlag): - THREADS: int - HTTPS: int - SSH: int - NSEC: int + THREADS = 0x1 + HTTPS = 0x2 + SSH = 0x4 + NSEC = 0x8 class FetchPrune(IntEnum): - UNSPECIFIED: int - PRUNE: int - NO_PRUNE: int + UNSPECIFIED = 0 + PRUNE = 1 + NO_PRUNE = 2 class FileMode(IntFlag): - UNREADABLE: int - TREE: int - BLOB: int - BLOB_EXECUTABLE: int - LINK: int - COMMIT: int + UNREADABLE = 0x0 + TREE = 0x4000 + BLOB = 0x81A4 + BLOB_EXECUTABLE = 0x81ED + LINK = 0xA000 + COMMIT = 0xE000 class FileStatus(IntFlag): - CURRENT: int - INDEX_NEW: int - INDEX_MODIFIED: int - INDEX_DELETED: int - INDEX_RENAMED: int - INDEX_TYPECHANGE: int - WT_NEW: int - WT_MODIFIED: int - WT_DELETED: int - WT_TYPECHANGE: int - WT_RENAMED: int - WT_UNREADABLE: int - IGNORED: int - CONFLICTED: int + CURRENT = 0x0 + INDEX_NEW = 0x1 + INDEX_MODIFIED = 0x2 + INDEX_DELETED = 0x4 + INDEX_RENAMED = 0x8 + INDEX_TYPECHANGE = 0x10 + WT_NEW = 0x80 + WT_MODIFIED = 0x100 + WT_DELETED = 0x200 + WT_TYPECHANGE = 0x400 + WT_RENAMED = 0x800 + WT_UNREADABLE = 0x1000 + IGNORED = 0x4000 + CONFLICTED = 0x8000 class FilterFlag(IntFlag): - DEFAULT: int - ALLOW_UNSAFE: int - NO_SYSTEM_ATTRIBUTES: int - ATTRIBUTES_FROM_HEAD: int - ATTRIBUTES_FROM_COMMIT: int + DEFAULT = 0x0 + ALLOW_UNSAFE = 0x1 + NO_SYSTEM_ATTRIBUTES = 0x2 + ATTRIBUTES_FROM_HEAD = 0x4 + ATTRIBUTES_FROM_COMMIT = 0x8 class FilterMode(IntEnum): - TO_WORKTREE: int - SMUDGE: int - TO_ODB: int - CLEAN: int + TO_WORKTREE = 0 + SMUDGE = 0 + TO_ODB = 1 + CLEAN = 1 class MergeAnalysis(IntFlag): - NONE: int - NORMAL: int - UP_TO_DATE: int - FASTFORWARD: int - UNBORN: int + NONE = 0x0 + NORMAL = 0x1 + UP_TO_DATE = 0x2 + FASTFORWARD = 0x4 + UNBORN = 0x8 class MergeFavor(IntEnum): - NORMAL: int - OURS: int - THEIRS: int - UNION: int + NORMAL = 0 + OURS = 1 + THEIRS = 2 + UNION = 3 class MergeFileFlag(IntFlag): - DEFAULT: int - STYLE_MERGE: int - STYLE_DIFF3: int - SIMPLIFY_ALNUM: int - IGNORE_WHITESPACE: int - IGNORE_WHITESPACE_CHANGE: int - IGNORE_WHITESPACE_EOL: int - DIFF_PATIENCE: int - DIFF_MINIMAL: int - STYLE_ZDIFF3: int - ACCEPT_CONFLICTS: int + DEFAULT = 0x0 + STYLE_MERGE = 0x1 + STYLE_DIFF3 = 0x2 + SIMPLIFY_ALNUM = 0x4 + IGNORE_WHITESPACE = 0x8 + IGNORE_WHITESPACE_CHANGE = 0x10 + IGNORE_WHITESPACE_EOL = 0x20 + DIFF_PATIENCE = 0x40 + DIFF_MINIMAL = 0x80 + STYLE_ZDIFF3 = 0x100 + ACCEPT_CONFLICTS = 0x200 class MergeFlag(IntFlag): - FIND_RENAMES: int - FAIL_ON_CONFLICT: int - SKIP_REUC: int - NO_RECURSIVE: int - VIRTUAL_BASE: int + FIND_RENAMES = 0x1 + FAIL_ON_CONFLICT = 0x2 + SKIP_REUC = 0x4 + NO_RECURSIVE = 0x8 + VIRTUAL_BASE = 0x10 class MergePreference(IntFlag): - NONE: int - NO_FASTFORWARD: int - FASTFORWARD_ONLY: int + NONE = 0x0 + NO_FASTFORWARD = 0x1 + FASTFORWARD_ONLY = 0x2 class ObjectType(IntEnum): - ANY: int - INVALID: int - COMMIT: int - TREE: int - BLOB: int - TAG: int - OFS_DELTA: int - REF_DELTA: int + ANY = -2 + INVALID = -1 + COMMIT = 1 + TREE = 2 + BLOB = 3 + TAG = 4 + OFS_DELTA = 6 + REF_DELTA = 7 class Option(IntEnum): - GET_MWINDOW_SIZE: int - SET_MWINDOW_SIZE: int - GET_MWINDOW_MAPPED_LIMIT: int - SET_MWINDOW_MAPPED_LIMIT: int - GET_SEARCH_PATH: int - SET_SEARCH_PATH: int - SET_CACHE_OBJECT_LIMIT: int - SET_CACHE_MAX_SIZE: int - ENABLE_CACHING: int - GET_CACHED_MEMORY: int - GET_TEMPLATE_PATH: int - SET_TEMPLATE_PATH: int - SET_SSL_CERT_LOCATIONS: int - SET_USER_AGENT: int - ENABLE_STRICT_OBJECT_CREATION: int - ENABLE_STRICT_SYMBOLIC_REF_CREATION: int - SET_SSL_CIPHERS: int - GET_USER_AGENT: int - ENABLE_OFS_DELTA: int - ENABLE_FSYNC_GITDIR: int - GET_WINDOWS_SHAREMODE: int - SET_WINDOWS_SHAREMODE: int - ENABLE_STRICT_HASH_VERIFICATION: int - SET_ALLOCATOR: int - ENABLE_UNSAVED_INDEX_SAFETY: int - GET_PACK_MAX_OBJECTS: int - SET_PACK_MAX_OBJECTS: int - DISABLE_PACK_KEEP_FILE_CHECKS: int - GET_OWNER_VALIDATION: int - SET_OWNER_VALIDATION: int + GET_MWINDOW_SIZE = 0 + SET_MWINDOW_SIZE = 1 + GET_MWINDOW_MAPPED_LIMIT = 2 + SET_MWINDOW_MAPPED_LIMIT = 3 + GET_SEARCH_PATH = 4 + SET_SEARCH_PATH = 5 + SET_CACHE_OBJECT_LIMIT = 6 + SET_CACHE_MAX_SIZE = 7 + ENABLE_CACHING = 8 + GET_CACHED_MEMORY = 9 + GET_TEMPLATE_PATH = 10 + SET_TEMPLATE_PATH = 11 + SET_SSL_CERT_LOCATIONS = 12 + SET_USER_AGENT = 13 + ENABLE_STRICT_OBJECT_CREATION = 14 + ENABLE_STRICT_SYMBOLIC_REF_CREATION = 15 + SET_SSL_CIPHERS = 16 + GET_USER_AGENT = 17 + ENABLE_OFS_DELTA = 18 + ENABLE_FSYNC_GITDIR = 19 + GET_WINDOWS_SHAREMODE = 20 + SET_WINDOWS_SHAREMODE = 21 + ENABLE_STRICT_HASH_VERIFICATION = 22 + SET_ALLOCATOR = 23 + ENABLE_UNSAVED_INDEX_SAFETY = 24 + GET_PACK_MAX_OBJECTS = 25 + SET_PACK_MAX_OBJECTS = 26 + DISABLE_PACK_KEEP_FILE_CHECKS = 27 + GET_OWNER_VALIDATION = 35 + SET_OWNER_VALIDATION = 36 class ReferenceFilter(IntEnum): - ALL: int - BRANCHES: int - TAGS: int + ALL = 0 + BRANCHES = 1 + TAGS = 2 class ReferenceType(IntFlag): - INVALID: int - DIRECT: int - SYMBOLIC: int - ALL: int - OID: int - LISTALL: int + INVALID = 0x0 + DIRECT = 0x1 + SYMBOLIC = 0x2 + ALL = 0x3 + OID = 0x1 + LISTALL = 0x3 class RepositoryInitFlag(IntFlag): - BARE: int - NO_REINIT: int - NO_DOTGIT_DIR: int - MKDIR: int - MKPATH: int - EXTERNAL_TEMPLATE: int - RELATIVE_GITLINK: int + BARE = 0x1 + NO_REINIT = 0x2 + NO_DOTGIT_DIR = 0x4 + MKDIR = 0x8 + MKPATH = 0x10 + EXTERNAL_TEMPLATE = 0x20 + RELATIVE_GITLINK = 0x40 class RepositoryInitMode(IntEnum): - SHARED_UMASK: int - SHARED_GROUP: int - SHARED_ALL: int + SHARED_UMASK = 0 + SHARED_GROUP = 1533 + SHARED_ALL = 1535 class RepositoryOpenFlag(IntFlag): - DEFAULT: int - NO_SEARCH: int - CROSS_FS: int - BARE: int - NO_DOTGIT: int - FROM_ENV: int + DEFAULT = 0x0 + NO_SEARCH = 0x1 + CROSS_FS = 0x2 + BARE = 0x4 + NO_DOTGIT = 0x8 + FROM_ENV = 0x10 class RepositoryState(IntEnum): - NONE: int - MERGE: int - REVERT: int - REVERT_SEQUENCE: int - CHERRYPICK: int - CHERRYPICK_SEQUENCE: int - BISECT: int - REBASE: int - REBASE_INTERACTIVE: int - REBASE_MERGE: int - APPLY_MAILBOX: int - APPLY_MAILBOX_OR_REBASE: int + NONE = 0 + MERGE = 1 + REVERT = 2 + REVERT_SEQUENCE = 3 + CHERRYPICK = 4 + CHERRYPICK_SEQUENCE = 5 + BISECT = 6 + REBASE = 7 + REBASE_INTERACTIVE = 8 + REBASE_MERGE = 9 + APPLY_MAILBOX = 10 + APPLY_MAILBOX_OR_REBASE = 11 class ResetMode(IntEnum): - SOFT: int - MIXED: int - HARD: int + SOFT = 1 + MIXED = 2 + HARD = 3 class RevSpecFlag(IntFlag): - SINGLE: int - RANGE: int - MERGE_BASE: int + SINGLE = 0x1 + RANGE = 0x2 + MERGE_BASE = 0x4 class SortMode(IntFlag): - NONE: int - TOPOLOGICAL: int - TIME: int - REVERSE: int + NONE = 0x0 + TOPOLOGICAL = 0x1 + TIME = 0x2 + REVERSE = 0x4 class StashApplyProgress(IntEnum): - NONE: int - LOADING_STASH: int - ANALYZE_INDEX: int - ANALYZE_MODIFIED: int - ANALYZE_UNTRACKED: int - CHECKOUT_UNTRACKED: int - CHECKOUT_MODIFIED: int - DONE: int + NONE = 0 + LOADING_STASH = 1 + ANALYZE_INDEX = 2 + ANALYZE_MODIFIED = 3 + ANALYZE_UNTRACKED = 4 + CHECKOUT_UNTRACKED = 5 + CHECKOUT_MODIFIED = 6 + DONE = 7 class SubmoduleIgnore(IntEnum): - UNSPECIFIED: int - NONE: int - UNTRACKED: int - DIRTY: int - ALL: int + UNSPECIFIED = -1 + NONE = 1 + UNTRACKED = 2 + DIRTY = 3 + ALL = 4 class SubmoduleStatus(IntFlag): - IN_HEAD: int - IN_INDEX: int - IN_CONFIG: int - IN_WD: int - INDEX_ADDED: int - INDEX_DELETED: int - INDEX_MODIFIED: int - WD_UNINITIALIZED: int - WD_ADDED: int - WD_DELETED: int - WD_MODIFIED: int - WD_INDEX_MODIFIED: int - WD_WD_MODIFIED: int - WD_UNTRACKED: int + IN_HEAD = 0x1 + IN_INDEX = 0x2 + IN_CONFIG = 0x4 + IN_WD = 0x8 + INDEX_ADDED = 0x10 + INDEX_DELETED = 0x20 + INDEX_MODIFIED = 0x40 + WD_UNINITIALIZED = 0x80 + WD_ADDED = 0x100 + WD_DELETED = 0x200 + WD_MODIFIED = 0x400 + WD_INDEX_MODIFIED = 0x800 + WD_WD_MODIFIED = 0x1000 + WD_UNTRACKED = 0x2000 From d2353ba13e138a3e13651ef5d47380801a2a60ff Mon Sep 17 00:00:00 2001 From: Ali Hamdan Date: Sun, 19 May 2024 11:58:57 +0200 Subject: [PATCH 2/3] revert pygit2 changes --- stubs/pygit2/pygit2/enums.pyi | 628 +++++++++++++++++----------------- 1 file changed, 314 insertions(+), 314 deletions(-) diff --git a/stubs/pygit2/pygit2/enums.pyi b/stubs/pygit2/pygit2/enums.pyi index 021ecc433ec0..5d74ba900cbc 100644 --- a/stubs/pygit2/pygit2/enums.pyi +++ b/stubs/pygit2/pygit2/enums.pyi @@ -1,395 +1,395 @@ from enum import IntEnum, IntFlag class ApplyLocation(IntEnum): - WORKDIR = 0 - INDEX = 1 - BOTH = 2 + WORKDIR: int + INDEX: int + BOTH: int class AttrCheck(IntFlag): - FILE_THEN_INDEX = 0x0 - INDEX_THEN_FILE = 0x1 - INDEX_ONLY = 0x2 - NO_SYSTEM = 0x4 - INCLUDE_HEAD = 0x8 - INCLUDE_COMMIT = 0x10 + FILE_THEN_INDEX: int + INDEX_THEN_FILE: int + INDEX_ONLY: int + NO_SYSTEM: int + INCLUDE_HEAD: int + INCLUDE_COMMIT: int class BlameFlag(IntFlag): - NORMAL = 0x0 - TRACK_COPIES_SAME_FILE = 0x1 - TRACK_COPIES_SAME_COMMIT_MOVES = 0x2 - TRACK_COPIES_SAME_COMMIT_COPIES = 0x4 - TRACK_COPIES_ANY_COMMIT_COPIES = 0x8 - FIRST_PARENT = 0x10 - USE_MAILMAP = 0x20 - IGNORE_WHITESPACE = 0x40 + NORMAL: int + TRACK_COPIES_SAME_FILE: int + TRACK_COPIES_SAME_COMMIT_MOVES: int + TRACK_COPIES_SAME_COMMIT_COPIES: int + TRACK_COPIES_ANY_COMMIT_COPIES: int + FIRST_PARENT: int + USE_MAILMAP: int + IGNORE_WHITESPACE: int class BlobFilter(IntFlag): - CHECK_FOR_BINARY = 0x1 - NO_SYSTEM_ATTRIBUTES = 0x2 - ATTRIBUTES_FROM_HEAD = 0x4 - ATTRIBUTES_FROM_COMMIT = 0x8 + CHECK_FOR_BINARY: int + NO_SYSTEM_ATTRIBUTES: int + ATTRIBUTES_FROM_HEAD: int + ATTRIBUTES_FROM_COMMIT: int class BranchType(IntFlag): - LOCAL = 0x1 - REMOTE = 0x2 - ALL = 0x3 + LOCAL: int + REMOTE: int + ALL: int class CheckoutNotify(IntFlag): - NONE = 0x0 - CONFLICT = 0x1 - DIRTY = 0x2 - UPDATED = 0x4 - UNTRACKED = 0x8 - IGNORED = 0x8 - ALL = 0xFFFF + NONE: int + CONFLICT: int + DIRTY: int + UPDATED: int + UNTRACKED: int + IGNORED: int + ALL: int class CheckoutStrategy(IntFlag): - NONE = 0x0 - SAFE = 0x1 - FORCE = 0x2 - RECREATE_MISSING = 0x4 - ALLOW_CONFLICTS = 0x10 - REMOVE_UNTRACKED = 0x20 - REMOVE_IGNORED = 0x40 - UPDATE_ONLY = 0x80 - DONT_UPDATE_INDEX = 0x100 - NO_REFRESH = 0x200 - SKIP_UNMERGED = 0x400 - USE_OURS = 0x800 - USE_THEIRS = 0x1000 - DISABLE_PATHSPEC_MATCH = 0x2000 - SKIP_LOCKED_DIRECTORIES = 0x40000 - DONT_OVERWRITE_IGNORED = 0x80000 - CONFLICT_STYLE_MERGE = 0x100000 - CONFLICT_STYLE_DIFF3 = 0x200000 - DONT_REMOVE_EXISTING = 0x400000 - DONT_WRITE_INDEX = 0x800000 - DRY_RUN = 0x1000000 - CONFLICT_STYLE_ZDIFF3 = 0x200000 + NONE: int + SAFE: int + FORCE: int + RECREATE_MISSING: int + ALLOW_CONFLICTS: int + REMOVE_UNTRACKED: int + REMOVE_IGNORED: int + UPDATE_ONLY: int + DONT_UPDATE_INDEX: int + NO_REFRESH: int + SKIP_UNMERGED: int + USE_OURS: int + USE_THEIRS: int + DISABLE_PATHSPEC_MATCH: int + SKIP_LOCKED_DIRECTORIES: int + DONT_OVERWRITE_IGNORED: int + CONFLICT_STYLE_MERGE: int + CONFLICT_STYLE_DIFF3: int + DONT_REMOVE_EXISTING: int + DONT_WRITE_INDEX: int + DRY_RUN: int + CONFLICT_STYLE_ZDIFF3: int class ConfigLevel(IntEnum): - PROGRAMDATA = 1 - SYSTEM = 2 - XDG = 3 - GLOBAL = 4 - LOCAL = 5 - APP = 6 - HIGHEST_LEVEL = -1 + PROGRAMDATA: int + SYSTEM: int + XDG: int + GLOBAL: int + LOCAL: int + APP: int + HIGHEST_LEVEL: int class CredentialType(IntFlag): - USERPASS_PLAINTEXT = 0x1 - SSH_KEY = 0x2 - SSH_CUSTOM = 0x4 - DEFAULT = 0x8 - SSH_INTERACTIVE = 0x10 - USERNAME = 0x20 - SSH_MEMORY = 0x40 + USERPASS_PLAINTEXT: int + SSH_KEY: int + SSH_CUSTOM: int + DEFAULT: int + SSH_INTERACTIVE: int + USERNAME: int + SSH_MEMORY: int class DeltaStatus(IntEnum): - UNMODIFIED = 0 - ADDED = 1 - DELETED = 2 - MODIFIED = 3 - RENAMED = 4 - COPIED = 5 - IGNORED = 6 - UNTRACKED = 7 - TYPECHANGE = 8 - UNREADABLE = 9 - CONFLICTED = 10 + UNMODIFIED: int + ADDED: int + DELETED: int + MODIFIED: int + RENAMED: int + COPIED: int + IGNORED: int + UNTRACKED: int + TYPECHANGE: int + UNREADABLE: int + CONFLICTED: int class DescribeStrategy(IntEnum): - DEFAULT = 0 - TAGS = 1 - ALL = 2 + DEFAULT: int + TAGS: int + ALL: int class DiffFind(IntFlag): - FIND_BY_CONFIG = 0x0 - FIND_RENAMES = 0x1 - FIND_RENAMES_FROM_REWRITES = 0x2 - FIND_COPIES = 0x4 - FIND_COPIES_FROM_UNMODIFIED = 0x8 - FIND_REWRITES = 0x10 - BREAK_REWRITES = 0x20 - FIND_AND_BREAK_REWRITES = 0x30 - FIND_FOR_UNTRACKED = 0x40 - FIND_ALL = 0xFF - FIND_IGNORE_LEADING_WHITESPACE = 0x0 - FIND_IGNORE_WHITESPACE = 0x1000 - FIND_DONT_IGNORE_WHITESPACE = 0x2000 - FIND_EXACT_MATCH_ONLY = 0x4000 - BREAK_REWRITES_FOR_RENAMES_ONLY = 0x8000 - FIND_REMOVE_UNMODIFIED = 0x10000 + FIND_BY_CONFIG: int + FIND_RENAMES: int + FIND_RENAMES_FROM_REWRITES: int + FIND_COPIES: int + FIND_COPIES_FROM_UNMODIFIED: int + FIND_REWRITES: int + BREAK_REWRITES: int + FIND_AND_BREAK_REWRITES: int + FIND_FOR_UNTRACKED: int + FIND_ALL: int + FIND_IGNORE_LEADING_WHITESPACE: int + FIND_IGNORE_WHITESPACE: int + FIND_DONT_IGNORE_WHITESPACE: int + FIND_EXACT_MATCH_ONLY: int + BREAK_REWRITES_FOR_RENAMES_ONLY: int + FIND_REMOVE_UNMODIFIED: int class DiffFlag(IntFlag): - BINARY = 0x1 - NOT_BINARY = 0x2 - VALID_ID = 0x4 - EXISTS = 0x8 - VALID_SIZE = 0x10 + BINARY: int + NOT_BINARY: int + VALID_ID: int + EXISTS: int + VALID_SIZE: int class DiffOption(IntFlag): - NORMAL = 0x0 - REVERSE = 0x1 - INCLUDE_IGNORED = 0x2 - RECURSE_IGNORED_DIRS = 0x4 - INCLUDE_UNTRACKED = 0x8 - RECURSE_UNTRACKED_DIRS = 0x10 - INCLUDE_UNMODIFIED = 0x20 - INCLUDE_TYPECHANGE = 0x40 - INCLUDE_TYPECHANGE_TREES = 0x80 - IGNORE_FILEMODE = 0x100 - IGNORE_SUBMODULES = 0x200 - IGNORE_CASE = 0x400 - INCLUDE_CASECHANGE = 0x800 - DISABLE_PATHSPEC_MATCH = 0x1000 - SKIP_BINARY_CHECK = 0x2000 - ENABLE_FAST_UNTRACKED_DIRS = 0x4000 - UPDATE_INDEX = 0x8000 - INCLUDE_UNREADABLE = 0x10000 - INCLUDE_UNREADABLE_AS_UNTRACKED = 0x20000 - INDENT_HEURISTIC = 0x40000 - IGNORE_BLANK_LINES = 0x80000 - FORCE_TEXT = 0x100000 - FORCE_BINARY = 0x200000 - IGNORE_WHITESPACE = 0x400000 - IGNORE_WHITESPACE_CHANGE = 0x800000 - IGNORE_WHITESPACE_EOL = 0x1000000 - SHOW_UNTRACKED_CONTENT = 0x2000000 - SHOW_UNMODIFIED = 0x4000000 - PATIENCE = 0x10000000 - MINIMAL = 0x20000000 - SHOW_BINARY = 0x40000000 + NORMAL: int + REVERSE: int + INCLUDE_IGNORED: int + RECURSE_IGNORED_DIRS: int + INCLUDE_UNTRACKED: int + RECURSE_UNTRACKED_DIRS: int + INCLUDE_UNMODIFIED: int + INCLUDE_TYPECHANGE: int + INCLUDE_TYPECHANGE_TREES: int + IGNORE_FILEMODE: int + IGNORE_SUBMODULES: int + IGNORE_CASE: int + INCLUDE_CASECHANGE: int + DISABLE_PATHSPEC_MATCH: int + SKIP_BINARY_CHECK: int + ENABLE_FAST_UNTRACKED_DIRS: int + UPDATE_INDEX: int + INCLUDE_UNREADABLE: int + INCLUDE_UNREADABLE_AS_UNTRACKED: int + INDENT_HEURISTIC: int + IGNORE_BLANK_LINES: int + FORCE_TEXT: int + FORCE_BINARY: int + IGNORE_WHITESPACE: int + IGNORE_WHITESPACE_CHANGE: int + IGNORE_WHITESPACE_EOL: int + SHOW_UNTRACKED_CONTENT: int + SHOW_UNMODIFIED: int + PATIENCE: int + MINIMAL: int + SHOW_BINARY: int class DiffStatsFormat(IntFlag): - NONE = 0x0 - FULL = 0x1 - SHORT = 0x2 - NUMBER = 0x4 - INCLUDE_SUMMARY = 0x8 + NONE: int + FULL: int + SHORT: int + NUMBER: int + INCLUDE_SUMMARY: int class Feature(IntFlag): - THREADS = 0x1 - HTTPS = 0x2 - SSH = 0x4 - NSEC = 0x8 + THREADS: int + HTTPS: int + SSH: int + NSEC: int class FetchPrune(IntEnum): - UNSPECIFIED = 0 - PRUNE = 1 - NO_PRUNE = 2 + UNSPECIFIED: int + PRUNE: int + NO_PRUNE: int class FileMode(IntFlag): - UNREADABLE = 0x0 - TREE = 0x4000 - BLOB = 0x81A4 - BLOB_EXECUTABLE = 0x81ED - LINK = 0xA000 - COMMIT = 0xE000 + UNREADABLE: int + TREE: int + BLOB: int + BLOB_EXECUTABLE: int + LINK: int + COMMIT: int class FileStatus(IntFlag): - CURRENT = 0x0 - INDEX_NEW = 0x1 - INDEX_MODIFIED = 0x2 - INDEX_DELETED = 0x4 - INDEX_RENAMED = 0x8 - INDEX_TYPECHANGE = 0x10 - WT_NEW = 0x80 - WT_MODIFIED = 0x100 - WT_DELETED = 0x200 - WT_TYPECHANGE = 0x400 - WT_RENAMED = 0x800 - WT_UNREADABLE = 0x1000 - IGNORED = 0x4000 - CONFLICTED = 0x8000 + CURRENT: int + INDEX_NEW: int + INDEX_MODIFIED: int + INDEX_DELETED: int + INDEX_RENAMED: int + INDEX_TYPECHANGE: int + WT_NEW: int + WT_MODIFIED: int + WT_DELETED: int + WT_TYPECHANGE: int + WT_RENAMED: int + WT_UNREADABLE: int + IGNORED: int + CONFLICTED: int class FilterFlag(IntFlag): - DEFAULT = 0x0 - ALLOW_UNSAFE = 0x1 - NO_SYSTEM_ATTRIBUTES = 0x2 - ATTRIBUTES_FROM_HEAD = 0x4 - ATTRIBUTES_FROM_COMMIT = 0x8 + DEFAULT: int + ALLOW_UNSAFE: int + NO_SYSTEM_ATTRIBUTES: int + ATTRIBUTES_FROM_HEAD: int + ATTRIBUTES_FROM_COMMIT: int class FilterMode(IntEnum): - TO_WORKTREE = 0 - SMUDGE = 0 - TO_ODB = 1 - CLEAN = 1 + TO_WORKTREE: int + SMUDGE: int + TO_ODB: int + CLEAN: int class MergeAnalysis(IntFlag): - NONE = 0x0 - NORMAL = 0x1 - UP_TO_DATE = 0x2 - FASTFORWARD = 0x4 - UNBORN = 0x8 + NONE: int + NORMAL: int + UP_TO_DATE: int + FASTFORWARD: int + UNBORN: int class MergeFavor(IntEnum): - NORMAL = 0 - OURS = 1 - THEIRS = 2 - UNION = 3 + NORMAL: int + OURS: int + THEIRS: int + UNION: int class MergeFileFlag(IntFlag): - DEFAULT = 0x0 - STYLE_MERGE = 0x1 - STYLE_DIFF3 = 0x2 - SIMPLIFY_ALNUM = 0x4 - IGNORE_WHITESPACE = 0x8 - IGNORE_WHITESPACE_CHANGE = 0x10 - IGNORE_WHITESPACE_EOL = 0x20 - DIFF_PATIENCE = 0x40 - DIFF_MINIMAL = 0x80 - STYLE_ZDIFF3 = 0x100 - ACCEPT_CONFLICTS = 0x200 + DEFAULT: int + STYLE_MERGE: int + STYLE_DIFF3: int + SIMPLIFY_ALNUM: int + IGNORE_WHITESPACE: int + IGNORE_WHITESPACE_CHANGE: int + IGNORE_WHITESPACE_EOL: int + DIFF_PATIENCE: int + DIFF_MINIMAL: int + STYLE_ZDIFF3: int + ACCEPT_CONFLICTS: int class MergeFlag(IntFlag): - FIND_RENAMES = 0x1 - FAIL_ON_CONFLICT = 0x2 - SKIP_REUC = 0x4 - NO_RECURSIVE = 0x8 - VIRTUAL_BASE = 0x10 + FIND_RENAMES: int + FAIL_ON_CONFLICT: int + SKIP_REUC: int + NO_RECURSIVE: int + VIRTUAL_BASE: int class MergePreference(IntFlag): - NONE = 0x0 - NO_FASTFORWARD = 0x1 - FASTFORWARD_ONLY = 0x2 + NONE: int + NO_FASTFORWARD: int + FASTFORWARD_ONLY: int class ObjectType(IntEnum): - ANY = -2 - INVALID = -1 - COMMIT = 1 - TREE = 2 - BLOB = 3 - TAG = 4 - OFS_DELTA = 6 - REF_DELTA = 7 + ANY: int + INVALID: int + COMMIT: int + TREE: int + BLOB: int + TAG: int + OFS_DELTA: int + REF_DELTA: int class Option(IntEnum): - GET_MWINDOW_SIZE = 0 - SET_MWINDOW_SIZE = 1 - GET_MWINDOW_MAPPED_LIMIT = 2 - SET_MWINDOW_MAPPED_LIMIT = 3 - GET_SEARCH_PATH = 4 - SET_SEARCH_PATH = 5 - SET_CACHE_OBJECT_LIMIT = 6 - SET_CACHE_MAX_SIZE = 7 - ENABLE_CACHING = 8 - GET_CACHED_MEMORY = 9 - GET_TEMPLATE_PATH = 10 - SET_TEMPLATE_PATH = 11 - SET_SSL_CERT_LOCATIONS = 12 - SET_USER_AGENT = 13 - ENABLE_STRICT_OBJECT_CREATION = 14 - ENABLE_STRICT_SYMBOLIC_REF_CREATION = 15 - SET_SSL_CIPHERS = 16 - GET_USER_AGENT = 17 - ENABLE_OFS_DELTA = 18 - ENABLE_FSYNC_GITDIR = 19 - GET_WINDOWS_SHAREMODE = 20 - SET_WINDOWS_SHAREMODE = 21 - ENABLE_STRICT_HASH_VERIFICATION = 22 - SET_ALLOCATOR = 23 - ENABLE_UNSAVED_INDEX_SAFETY = 24 - GET_PACK_MAX_OBJECTS = 25 - SET_PACK_MAX_OBJECTS = 26 - DISABLE_PACK_KEEP_FILE_CHECKS = 27 - GET_OWNER_VALIDATION = 35 - SET_OWNER_VALIDATION = 36 + GET_MWINDOW_SIZE: int + SET_MWINDOW_SIZE: int + GET_MWINDOW_MAPPED_LIMIT: int + SET_MWINDOW_MAPPED_LIMIT: int + GET_SEARCH_PATH: int + SET_SEARCH_PATH: int + SET_CACHE_OBJECT_LIMIT: int + SET_CACHE_MAX_SIZE: int + ENABLE_CACHING: int + GET_CACHED_MEMORY: int + GET_TEMPLATE_PATH: int + SET_TEMPLATE_PATH: int + SET_SSL_CERT_LOCATIONS: int + SET_USER_AGENT: int + ENABLE_STRICT_OBJECT_CREATION: int + ENABLE_STRICT_SYMBOLIC_REF_CREATION: int + SET_SSL_CIPHERS: int + GET_USER_AGENT: int + ENABLE_OFS_DELTA: int + ENABLE_FSYNC_GITDIR: int + GET_WINDOWS_SHAREMODE: int + SET_WINDOWS_SHAREMODE: int + ENABLE_STRICT_HASH_VERIFICATION: int + SET_ALLOCATOR: int + ENABLE_UNSAVED_INDEX_SAFETY: int + GET_PACK_MAX_OBJECTS: int + SET_PACK_MAX_OBJECTS: int + DISABLE_PACK_KEEP_FILE_CHECKS: int + GET_OWNER_VALIDATION: int + SET_OWNER_VALIDATION: int class ReferenceFilter(IntEnum): - ALL = 0 - BRANCHES = 1 - TAGS = 2 + ALL: int + BRANCHES: int + TAGS: int class ReferenceType(IntFlag): - INVALID = 0x0 - DIRECT = 0x1 - SYMBOLIC = 0x2 - ALL = 0x3 - OID = 0x1 - LISTALL = 0x3 + INVALID: int + DIRECT: int + SYMBOLIC: int + ALL: int + OID: int + LISTALL: int class RepositoryInitFlag(IntFlag): - BARE = 0x1 - NO_REINIT = 0x2 - NO_DOTGIT_DIR = 0x4 - MKDIR = 0x8 - MKPATH = 0x10 - EXTERNAL_TEMPLATE = 0x20 - RELATIVE_GITLINK = 0x40 + BARE: int + NO_REINIT: int + NO_DOTGIT_DIR: int + MKDIR: int + MKPATH: int + EXTERNAL_TEMPLATE: int + RELATIVE_GITLINK: int class RepositoryInitMode(IntEnum): - SHARED_UMASK = 0 - SHARED_GROUP = 1533 - SHARED_ALL = 1535 + SHARED_UMASK: int + SHARED_GROUP: int + SHARED_ALL: int class RepositoryOpenFlag(IntFlag): - DEFAULT = 0x0 - NO_SEARCH = 0x1 - CROSS_FS = 0x2 - BARE = 0x4 - NO_DOTGIT = 0x8 - FROM_ENV = 0x10 + DEFAULT: int + NO_SEARCH: int + CROSS_FS: int + BARE: int + NO_DOTGIT: int + FROM_ENV: int class RepositoryState(IntEnum): - NONE = 0 - MERGE = 1 - REVERT = 2 - REVERT_SEQUENCE = 3 - CHERRYPICK = 4 - CHERRYPICK_SEQUENCE = 5 - BISECT = 6 - REBASE = 7 - REBASE_INTERACTIVE = 8 - REBASE_MERGE = 9 - APPLY_MAILBOX = 10 - APPLY_MAILBOX_OR_REBASE = 11 + NONE: int + MERGE: int + REVERT: int + REVERT_SEQUENCE: int + CHERRYPICK: int + CHERRYPICK_SEQUENCE: int + BISECT: int + REBASE: int + REBASE_INTERACTIVE: int + REBASE_MERGE: int + APPLY_MAILBOX: int + APPLY_MAILBOX_OR_REBASE: int class ResetMode(IntEnum): - SOFT = 1 - MIXED = 2 - HARD = 3 + SOFT: int + MIXED: int + HARD: int class RevSpecFlag(IntFlag): - SINGLE = 0x1 - RANGE = 0x2 - MERGE_BASE = 0x4 + SINGLE: int + RANGE: int + MERGE_BASE: int class SortMode(IntFlag): - NONE = 0x0 - TOPOLOGICAL = 0x1 - TIME = 0x2 - REVERSE = 0x4 + NONE: int + TOPOLOGICAL: int + TIME: int + REVERSE: int class StashApplyProgress(IntEnum): - NONE = 0 - LOADING_STASH = 1 - ANALYZE_INDEX = 2 - ANALYZE_MODIFIED = 3 - ANALYZE_UNTRACKED = 4 - CHECKOUT_UNTRACKED = 5 - CHECKOUT_MODIFIED = 6 - DONE = 7 + NONE: int + LOADING_STASH: int + ANALYZE_INDEX: int + ANALYZE_MODIFIED: int + ANALYZE_UNTRACKED: int + CHECKOUT_UNTRACKED: int + CHECKOUT_MODIFIED: int + DONE: int class SubmoduleIgnore(IntEnum): - UNSPECIFIED = -1 - NONE = 1 - UNTRACKED = 2 - DIRTY = 3 - ALL = 4 + UNSPECIFIED: int + NONE: int + UNTRACKED: int + DIRTY: int + ALL: int class SubmoduleStatus(IntFlag): - IN_HEAD = 0x1 - IN_INDEX = 0x2 - IN_CONFIG = 0x4 - IN_WD = 0x8 - INDEX_ADDED = 0x10 - INDEX_DELETED = 0x20 - INDEX_MODIFIED = 0x40 - WD_UNINITIALIZED = 0x80 - WD_ADDED = 0x100 - WD_DELETED = 0x200 - WD_MODIFIED = 0x400 - WD_INDEX_MODIFIED = 0x800 - WD_WD_MODIFIED = 0x1000 - WD_UNTRACKED = 0x2000 + IN_HEAD: int + IN_INDEX: int + IN_CONFIG: int + IN_WD: int + INDEX_ADDED: int + INDEX_DELETED: int + INDEX_MODIFIED: int + WD_UNINITIALIZED: int + WD_ADDED: int + WD_DELETED: int + WD_MODIFIED: int + WD_INDEX_MODIFIED: int + WD_WD_MODIFIED: int + WD_UNTRACKED: int From 7733931f21458701cb34c8458b098675eb7b0c8a Mon Sep 17 00:00:00 2001 From: Ali Hamdan Date: Sun, 19 May 2024 12:03:37 +0200 Subject: [PATCH 3/3] Address CR --- stubs/Pillow/PIL/DdsImagePlugin.pyi | 35 ++++++++++++++--------------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/stubs/Pillow/PIL/DdsImagePlugin.pyi b/stubs/Pillow/PIL/DdsImagePlugin.pyi index cce330742983..8b374e62bcdb 100644 --- a/stubs/Pillow/PIL/DdsImagePlugin.pyi +++ b/stubs/Pillow/PIL/DdsImagePlugin.pyi @@ -1,7 +1,6 @@ from enum import IntEnum, IntFlag from typing import ClassVar, Final, Literal -from ._binary import i32le as i32 from .ImageFile import ImageFile, PyDecoder DDS_MAGIC: Final = 0x20534444 @@ -219,23 +218,23 @@ class D3DFMT(IntEnum): A2B10G10R10_XR_BIAS = 119 BINARYBUFFER = 199 - UYVY = i32(b"UYVY") - R8G8_B8G8 = i32(b"RGBG") - YUY2 = i32(b"YUY2") - G8R8_G8B8 = i32(b"GRGB") - DXT1 = i32(b"DXT1") - DXT2 = i32(b"DXT2") - DXT3 = i32(b"DXT3") - DXT4 = i32(b"DXT4") - DXT5 = i32(b"DXT5") - DX10 = i32(b"DX10") - BC4S = i32(b"BC4S") - BC4U = i32(b"BC4U") - BC5S = i32(b"BC5S") - BC5U = i32(b"BC5U") - ATI1 = i32(b"ATI1") - ATI2 = i32(b"ATI2") - MULTI2_ARGB8 = i32(b"MET1") + UYVY = 1498831189 # i32(b"UYVY") + R8G8_B8G8 = 1195525970 # i32(b"RGBG") + YUY2 = 844715353 # i32(b"YUY2") + G8R8_G8B8 = 1111970375 # i32(b"GRGB") + DXT1 = 827611204 # i32(b"DXT1") + DXT2 = 844388420 # i32(b"DXT2") + DXT3 = 861165636 # i32(b"DXT3") + DXT4 = 877942852 # i32(b"DXT4") + DXT5 = 894720068 # i32(b"DXT5") + DX10 = 808540228 # i32(b"DX10") + BC4S = 1395934018 # i32(b"BC4S") + BC4U = 1429488450 # i32(b"BC4U") + BC5S = 1395999554 # i32(b"BC5S") + BC5U = 1429553986 # i32(b"BC5U") + ATI1 = 826889281 # i32(b"ATI1") + ATI2 = 843666497 # i32(b"ATI2") + MULTI2_ARGB8 = 827606349 # i32(b"MET1") DDSD_CAPS: Final = 0x1 DDSD_HEIGHT: Final = 0x2