Skip to content

Commit 1d35ba3

Browse files
committed
Moved PydanticObjectType-related code to objecttype package
1 parent 40f1a67 commit 1d35ba3

File tree

10 files changed

+26
-24
lines changed

10 files changed

+26
-24
lines changed

graphene_pydantic/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
from .types import PydanticObjectType
1+
from .objecttype.types import PydanticObjectType
22

33
__all__ = ["PydanticObjectType"]

graphene_pydantic/objecttype/__init__.py

Whitespace-only changes.

graphene_pydantic/converters.py renamed to graphene_pydantic/objecttype/converters.py

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
1-
import sys
21
import collections
32
import collections.abc
4-
import typing as T
5-
import uuid
63
import datetime
74
import decimal
85
import enum
6+
import sys
7+
import typing as T
8+
import uuid
99

10+
from graphene import UUID, Boolean, Enum, Field, Float, Int, List, String, Union
11+
from graphene.types.base import BaseType
12+
from graphene.types.datetime import Date, DateTime, Time
1013
from pydantic import BaseModel
1114
from pydantic.fields import Field as PydanticField
1215

16+
from ..util import construct_union_class_name
17+
from .registry import Registry
18+
1319
try:
1420
# Pydantic pre-1.0
1521
from pydantic.fields import Shape
@@ -38,10 +44,6 @@
3844
SHAPE_MAPPING = (fields.SHAPE_MAPPING,)
3945

4046

41-
from graphene import Field, Boolean, Enum, Float, Int, List, String, UUID, Union
42-
from graphene.types.base import BaseType
43-
from graphene.types.datetime import Date, Time, DateTime
44-
4547
try:
4648
from graphene.types.decimal import Decimal as GrapheneDecimal
4749

@@ -50,9 +52,6 @@
5052
# graphene 2.1.5+ is required for Decimals
5153
DECIMAL_SUPPORTED = False
5254

53-
from .registry import Registry
54-
from .util import construct_union_class_name
55-
5655

5756
NONE_TYPE = None.__class__ # need to do this because mypy complains about type(None)
5857

File renamed without changes.

tests/objecttype/__init__.py

Whitespace-only changes.

tests/test_converters.py renamed to tests/objecttype/test_converters.py

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
1-
import typing as T
2-
import uuid
3-
import enum
41
import datetime
52
import decimal
3+
import enum
4+
import typing as T
5+
import uuid
66

7-
import pytest
87
import graphene
98
import graphene.types
109
import pydantic
11-
from pydantic import create_model, BaseModel
10+
import pytest
11+
from pydantic import BaseModel, create_model
1212

13-
from graphene_pydantic.converters import convert_pydantic_field, ConversionError
14-
from graphene_pydantic.registry import get_global_registry
15-
from graphene_pydantic import converters
13+
import graphene_pydantic.objecttype.converters as converters
14+
from graphene_pydantic.objecttype.converters import (
15+
ConversionError,
16+
convert_pydantic_field,
17+
)
18+
from graphene_pydantic.objecttype.registry import get_global_registry
1619

1720

1821
def _get_field_from_spec(name, type_spec_or_default):

tests/test_forward_refs.py renamed to tests/objecttype/test_forward_refs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import typing as T
22
import uuid
33

4-
import pydantic
54
import graphene
5+
import pydantic
66

77
from graphene_pydantic import PydanticObjectType
88

tests/test_registry.py renamed to tests/objecttype/test_registry.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import pytest
22
from pydantic import BaseModel
33

4+
import graphene_pydantic.objecttype.registry as registry
45
from graphene_pydantic import PydanticObjectType
5-
from graphene_pydantic.registry import (
6+
from graphene_pydantic.objecttype.registry import (
67
Registry,
8+
assert_is_pydantic_object_type,
79
get_global_registry,
810
reset_global_registry,
9-
assert_is_pydantic_object_type,
1011
)
11-
from graphene_pydantic import registry
1212

1313

1414
def _get_dummy_classes():

tests/test_types.py renamed to tests/objecttype/test_types.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import pytest
44
from pydantic import BaseModel
55

6-
from graphene_pydantic.types import PydanticObjectType
6+
from graphene_pydantic.objecttype.types import PydanticObjectType
77

88

99
def test_object_type_onlyfields():

0 commit comments

Comments
 (0)