Skip to content

Commit 5d2d963

Browse files
committed
style: Introduce flake8 and make it pass.
1 parent 65df42c commit 5d2d963

File tree

9 files changed

+23
-36
lines changed

9 files changed

+23
-36
lines changed

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ clean:
88
@find . -name "*.pyc" -delete
99
@find . -name "__pycache__" -delete
1010

11-
test: clean
11+
lint:
12+
@flake8 graphene_mongo
13+
14+
test: clean lint
1215
py.test --cov=graphene_mongo
1316

1417
register-pypitest:

graphene_mongo/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99

1010
__all__ = [
1111
'__version__',
12-
'MongoengineObjectType'
12+
'MongoengineObjectType',
13+
'MongoengineConnectionField'
1314
]
14-

graphene_mongo/converter.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
from graphene import (ID, Boolean, Dynamic, Enum, Field, Float, Int, List,
2-
NonNull, String, UUID, is_node)
3-
from graphene.types.datetime import DateTime, Time
1+
from graphene import (ID, Boolean, Dynamic, Field, Float, Int, List,
2+
NonNull, String, is_node)
43
from graphene.types.json import JSONString
5-
from graphene.utils.str_converters import to_camel_case, to_const
6-
from graphql import assert_valid_name
74

85
import mongoengine
96

@@ -66,9 +63,9 @@ def convert_postgres_array_to_list(field, registry=None):
6663
if isinstance(base_type, (Dynamic)):
6764
base_type = base_type.get_type()._type
6865
if is_node(base_type):
69-
return MongoengineConnectionField(base_type)
66+
return MongoengineConnectionField(base_type)
7067
elif not isinstance(base_type, (List, NonNull)) \
71-
and not isinstance(field.field, mongoengine.ReferenceField):
68+
and not isinstance(field.field, mongoengine.ReferenceField):
7269
base_type = type(base_type)
7370
return List(base_type, description=field.db_field, required=not field.null)
7471

@@ -86,4 +83,3 @@ def dynamic_type():
8683
return Field(_type)
8784

8885
return Dynamic(dynamic_type)
89-

graphene_mongo/fields.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@
33
from collections import OrderedDict
44
from functools import partial, reduce
55

6-
from graphene import Field
6+
from graphene import Field, List
77
from graphene.relay import ConnectionField
88
from graphene.relay.connection import PageInfo
99
from graphql_relay.connection.arrayconnection import connection_from_list_slice
1010
from graphene.types.argument import to_arguments
1111

12-
from .utils import maybe_queryset
13-
1412

13+
# noqa
1514
class MongoengineListField(Field):
1615

1716
def __init__(self, _type, *args, **kwargs):
@@ -21,9 +20,9 @@ def __init__(self, _type, *args, **kwargs):
2120
def model(self):
2221
return self.type.of_type._meta.node._meta.model
2322

24-
@staticmethod
25-
def list_resolver(resolver, root, info, **args):
26-
return maybe_queryset(resolver(root, info, **args))
23+
# @staticmethod
24+
# def list_resolver(resolver, root, info, **args):
25+
# return maybe_queryset(resolver(root, info, **args))
2726

2827
def get_resolver(self, parent_resolver):
2928
return partial(self.list_resolver, parent_resolver)
@@ -115,4 +114,3 @@ def connection_resolver(cls, resolver, connection, model, root, info, **args):
115114

116115
def get_resolver(self, parent_resolver):
117116
return partial(self.connection_resolver, parent_resolver, self.type, self.model)
118-

graphene_mongo/registry.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,3 @@ def get_global_registry():
2828
def reset_global_registry():
2929
global registry
3030
registry = None
31-

graphene_mongo/tests/test_query.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,4 +308,3 @@ def test_should_first_n():
308308
# TODO:
309309
def test_should_paging():
310310
pass
311-

graphene_mongo/types.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from collections import OrderedDict
22

3-
from graphene import Field, ObjectType
3+
from graphene import Field
44
from graphene.relay import Connection, Node
55
from graphene.types.objecttype import ObjectType, ObjectTypeOptions
66
from graphene.types.utils import yank_fields_from_attrs
@@ -35,6 +35,7 @@ class MongoengineObjectTypeOptions(ObjectTypeOptions):
3535
connection = None # type: Type[Connection]
3636
filter_fields = ()
3737

38+
3839
class MongoengineObjectType(ObjectType):
3940

4041
@classmethod
@@ -97,17 +98,14 @@ def is_type_of(cls, root, info):
9798
).format(root))
9899
return isinstance(root, cls._meta.model)
99100

101+
# noqa
100102
@classmethod
101103
def get_node(cls, id, context, info):
102-
if isinstance(getattr(cls._meta.model, get_key_name(cls._meta.model)), NumberAttribute):
103-
return cls._meta.model.get(int(id))
104-
105104
return cls._meta.model.get(id)
106105

107106
def resolve_id(self, info):
108107
return str(self.id)
109108

110-
#@classmethod
111-
#def get_connection(cls):
112-
# return connection_for_type(cls)
113-
109+
# @classmethod
110+
# def get_connection(cls):
111+
# return connection_for_type(cls)

graphene_mongo/utils.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,6 @@ def is_valid_mongoengine_model(model):
2525
)
2626

2727

28-
def maybe_queryset(value):
29-
if isinstance(value, Manager):
30-
value = value.get_queryset()
31-
return value
32-
33-
3428
def import_single_dispatch():
3529
try:
3630
from functools import singledispatch
@@ -54,11 +48,11 @@ def import_single_dispatch():
5448
return singledispatch
5549

5650

51+
# noqa
5752
def get_type_for_document(schema, document):
5853
types = schema.types.values()
5954
for _type in types:
6055
type_document = hasattr(_type, '_meta') and getattr(
6156
_type._meta, 'document', None)
6257
if document == type_document:
6358
return _type
64-

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description-file = README.md
33

44
[flake8]
55
exclude = setup.py,docs/*,examples/*,tests
6-
max-line-length = 120
6+
max-line-length = 130
77

88
[coverage:run]
99
omit = */tests/*

0 commit comments

Comments
 (0)