From a7295224ac09bf400c8d79ead3c8d2d301bee5ae Mon Sep 17 00:00:00 2001 From: mindaugasbar Date: Wed, 12 Mar 2025 09:50:50 +0200 Subject: [PATCH] Shorter multiple imports --- pydbml/_classes/reference.py | 3 +-- pydbml/_classes/table.py | 4 +--- pydbml/classes/__init__.py | 3 +-- pydbml/database.py | 6 +----- pydbml/definitions/column.py | 22 +++++++++------------- pydbml/definitions/enum.py | 7 +------ pydbml/definitions/index.py | 14 +++----------- pydbml/definitions/project.py | 12 +++--------- pydbml/definitions/reference.py | 5 +---- pydbml/definitions/table.py | 6 +----- pydbml/definitions/table_group.py | 4 +--- pydbml/parser/blueprints.py | 29 ++++++++++++++--------------- pydbml/parser/parser.py | 13 ++++++++----- 13 files changed, 45 insertions(+), 83 deletions(-) diff --git a/pydbml/_classes/reference.py b/pydbml/_classes/reference.py index 9da1e03..ca63b1f 100644 --- a/pydbml/_classes/reference.py +++ b/pydbml/_classes/reference.py @@ -5,8 +5,7 @@ from typing import Union from pydbml.constants import MANY_TO_MANY -from pydbml.exceptions import DBMLError -from pydbml.exceptions import TableNotFoundError +from pydbml.exceptions import DBMLError, TableNotFoundError from .base import SQLObject, DBMLObject from .column import Column from .table import Table diff --git a/pydbml/_classes/table.py b/pydbml/_classes/table.py index b8f340d..0e3e1f2 100644 --- a/pydbml/_classes/table.py +++ b/pydbml/_classes/table.py @@ -4,9 +4,7 @@ from typing import TYPE_CHECKING from typing import Union -from pydbml.exceptions import ColumnNotFoundError -from pydbml.exceptions import IndexNotFoundError -from pydbml.exceptions import UnknownDatabaseError +from pydbml.exceptions import ColumnNotFoundError, IndexNotFoundError, UnknownDatabaseError from .base import SQLObject, DBMLObject from .column import Column from .index import Index diff --git a/pydbml/classes/__init__.py b/pydbml/classes/__init__.py index a083781..8b97924 100644 --- a/pydbml/classes/__init__.py +++ b/pydbml/classes/__init__.py @@ -1,6 +1,5 @@ from .._classes.column import Column -from .._classes.enum import Enum -from .._classes.enum import EnumItem +from .._classes.enum import Enum, EnumItem from .._classes.expression import Expression from .._classes.index import Index from .._classes.note import Note diff --git a/pydbml/database.py b/pydbml/database.py index 41dd589..7a96ea7 100644 --- a/pydbml/database.py +++ b/pydbml/database.py @@ -5,11 +5,7 @@ from typing import Union from ._classes.sticky_note import StickyNote -from .classes import Enum -from .classes import Project -from .classes import Reference -from .classes import Table -from .classes import TableGroup +from .classes import Enum, Project, Reference, Table, TableGroup from .exceptions import DatabaseValidationError from .renderer.base import BaseRenderer from .renderer.dbml.default.renderer import DefaultDBMLRenderer diff --git a/pydbml/definitions/column.py b/pydbml/definitions/column.py index 1cd37d0..336f17b 100644 --- a/pydbml/definitions/column.py +++ b/pydbml/definitions/column.py @@ -1,18 +1,14 @@ import pyparsing as pp -from .common import _ -from .common import _c -from .common import c -from .common import n -from .common import note -from .common import pk -from .common import unique -from .generic import boolean_literal -from .generic import expression -from .generic import expression_literal -from .generic import name -from .generic import number_literal -from .generic import string_literal +from .common import _, _c, c, n, note, pk, unique +from .generic import ( + boolean_literal, + expression, + expression_literal, + name, + number_literal, + string_literal +) from .reference import ref_inline from pydbml.parser.blueprints import ColumnBlueprint diff --git a/pydbml/definitions/enum.py b/pydbml/definitions/enum.py index 0c6d6fa..72eef63 100644 --- a/pydbml/definitions/enum.py +++ b/pydbml/definitions/enum.py @@ -1,11 +1,6 @@ import pyparsing as pp -from .common import _ -from .common import _c -from .common import c -from .common import end -from .common import n -from .common import note +from .common import _, _c, c, end, n, note from .generic import name from pydbml.parser.blueprints import EnumBlueprint from pydbml.parser.blueprints import EnumItemBlueprint diff --git a/pydbml/definitions/index.py b/pydbml/definitions/index.py index ed39fda..a6bfee7 100644 --- a/pydbml/definitions/index.py +++ b/pydbml/definitions/index.py @@ -1,16 +1,8 @@ import pyparsing as pp -from .common import _ -from .common import _c -from .common import c -from .common import note -from .common import pk -from .common import unique -from .generic import expression_literal -from .generic import name -from .generic import string_literal -from pydbml.parser.blueprints import ExpressionBlueprint -from pydbml.parser.blueprints import IndexBlueprint +from .common import _, _c, c, note, pk, unique +from .generic import expression_literal, name, string_literal +from pydbml.parser.blueprints import ExpressionBlueprint, IndexBlueprint pp.ParserElement.set_default_whitespace_chars(' \t\r') diff --git a/pydbml/definitions/project.py b/pydbml/definitions/project.py index 12fa2fd..2eaa042 100644 --- a/pydbml/definitions/project.py +++ b/pydbml/definitions/project.py @@ -1,14 +1,8 @@ import pyparsing as pp -from .common import _ -from .common import _c -from .common import n -from .common import note -from .common import note_object -from .generic import name -from .generic import string_literal -from pydbml.parser.blueprints import NoteBlueprint -from pydbml.parser.blueprints import ProjectBlueprint +from .common import _, _c, c, n, note, note_object +from .generic import name, string_literal +from pydbml.parser.blueprints import NoteBlueprint, ProjectBlueprint pp.ParserElement.set_default_whitespace_chars(' \t\r') diff --git a/pydbml/definitions/reference.py b/pydbml/definitions/reference.py index 9b6450e..286ac90 100644 --- a/pydbml/definitions/reference.py +++ b/pydbml/definitions/reference.py @@ -1,9 +1,6 @@ import pyparsing as pp -from .common import _ -from .common import _c -from .common import c -from .common import n +from .common import _, _c, c, n from .generic import name from pydbml.parser.blueprints import ReferenceBlueprint diff --git a/pydbml/definitions/table.py b/pydbml/definitions/table.py index aa0dfc9..80244ab 100644 --- a/pydbml/definitions/table.py +++ b/pydbml/definitions/table.py @@ -2,11 +2,7 @@ from pydbml.parser.blueprints import TableBlueprint from .column import table_column, table_column_with_properties -from .common import _, hex_color -from .common import _c -from .common import end -from .common import note -from .common import note_object +from .common import _, _c, end, hex_color, note, note_object from .generic import name, string_literal from .index import indexes diff --git a/pydbml/definitions/table_group.py b/pydbml/definitions/table_group.py index b8e5b16..71edabc 100644 --- a/pydbml/definitions/table_group.py +++ b/pydbml/definitions/table_group.py @@ -1,9 +1,7 @@ import pyparsing as pp from pydbml.parser.blueprints import TableGroupBlueprint, NoteBlueprint -from .common import _, note, note_object, hex_color -from .common import _c -from .common import end +from .common import _, _c, end, hex_color, note, note_object from .generic import name pp.ParserElement.set_default_whitespace_chars(' \t\r') diff --git a/pydbml/parser/blueprints.py b/pydbml/parser/blueprints.py index 614a251..335f339 100644 --- a/pydbml/parser/blueprints.py +++ b/pydbml/parser/blueprints.py @@ -7,22 +7,21 @@ from typing import Optional from typing import Union -from pydbml.classes import Column -from pydbml.classes import Enum -from pydbml.classes import EnumItem -from pydbml.classes import Expression -from pydbml.classes import Index -from pydbml.classes import Note -from pydbml.classes import Project -from pydbml.classes import Reference -from pydbml.classes import Table -from pydbml.classes import TableGroup +from pydbml.classes import ( + Column, + Enum, + EnumItem, + Expression, + Index, + Note, + Project, + Reference, + Table, + TableGroup +) from pydbml._classes.sticky_note import StickyNote -from pydbml.exceptions import ColumnNotFoundError -from pydbml.exceptions import TableNotFoundError -from pydbml.exceptions import ValidationError -from pydbml.tools import remove_indentation -from pydbml.tools import strip_empty_lines +from pydbml.exceptions import ColumnNotFoundError, TableNotFoundError, ValidationError +from pydbml.tools import remove_indentation, strip_empty_lines class Blueprint: diff --git a/pydbml/parser/parser.py b/pydbml/parser/parser.py index 53a5e92..89db958 100644 --- a/pydbml/parser/parser.py +++ b/pydbml/parser/parser.py @@ -23,11 +23,14 @@ from pydbml.renderer.dbml.default import DefaultDBMLRenderer from pydbml.renderer.sql.default import DefaultSQLRenderer from pydbml.tools import remove_bom -from .blueprints import EnumBlueprint, StickyNoteBlueprint -from .blueprints import ProjectBlueprint -from .blueprints import ReferenceBlueprint -from .blueprints import TableBlueprint -from .blueprints import TableGroupBlueprint +from .blueprints import ( + EnumBlueprint, + StickyNoteBlueprint, + ProjectBlueprint, + ReferenceBlueprint, + TableBlueprint, + TableGroupBlueprint +) pp.ParserElement.set_default_whitespace_chars(" \t\r")