8000 [DRAFT] gh-113299: Split clinic.py into sub-files by vstinner · Pull Request #113300 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

[DRAFT] gh-113299: Split clinic.py into sub-files #113300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[DRAFT] gh-113299: Split clinic.py into sub-files #113300

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2b47ce
gh-113299: Split clinic.py into sub-files
vstinner Dec 19, 2023
571cd15
Cleanup imports
vstinner Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Cleanup imports
  • Loading branch information
@vstinner
vstinner committed Dec 20, 2023
commit 571cd155d04a112c510ff3a2713a62d3ff2fdfea
2 changes: 1 addition & 1 deletion Tools/clinic/clinic/block_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
from typing import Any, TYPE_CHECKING

from .utils import fail, compute_checksum, text_accumulator, create_regex
from .language import Language
if TYPE_CHECKING:
from .function import Function, Module, Class
from .language import Language


@dc.dataclass(slots=True, repr=False)
Expand Down
4 changes: 2 additions & 2 deletions Tools/clinic/clinic/block_printer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
from .utils import (
fail, compute_checksum,
_TextAccumulator, _text_accumulator)
from .language import Language
from .block_parser import Block
if TYPE_CHECKING:
from .block_parser import Block
from .language import Language
from .clinic import Clinic


Expand Down
8 changes: 3 additions & 5 deletions Tools/clinic/clinic/clanguage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,17 @@
fail, warn, c_repr,
Sentinels, TemplateDict, VersionTuple, unspecified,
_text_accumulator, text_accumulator)
from .function import (
Function, Class, Module,
GETTER, SETTER, METHOD_NEW,
)
from .function import Function, GETTER, SETTER, METHOD_NEW
from .crender_data import CRenderData
from .parameter import Parameter, ParamTuple
from .converters import (
defining_class_converter,
self_converter,
object_converter,
)
from .language import Language
if TYPE_CHECKING:
from .function import Class, Module
from .parameter import Parameter, ParamTuple
from .clinic import Clinic


Expand Down
5 changes: 1 addition & 4 deletions Tools/clinic/clinic/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@
import inspect
import sys

from . import clinic
from .utils import ClinicError
from .converter import legacy_converters
from .clinic import parse_file
from typing import (
NoReturn,
)
from typing import NoReturn


def create_cli() -> argparse.ArgumentParser:
Expand Down
13 changes: 6 additions & 7 deletions Tools/clinic/clinic/clinic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,17 @@
)

from . import utils
from .utils import (
fail, warn,
_TextAccumulator)
from .function import (
Function, Module, Class, ModuleDict, ClassDict)
from .language import Language, PythonLanguage
from .utils import fail, warn, _TextAccumulator
from .function import Class
from .language import PythonLanguage, Language
from .clanguage import CLanguage
from .block_parser import Block, BlockParser
from .block_printer import BlockPrinter, Include, Destination, DestinationDict
from .block_printer import BlockPrinter, Include, Destination
from .parser import parsers
if TYPE_CHECKING:
from .function import Function, Module, ModuleDict, ClassDict
from .parser import Parser
from .block_printer import DestinationDict


# TODO:
Expand Down
2 changes: 1 addition & 1 deletion Tools/clinic/clinic/converter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
from .utils import (
fail, TemplateDict, ensure_legal_c_identifier, c_repr,
Sentinels, unknown, unspecified)
from .crender_data import CRenderData
from .block_printer import Include
if TYPE_CHECKING:
from .crender_data import CRenderData
from .function import Function
from .parameter import Parameter

Expand Down
13 changes: 6 additions & 7 deletions Tools/clinic/clinic/converters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,17 @@
import sys
import functools
from types import NoneType
from typing import TYPE_CHECKING

from .utils import (
fail, unknown, unspecified,
TemplateDict,
)
from .utils import fail, unknown, unspecified, TemplateDict
from .converter import CConverter, legacy_converters, add_legacy_c_converter
from .function import (
Function,
CALLABLE, METHOD_INIT, GETTER, SETTER,
STATIC_METHOD, CLASS_METHOD, METHOD_NEW)
from .parameter import Parameter
from .crender_data import CRenderData
if TYPE_CHECKING:
from .crender_data import CRenderData
from .parameter import Parameter
from .function import Function


TypeSet = set[bltns.type[object]]
Expand Down
6 changes: 1 addition & 5 deletions Tools/clinic/clinic/function.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@
import enum
import functools
import inspect
from typing import (
Any,
Final,
TYPE_CHECKING,
)
from typing import Any, Final, TYPE_CHECKING

if TYPE_CHECKING:
from .parameter import Parameter, ParamDict
Expand Down
5 changes: 1 addition & 4 deletions Tools/clinic/clinic/language.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
import collections
import string
from collections.abc import Iterable
from typing import (
Literal,
TYPE_CHECKING,
)
from typing import Literal, TYPE_CHECKING

from .utils import fail
if TYPE_CHECKING:
Expand Down
7 changes: 2 additions & 5 deletions Tools/clinic/clinic/parameter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,11 @@
import copy
import dataclasses as dc
import inspect
from typing import (
Any,
TYPE_CHECKING,
)
from typing import Any, TYPE_CHECKING

from .utils import text_accumulator, unspecified, VersionTuple
from .function import Function
if TYPE_CHECKING:
from .function import Function
from .converter import CConverter


Expand Down
2 changes: 1 addition & 1 deletion Tools/clinic/clinic/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@
return_converters,
init_return_converter, CReturnConverter,
)
from .block_parser import Block
from .clanguage import (
linear_format, text_accumulator,
sig_end_marker,
self_converter, unspecified, c_repr,
defining_class_converter,
)
if TYPE_CHECKING:
from .block_parser import Block
from .clinic import Clinic


Expand Down
10 changes: 4 additions & 6 deletions Tools/clinic/clinic/return_converter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
from __future__ import annotations

import sys
from typing import (
Any,
Callable,
)
from typing import Any, Callable, TYPE_CHECKING

from .crender_data import CRenderData
from .function import Function
if TYPE_CHECKING:
from .crender_data import CRenderData
from .function import Function


ReturnConverterType = Callable[..., "CReturnConverter"]
Expand Down
0