mirror of
https://github.com/graphql-python/graphene.git
synced 2024-11-22 09:36:44 +03:00
Merge pull request #1387 from GDGSNF/master
Chore: Refactor Multi Expression Code ✨
This commit is contained in:
commit
7ecb4e68ba
|
@ -19,10 +19,7 @@ def get_version(version=None):
|
|||
sub = ""
|
||||
if version[3] == "alpha" and version[4] == 0:
|
||||
git_changeset = get_git_changeset()
|
||||
if git_changeset:
|
||||
sub = ".dev%s" % git_changeset
|
||||
else:
|
||||
sub = ".dev"
|
||||
sub = ".dev%s" % git_changeset if git_changeset else ".dev"
|
||||
elif version[3] != "final":
|
||||
mapping = {"alpha": "a", "beta": "b", "rc": "rc"}
|
||||
sub = mapping[version[3]] + str(version[4])
|
||||
|
|
|
@ -18,11 +18,7 @@ def is_node(objecttype):
|
|||
if not issubclass(objecttype, ObjectType):
|
||||
return False
|
||||
|
||||
for i in objecttype._meta.interfaces:
|
||||
if issubclass(i, Node):
|
||||
return True
|
||||
|
||||
return False
|
||||
return any(issubclass(i, Node) for i in objecttype._meta.interfaces)
|
||||
|
||||
|
||||
class GlobalID(Field):
|
||||
|
@ -94,7 +90,7 @@ class Node(AbstractNode):
|
|||
raise Exception(
|
||||
f'Unable to parse global ID "{global_id}". '
|
||||
'Make sure it is a base64 encoded string in the format: "TypeName:id". '
|
||||
f"Exception message: {str(e)}"
|
||||
f"Exception message: {e}"
|
||||
)
|
||||
|
||||
graphene_type = info.schema.get_type(_type)
|
||||
|
|
|
@ -101,10 +101,7 @@ class Mutation(ObjectType):
|
|||
"Read more:"
|
||||
" https://github.com/graphql-python/graphene/blob/v2.0.0/UPGRADE-v2.0.md#mutation-input"
|
||||
)
|
||||
if input_class:
|
||||
arguments = props(input_class)
|
||||
else:
|
||||
arguments = {}
|
||||
arguments = props(input_class) if input_class else {}
|
||||
if not resolver:
|
||||
mutate = getattr(cls, "mutate", None)
|
||||
assert mutate, "All mutations must define a mutate method in it"
|
||||
|
|
|
@ -7,9 +7,7 @@ def dict_resolver(attname, default_value, root, info, **args):
|
|||
|
||||
|
||||
def dict_or_attr_resolver(attname, default_value, root, info, **args):
|
||||
resolver = attr_resolver
|
||||
if isinstance(root, dict):
|
||||
resolver = dict_resolver
|
||||
resolver = dict_resolver if isinstance(root, dict) else attr_resolver
|
||||
return resolver(attname, default_value, root, info, **args)
|
||||
|
||||
|
||||
|
|
|
@ -14,9 +14,7 @@ class Subscription(ObjectType):
|
|||
count_to_ten = Field(Int)
|
||||
|
||||
async def subscribe_count_to_ten(root, info):
|
||||
count = 0
|
||||
while count < 10:
|
||||
count += 1
|
||||
for count in range(1, 11):
|
||||
yield count
|
||||
|
||||
|
||||
|
|
|
@ -27,19 +27,18 @@ def import_string(dotted_path, dotted_attributes=None):
|
|||
|
||||
if not dotted_attributes:
|
||||
return result
|
||||
else:
|
||||
attributes = dotted_attributes.split(".")
|
||||
traveled_attributes = []
|
||||
try:
|
||||
for attribute in attributes:
|
||||
traveled_attributes.append(attribute)
|
||||
result = getattr(result, attribute)
|
||||
return result
|
||||
except AttributeError:
|
||||
raise ImportError(
|
||||
'Module "%s" does not define a "%s" attribute inside attribute/class "%s"'
|
||||
% (module_path, ".".join(traveled_attributes), class_name)
|
||||
)
|
||||
attributes = dotted_attributes.split(".")
|
||||
traveled_attributes = []
|
||||
try:
|
||||
for attribute in attributes:
|
||||
traveled_attributes.append(attribute)
|
||||
result = getattr(result, attribute)
|
||||
return result
|
||||
except AttributeError:
|
||||
raise ImportError(
|
||||
'Module "%s" does not define a "%s" attribute inside attribute/class "%s"'
|
||||
% (module_path, ".".join(traveled_attributes), class_name)
|
||||
)
|
||||
|
||||
|
||||
def lazy_import(dotted_path, dotted_attributes=None):
|
||||
|
|
|
@ -38,4 +38,4 @@ def test_orderedtype_non_orderabletypes():
|
|||
|
||||
assert one.__lt__(1) == NotImplemented
|
||||
assert one.__gt__(1) == NotImplemented
|
||||
assert not one == 1
|
||||
assert one != 1
|
||||
|
|
|
@ -18,14 +18,12 @@ schema = Schema(query=Query)
|
|||
def run_query(query: str):
|
||||
document = parse(query)
|
||||
|
||||
errors = validate(
|
||||
return validate(
|
||||
schema=schema.graphql_schema,
|
||||
document_ast=document,
|
||||
rules=(DisableIntrospection,),
|
||||
)
|
||||
|
||||
return errors
|
||||
|
||||
|
||||
def test_disallows_introspection_queries():
|
||||
errors = run_query("{ __schema { queryType { name } } }")
|
||||
|
|
Loading…
Reference in New Issue
Block a user