Skip to content

Shorter multiple imports #1

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.

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

Merged
merged 1 commit into from
Mar 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions pydbml/_classes/reference.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions pydbml/_classes/table.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions pydbml/classes/__init__.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 1 addition & 5 deletions pydbml/database.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 9 additions & 13 deletions pydbml/definitions/column.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
7 changes: 1 addition & 6 deletions pydbml/definitions/enum.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
14 changes: 3 additions & 11 deletions pydbml/definitions/index.py
Original file line number Diff line number Diff line change
@@ -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')

Expand Down
12 changes: 3 additions & 9 deletions pydbml/definitions/project.py
Original file line number Diff line number Diff line change
@@ -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')

Expand Down
5 changes: 1 addition & 4 deletions pydbml/definitions/reference.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 1 addition & 5 deletions pydbml/definitions/table.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 1 addition & 3 deletions pydbml/definitions/table_group.py
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
29 changes: 14 additions & 15 deletions pydbml/parser/blueprints.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
13 changes: 8 additions & 5 deletions pydbml/parser/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down